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

Merge pull request #4728 from fpletz/fix/wget-update

Browse Source 
wget: Update to 1.16 (fix CVE-2014-4877)
This commit is contained in:
Pascal Wittmann 2014-10-30 11:57:53 +01:00
commit c7e4290fcc
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,17 @@
{ stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }: { stdenv, fetchurl, gettext, libidn
, perl, perlPackages, LWP, python3
, gnutls ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wget-1.15"; name = "wget-1.16";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/wget/${name}.tar.xz"; url = "mirror://gnu/wget/${name}.tar.xz";
sha256 = "1yw0sk4mrs7bvga3c79rkbhxivmw8cs3b5wq3cglp1f9ai1mz2ni"; sha256 = "1rxhr3jmgbwryzl51di4avqxw9m9j1z2aak8q1npns0p184xsqcj";
}; };
patches = stdenv.lib.optional stdenv.isDarwin ./iri-test.patch;
preConfigure = stdenv.lib.optionalString doCheck preConfigure = stdenv.lib.optionalString doCheck
'' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl" '' for i in "doc/texi2pod.pl" "util/rmold.pl"
do do
sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g' sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g'
done done
@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ gettext ];
buildInputs = buildInputs = [ libidn ]
stdenv.lib.optionals doCheck [ perl LWP ] ++ stdenv.lib.optionals doCheck [ perl perlPackages.IOSocketSSL LWP python3 ]
++ stdenv.lib.optional (gnutls != null) gnutls; ++ stdenv.lib.optional (gnutls != null) gnutls;
configureFlags = configureFlags =
@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
then "--with-ssl=gnutls" then "--with-ssl=gnutls"
else "--without-ssl"; else "--without-ssl";
doCheck = (perl != null); doCheck = (perl != null && python3 != null);
meta = { meta = with stdenv.lib; {
description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; description = "Tool for retrieving files using HTTP, HTTPS, and FTP";
longDescription = longDescription =
@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
scripts, cron jobs, terminals without X-Windows support, etc. scripts, cron jobs, terminals without X-Windows support, etc.
''; '';
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
homepage = http://www.gnu.org/software/wget/; homepage = http://www.gnu.org/software/wget/;
maintainers = [ ]; maintainers = with maintainers; [ fpletz ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }

12
pkgs/tools/networking/wget/iri-test.patch
View File

@ -1,12 +0,0 @@
diff -r --unified a/wget-1.14/tests/run-px b/wget-1.14/tests/run-px
--- a/tests/run-px 2012-06-16 11:58:11.000000000 +0100
+++ b/tests/run-px 2013-11-02 14:06:14.000000000 +0000
@@ -48,7 +48,7 @@
'Test-idn-robots-utf8.px',
'Test-iri.px',
'Test-iri-percent.px',
- 'Test-iri-disabled.px',
+ #'Test-iri-disabled.px',
'Test-iri-forced-remote.px',
'Test-iri-list.px',
'Test-k.px',