MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #111339 from risicle/ris-gdal-2.4.4

Browse source 
gdal_2: 2.4.0 -> 2.4.4, fixing CVE-2019-17546
This commit is contained in:
Sandro 2021-01-31 15:33:47 +01:00 committed by GitHub
commit f3c61c6f68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/development/libraries/gdal/2.4.0.nix → pkgs/development/libraries/gdal/2.4.nix
View file

@ -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 , postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
, libiconv, libxml2 , libiconv, libxml2
@ -9,22 +9,13 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gdal"; pname = "gdal";
version = "2.4.0"; version = "2.4.4";
src = fetchurl { src = fetchurl {
url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; 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 buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
++ (with pythonPackages; [ python numpy wrapPython ]) ++ (with pythonPackages; [ python numpy wrapPython ])
@ -60,19 +51,6 @@ stdenv.mkDerivation rec {
#ifdef swap\ #ifdef swap\
#undef swap\ #undef swap\
#endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h #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. # - Unset CC and CXX as they confuse libtool.

2
pkgs/top-level/all-packages.nix
View file

@ -13690,7 +13690,7 @@ in
gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; 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 { }; gdcm = callPackage ../development/libraries/gdcm { };