diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-31 15:33:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-31 15:33:47 +0100 |
| commit | f3c61c6f684ca77f25f51093dd082392f74b6dc2 (patch) | |
| tree | 62c29860863a5b87c0fe9d351d2bf1344900cc0e /pkgs | |
| parent | cf17c057b774996ebc4ae3e553ca723ad1d9fb73 (diff) | |
| parent | c0ff0a1e3c00ad130aa9983119b4dfc540048f1c (diff) | |
Merge pull request #111339 from risicle/ris-gdal-2.4.4
gdal_2: 2.4.0 -> 2.4.4, fixing CVE-2019-17546
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gdal/2.4.nix (renamed from pkgs/development/libraries/gdal/2.4.0.nix) | 28 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 26 deletions
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.nix index 9cb9c448c1d2..5df29b38a263 100644 --- a/pkgs/development/libraries/gdal/2.4.0.nix +++ b/pkgs/development/libraries/gdal/2.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib +{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib , postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 @@ -9,22 +9,13 @@ with lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "2.4.0"; + version = "2.4.4"; src = fetchurl { url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; - sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; + sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-17545.patch"; - url = "https://github.com/OSGeo/gdal/commit/8cd2d2eb6327cf782a74dae263ffa6f89f46c93d.patch"; - stripLen = 1; - sha256 = "06h88a659jcqf6ps1m91qy78s6s9krbkwnz28f5qh7032vlp6qpw"; - }) - ]; - buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] ++ (with pythonPackages; [ python numpy wrapPython ]) @@ -60,19 +51,6 @@ stdenv.mkDerivation rec { #ifdef swap\ #undef swap\ #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h - # poppler 0.73.0 support - patch -lp2 <${ - fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff"; - sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734"; - } - } || true - patch -p2 <${ - fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff"; - sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj"; - } - } ''; # - Unset CC and CXX as they confuse libtool. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd6514615d1d..f2a30e283151 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13690,7 +13690,7 @@ in gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; - gdal_2 = callPackage ../development/libraries/gdal/2.4.0.nix { }; + gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { }; gdcm = callPackage ../development/libraries/gdcm { }; |