From d99ca3f1cd72f648f2dbb7f36a70d4b4126836e6 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 6 Jan 2024 23:03:08 +0100
Subject: [PATCH] dcmtk: 3.6.7 -> 3.6.8

Fixes CVE-2022-43272.

Changes:
https://github.com/DCMTK/dcmtk/compare/DCMTK-3.6.7...DCMTK-3.6.8
---
 .../science/medicine/dcmtk/0001-Fix-cmake.patch      | 12 ------------
 pkgs/applications/science/medicine/dcmtk/default.nix |  7 ++-----
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch

diff --git a/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch b/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch
deleted file mode 100644
index 053edac85b21..000000000000
--- a/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMake/dcmtk.pc.in b/CMake/dcmtk.pc.in
-index 13c79c0d5..b1edf725c 100644
---- a/CMake/dcmtk.pc.in
-+++ b/CMake/dcmtk.pc.in
-@@ -1,6 +1,6 @@
-  prefix="@CMAKE_INSTALL_PREFIX@"
-  exec_prefix="${prefix}"
-- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
-+ libdir=@CMAKE_INSTALL_FULL_LIBDIR@"
-  includedir="${prefix}/include/"
- 
-  Name: DCMTK
diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix
index 878f62c666e2..812606f9f03f 100644
--- a/pkgs/applications/science/medicine/dcmtk/default.nix
+++ b/pkgs/applications/science/medicine/dcmtk/default.nix
@@ -4,20 +4,17 @@
 with lib;
 stdenv.mkDerivation rec {
   pname = "dcmtk";
-  version = "3.6.7";
+  version = "3.6.8";
   src = fetchFromGitHub {
     owner = "DCMTK";
     repo = pname;
     rev = "DCMTK-${version}";
-    sha256 = "sha256-Pw99R6oGcLX6Z7s8ZnpbBBqcIvY9Rl/nw2PVGjpD3gY=";
+    hash = "sha256-PQR9+xSlfBvogv0p6AL/yapelJpsYteA4T4lPkOIfLc=";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libpng zlib libtiff libxml2 openssl libiconv ];
 
-  # This is only needed until https://github.com/DCMTK/dcmtk/pull/75/files is merged
-  patches = [ ./0001-Fix-cmake.patch ];
-
   doCheck = true;
 
   meta = {