* Sync with trunk. Back to gtkLibs214.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13960

pkgs/tools/networking/aircrack-ng/add-paths.patch

@@ -0,0 +1,17 @@
+diff --git a/src/osdep/linux.c b/src/osdep/linux.c
+index 9f3b1ef..ba7e584 100644
+--- a/src/osdep/linux.c
++++ b/src/osdep/linux.c
+@@ -235,7 +235,11 @@ static char * wiToolsPath(const char * tool)
+                 "/bin",
+                 "/usr/bin",
+                 "/usr/local/bin",
+-                "/tmp"
++                "/tmp",
++                "/var/run/current-system/sw/bin",
++                "/var/run/current-system/sw/sbin",
++                "/root/.nix-profile/bin",
++                "/root/.nix-profile/sbin"
+         };
+ 
+         nbelems = sizeof(paths) / sizeof(char *);

pkgs/tools/networking/aircrack-ng/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, libpcap, openssl, zlib}:
+
+stdenv.mkDerivation {
+  name = "aircrack-ng-1.0-rc2";
+
+  src = fetchurl {
+    url = http://download.aircrack-ng.org/aircrack-ng-1.0-rc2.tar.gz;
+    sha256 = "9d52f15f3fca52775ecb9cfc1f0aeb04c3c3bd3101665d5760d395f7d2a87d8b";
+  };
+
+  buildInputs = [libpcap openssl zlib];
+
+  patches = [ ./add-paths.patch ];
+
+  postPatch = "sed -e 's@^prefix.*@prefix = '$out@ -i common.mak";
+
+  meta = {
+    description = "Wireless encryption crackign tools";
+    homepage = http://www.aircrack-ng.org/;
+    license = "GPL2+";
+  };
+}

pkgs/tools/networking/inetutils/default.nix

@@ -1,18 +1,13 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "inetutils-1.5";
+  name = "inetutils-1.6";
+
   src = fetchurl {
     url = "mirror://gnu/inetutils/${name}.tar.gz";
-    sha256 = "048my5fgxnjwr1jcka8yq36c7i019p60r0mg4f6zz96pmys76p1l";
+    sha256 = "1pjv2h8mwbyjrw75xn1k1z7ps4z4y0x6ljizwrzkh83n7d3xjaq5";
   };
 
-  # Make sure `configure' honors `$TMPDIR' for chroot builds.
-  patchPhase = ''
-    cat configure | sed -'es|/tmp/,iu|$TMPDIR/,iu|g' > ,,tmp && \
-    mv ,,tmp configure && chmod +x configure
-  '';
-
   postInstall = ''
     # XXX: These programs are normally installed setuid but since it
     # fails, they end up being non-executable, hence this hack.
@@ -20,9 +15,14 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''GNU Inetutils is a collection of common network
-                    programs, including telnet, FTP, RSH, rlogin and
-		    TFTP clients and servers, among others.'';
+    description = "GNU Inetutils, a collection of common network programs";
+
+    longDescription = ''
+      GNU Inetutils is a collection of common network programs,
+      including telnet, FTP, RSH, rlogin and TFTP clients and servers,
+      among others.
+    '';
+
     homepage = http://www.gnu.org/software/inetutils/;
     license = "GPLv3+";
   };

pkgs/tools/networking/ppp/default.nix

@@ -0,0 +1,41 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "2.4.4" a; 
+  buildInputs = with a; [
+    
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://ppp.samba.org/ftp/ppp/ppp-${version}.tar.gz";
+    sha256 = "1sli1s478k85vmjdbrqm39nn5r20x9qgg3a0lbp2dwz50zy4bbsq";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  phaseNames = ["exportVars" "patchPrivileged" "doConfigure" "doMakeInstall"];
+
+  exportVars = a.noDepEntry(''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -lcrypt "
+  '');
+
+  /* We want to run it as far as we can with our current permissions
+     For example, dependent builds would prefer to run --version 
+     without ever using setuid pppd. We are not setuid anyway, so.. */
+  patchPrivileged = a.FullDepEntry(''
+    sed -e '/privileged =/aprivileged = 1;' -i pppd/main.c
+    sed -e '/SH DESCRIPTION/a WARNING: Patched version unsuitable to be setuid root' -i pppd/pppd.8
+  '') ["minInit" "doUnpack"];
+
+  passthru = {
+    inherit version;
+  };
+      
+  name = "ppp-" + version;
+  meta = {
+    description = "Point-to-point implementation for Linux and Solaris";
+  };
+}

pkgs/tools/networking/rp-pppoe/default.nix

@@ -0,0 +1,42 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "3.10" a; 
+  buildInputs = with a; [
+    ppp   
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz";
+    sha256 = "1xj9rvsblvv2zi4n1bj8mkk00p1b24ch5hlr1gcc3b4l4m0ag73h";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["exportVars" "doConfigure" "patchInstall" "makeDirs" "doMakeInstall"];
+
+  goSrcDir = "cd src";
+  exportVars = a.noDepEntry(''
+    export PATH="$PATH:${a.ppp}/sbin"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -L${a.ppp}/lib/${a.ppp.version}"
+    export PPPD=${a.ppp}/sbin/pppd
+  '');
+
+  patchInstall = a.FullDepEntry(''
+    sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/share/${name}/etc/ppp@'
+    sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)/share/${name}@'
+  '') ["minInit" "doUnpack"];
+
+  makeDirs = a.FullDepEntry(''
+    ensureDir $out/share/${name}/etc/ppp
+  '') ["minInit" "defEnsureDir"];
+
+  name = "rp-pppoe-" + version;
+  meta = {
+    description = "Roaring Penguin Point-to-Point over Ethernet tool";
+  };
+}

pkgs/tools/networking/wget/1.10.2.nix

@@ -1,15 +0,0 @@
-{stdenv, fetchurl, gettext}:
-
-stdenv.mkDerivation {
-  name = "wget-1.10.2";
-  src = fetchurl {
-    url = mirror://gnu/wget/wget-1.10.2.tar.gz;
-    md5 = "795fefbb7099f93e2d346b026785c4b8";
-  };
-
-  buildInputs = [gettext];
-
-  meta = {
-    description = "A console downloading program. Has some features for mirroring sites.";
-  };
-}

pkgs/tools/networking/wget/default.nix

@@ -1,10 +1,11 @@
-args: with args;
+{stdenv, fetchurl, gettext}:
 
 stdenv.mkDerivation rec {
-  name = "wget-" + version;
+  name = "wget-1.11.4";
+  
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.bz2";
-    sha256 = "0mhd3181zdp1fwirxw0km7502sfvjmm1ncska9w6s2drczf37aix";
+    sha256 = "1yr7w182n7lvkajvq07wnw65sw2vmxjkc3611kpc728vhvi54zwb";
   };
 
   buildInputs = [gettext];