GNU Wget 1.13.3.

svn path=/nixpkgs/trunk/; revision=29010

pkgs/tools/networking/wget/default.nix

@@ -1,15 +1,13 @@
 { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.12";
+  name = "wget-1.13.3";
 
   src = fetchurl {
-    url = "mirror://gnu/wget/${name}.tar.bz2";
+    url = "mirror://gnu/wget/${name}.tar.gz";
-    sha256 = "16msgly5xn0qj6ngsw34q9j7ag8jkci6020w21d30jgqw8wdj8y8";
+    sha256 = "07wxl38qiy95k3hv2fd1sglgrlp6z920pr9mcfsj8dg7iaxbhppi";
   };
 
-  patches = [ ./gnutls-support.patch ];
-
   preConfigure =
     '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl"
        do

pkgs/tools/networking/wget/gnutls-support.patch

@@ -1,16 +0,0 @@
-This patch fixes GnuTLS support:
-
-  http.o: In function `gethttp':
-  http.c:(.text+0x26c6): undefined reference to `ssl_connect_wget'
-
---- wget-1.12/src/http.c	2009-09-22 05:02:18.000000000 +0200
-+++ wget-1.12/src/http.c	2009-10-03 17:24:46.000000000 +0200
-@@ -1762,7 +1762,7 @@ gethttp (struct url *u, struct http_stat
- 
-       if (conn->scheme == SCHEME_HTTPS)
-         {
--          if (!ssl_connect_wget (sock))
-+          if (!ssl_connect (sock))
-             {
-               fd_close (sock);
-               return CONSSLERR;