zlib: maintenance 1.2.8 -> 1.2.10
The removed CVEs should be fixed in the release.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, static ? false }:
|
||||
|
||||
let version = "1.2.8"; in
|
||||
let version = "1.2.10"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zlib-${version}";
|
||||
@@ -10,16 +10,9 @@ stdenv.mkDerivation rec {
|
||||
[ "http://www.zlib.net/${name}.tar.gz" # old versions vanish from here
|
||||
"mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
|
||||
];
|
||||
sha256 = "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n";
|
||||
sha256 = "05w0jwsqib44jz5jazh7cqz311z4g7znnzn6w6v8g1z4iilryzld";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./CVE-2016-9840.patch
|
||||
./CVE-2016-9841.patch
|
||||
./CVE-2016-9842.patch
|
||||
./CVE-2016-9843.patch
|
||||
];
|
||||
|
||||
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure \
|
||||
--replace '/usr/bin/libtool' 'ar' \
|
||||
@@ -31,7 +24,6 @@ stdenv.mkDerivation rec {
|
||||
setOutputFlags = false;
|
||||
outputDoc = "dev"; # single tiny man3 page
|
||||
|
||||
|
||||
preConfigure = ''
|
||||
if test -n "$crossConfig"; then
|
||||
export CC=$crossConfig-gcc
|
||||
|
||||
Reference in New Issue
Block a user