Porting changes from stdenv-updates into this branch.

This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272

pkgs/tools/networking/wget/default.nix

@@ -1,17 +1,46 @@
-{stdenv, fetchurl, gettext, openssl ? null}:
+{ stdenv, fetchurl, gettext, perl, gnutls ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.11.4";
-  
+  name = "wget-1.12";
+
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.bz2";
-    sha256 = "1yr7w182n7lvkajvq07wnw65sw2vmxjkc3611kpc728vhvi54zwb";
+    sha256 = "16msgly5xn0qj6ngsw34q9j7ag8jkci6020w21d30jgqw8wdj8y8";
   };
 
-  buildInputs = [gettext openssl];
+  patches = [ ./gnutls-support.patch ];
+
+  preConfigure =
+    '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl"
+       do
+         sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g'
+       done
+    '';
+
+  buildInputs = [ gettext perl ]
+    ++ stdenv.lib.optional (gnutls != null) gnutls;
+
+  configureFlags =
+    if gnutls != null
+    then "--with-ssl=gnutls"
+    else "";
+
+  doCheck = true;
 
   meta = {
-    description = "A console downloading program. Has some features for mirroring sites.";
-    homepage = http://www.gnu.org/software/wget;
+    description = "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP";
+
+    longDescription =
+      '' GNU Wget is a free software package for retrieving files using HTTP,
+         HTTPS and FTP, the most widely-used Internet protocols.  It is a
+         non-interactive commandline tool, so it may easily be called from
+         scripts, cron jobs, terminals without X-Windows support, etc.
+      '';
+
+    license = "GPLv3+";
+
+    homepage = http://www.gnu.org/software/wget/;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }

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

@@ -0,0 +1,16 @@
+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;