mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
wget: Update to 1.16 (fix CVE-2014-4877)
This patch updates wget to the current version, 1.16. This release fixes a remotely exploitable security issue: CVE-2014-4877. A dependency on libidn was added and the testsuite now depends on python3. A patch that disables a test was removed because it is not needed anymore. As I intend to take care of wget in the future, I added myself to the maintainers.
This commit is contained in:
parent
9d9fdb173a
commit
e630ee2fdd
@ -1,17 +1,17 @@
|
||||
{ stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }:
|
||||
{ stdenv, fetchurl, gettext, libidn
|
||||
, perl, perlPackages, LWP, python3
|
||||
, gnutls ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "wget-1.15";
|
||||
name = "wget-1.16";
|
||||
|
||||
src = fetchurl {
|
||||
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
|
||||
'' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl"
|
||||
'' for i in "doc/texi2pod.pl" "util/rmold.pl"
|
||||
do
|
||||
sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g'
|
||||
done
|
||||
@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
buildInputs =
|
||||
stdenv.lib.optionals doCheck [ perl LWP ]
|
||||
buildInputs = [ libidn ]
|
||||
++ stdenv.lib.optionals doCheck [ perl perlPackages.IOSocketSSL LWP python3 ]
|
||||
++ stdenv.lib.optional (gnutls != null) gnutls;
|
||||
|
||||
configureFlags =
|
||||
@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
|
||||
then "--with-ssl=gnutls"
|
||||
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";
|
||||
|
||||
longDescription =
|
||||
@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
|
||||
scripts, cron jobs, terminals without X-Windows support, etc.
|
||||
'';
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
homepage = http://www.gnu.org/software/wget/;
|
||||
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
@ -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',
|
Loading…
Reference in New Issue
Block a user