about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-11-16 18:06:21 +0100
committerVladimír Čunát <v@cunat.cz>2019-11-16 18:06:21 +0100
commiteef525b38b21a58e57b34da6560825f8298336ea (patch)
tree32ff5bb4584ffb92d367dd00059bd80c0a87d432
parent79d9429c4c7ab772d1710cf954a98b269e18e615 (diff)
parent1f2a1334d23ed14ecf987da3b855975989bf14da (diff)
Merge #73253: gdal: patch CVE-2019-17545
-rw-r--r--pkgs/development/libraries/gdal/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 6b7a58fa30d94..f783f6d22d831 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
     sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2019-17545.patch";
+      url = "https://github.com/OSGeo/gdal/commit/8cd2d2eb6327cf782a74dae263ffa6f89f46c93d.patch";
+      stripLen = 1;
+      sha256 = "06h88a659jcqf6ps1m91qy78s6s9krbkwnz28f5qh7032vlp6qpw";
+    })
+  ];
+
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
     libspatialite poppler hdf4 qhull giflib expat libxml2 ]
   ++ (with pythonPackages; [ python numpy wrapPython ])