public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wget: 1.19.1 -> 1.19.2 for multiple CVEs

Browse Source 
Fixes CVE-2017-13089, CVE-2017-13090.
This commit is contained in:
Franz Pletz 2017-10-27 11:50:31 +02:00
parent f0cea7ccc6
commit 3e29dd00fc
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/networking/wget/default.nix
View File

@ -1,24 +1,19 @@
{ stdenv, fetchurl, gettext, pkgconfig, perl { stdenv, fetchurl, gettext, pkgconfig, perl
, libidn2, zlib, pcre, libuuid, libiconv , libidn2, zlib, pcre, libuuid, libiconv
, IOSocketSSL, LWP, python3 , IOSocketSSL, LWP, python3, lzip
, libpsl ? null , libpsl ? null
, openssl ? null }: , openssl ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wget-1.19.1"; name = "wget-1.19.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/wget/${name}.tar.xz"; url = "mirror://gnu/wget/${name}.tar.lz";
sha256 = "1ljcfhbkdsd0zjfm520rbl1ai62fc34i7c45sfj244l8f6b0p58c"; sha256 = "01yzal7xm85543x02bij3capnigr063d6c5vc039f8n5s9d796nm";
}; };
patches = [ patches = [
./remove-runtime-dep-on-openssl-headers.patch ./remove-runtime-dep-on-openssl-headers.patch
(fetchurl {
name = "CVE-2017-6508";
url = "http://git.savannah.gnu.org/cgit/wget.git/patch/?id=4d729e322fae359a1aefaafec1144764a54e8ad4";
sha256 = "14r0c5y3w3gavxp2d9yq8xji82izi5sx0sjv6jpmk6zp6cnr7cjf";
})
]; ];
preConfigure = '' preConfigure = ''
@ -34,7 +29,7 @@ stdenv.mkDerivation rec {
export LIBS="-liconv -lintl" export LIBS="-liconv -lintl"
''; '';
nativeBuildInputs = [ gettext pkgconfig perl ]; nativeBuildInputs = [ gettext pkgconfig perl lzip ];
buildInputs = [ libidn2 libiconv zlib pcre libuuid ] buildInputs = [ libidn2 libiconv zlib pcre libuuid ]
++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ] ++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ]
++ stdenv.lib.optional (openssl != null) openssl ++ stdenv.lib.optional (openssl != null) openssl