* Sync with the trunk.

svn path=/nixpkgs/branches/modular-python/; revision=26347

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

@@ -1,11 +1,15 @@
-{stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools}:
+{stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}:
 
-stdenv.mkDerivation {
-  name = "aircrack-ng-1.0-rc2";
+let
+  rev = "1859";
+in
+stdenv.mkDerivation rec {
+  name = "aircrack-ng-1.1-${rev}";
 
-  src = fetchurl {
-    url = http://download.aircrack-ng.org/aircrack-ng-1.0-rc2.tar.gz;
-    sha256 = "9d52f15f3fca52775ecb9cfc1f0aeb04c3c3bd3101665d5760d395f7d2a87d8b";
+  src = fetchsvn {
+    url = "http://trac.aircrack-ng.org/svn/trunk";
+    inherit rev;
+    sha256 = "6ca98321ef3f14af9c78b2fe25091c4e79e3c28679f240b80f8aeda71b84ab4a";
   };
 
   buildInputs = [libpcap openssl zlib];

pkgs/tools/networking/aria2/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, libxml2, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "aria2-1.9.3";
+  name = "aria2-1.10.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2";
-    sha256 = "04vnvq5f797bbyrrv1kzvnv8h02f4wbhvsl34syi4gygimfrwkrn";
+    sha256 = "1cbcrxwdc6gp4l4zqg2i18zdg5ry5f9r3zj66kx6l5plwfjv9fdc";
   };
 
   buildInputs = [ openssl libxml2 zlib ];

pkgs/tools/networking/dhcp/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, nettools, iputils, iproute, makeWrapper, coreutils, gnused }:
 
 stdenv.mkDerivation rec {
-  name = "dhcp-4.1.1-P1";
+  name = "dhcp-4.1.2-P1";
   
   src = fetchurl {
     url = "http://ftp.isc.org/isc/dhcp/${name}.tar.gz";
-    sha256 = "1nk36bk7yiqaj779czvlbxjs6jfn53qw7601171nx5mird806r1g";
+    sha256 = "1kcdsylyx0ai0wlmc6rc6b1qi2fsndqh1pvgvddd3i4hmbhi6vmz";
   };
 
   patches =
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   # due to an uninitialized variable.
   CFLAGS = "-g -O2 -Wall";
 
-  buildInputs = [makeWrapper];
+  buildInputs = [ makeWrapper ];
 
   postInstall =
     ''

pkgs/tools/networking/dnsmasq/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.55";
+  name = "dnsmasq-2.57";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz";
-    sha256 = "0agrz7lvqdvh7ps173nr5yl00dblv2lpd0x9pm64f03zjzsyqqyg";
+    sha256 = "1bpq1wsc7cs1nqs7abhn96nxmdncdf7c58987f9kdmi246wcgq62";
   };
 
   makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";

pkgs/tools/networking/fuppes/default.nix

@@ -0,0 +1,45 @@
+{stdenv, fetchurl, pkgconfig, pcre, libxml2, sqlite, ffmpeg, imagemagick,
+exiv2, mp4v2, lame, libvorbis, flac, libmad, faad2}:
+
+stdenv.mkDerivation rec {
+  name = "fuppes-0.660";
+  src = fetchurl {
+    url = mirror://sourceforge/project/fuppes/fuppes/SVN-660/fuppes-0.660.tar.gz;
+    sha256 = "1c385b29878927e5f1e55ae2c9ad284849d1522d9517a88e34feb92bd5195173";
+  };
+
+  buildInputs = [
+    pkgconfig pcre libxml2 sqlite ffmpeg imagemagick exiv2 mp4v2 lame
+    libvorbis flac libmad faad2
+  ];
+
+  configureFlags = [
+    "--enable-ffmpegthumbnailer"
+    "--enable-magickwand"
+    "--enable-exiv2"
+    "--enable-transcoder-ffmpeg"
+    "--enable-mp4v2"
+    "--enable-lame"
+    "--enable-vorbis"
+    "--enable-flac"
+    "--enable-mad"
+    "--enable-faad"
+  ];
+
+  meta = {
+    description = "UPnP A/V Media Server";
+    longDescription = ''
+      FUPPES is a free, multiplatform UPnP A/V Media Server.
+
+      FUPPES supports a wide range of UPnP MediaRenderers as well as
+      on-the-fly transcoding of various audio, video and image formats.
+
+      FUPPES also includes basic DLNA support.
+    '';
+    homepage = http://fuppes.ulrich-voelkel.de/;
+    license = stdenv.lib.licenses.gpl2;
+
+    maintainers = [ stdenv.lib.maintainers.pierron ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/tools/networking/isync/default.nix

@@ -0,0 +1,21 @@
+{ fetchurl, stdenv, openssl, pkgconfig, db4 }:
+
+stdenv.mkDerivation rec {
+  name = "isync-1.0.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/isync/isync-1.0.4.tar.gz";
+    sha256 = "1xmgzypl5a3i0fz1ca55vfbs5mv2l9icwf2gk8rvlbwrkn2wid68";
+  };
+
+  buildInputs = [ openssl pkgconfig db4 ];
+
+  meta = {
+    homepage = http://isync.sourceforge.net/;
+    description = "Free IMAP and MailDir mailbox synchronizer";
+    licenses = [ "GPLv2+" ];
+
+    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/tools/networking/knetworkmanager/live.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, fetchgitrevision, cmake, kdelibs, automoc4, networkmanager, kdebase_workspace
+, repository ? "git://anongit.kde.org/networkmanagement"
+, branch ? "heads/master"
+, rev ? fetchgitrevision repository branch
+, src ? fetchgit {
+    url = repository;
+    rev = rev;
+  }
+}:
+
+stdenv.mkDerivation rec {
+  name = "knetwork-manager-${version}";
+  version = "live";
+
+  inherit src;  
+
+  buildInputs = [
+    cmake kdelibs automoc4 networkmanager kdebase_workspace
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://kde.org;
+    description = "KDE systray and plasma applet for network management.";
+    license = licenses.gplv2;
+    maintainers = with maintainers; [  phreedom ];
+  };
+}

pkgs/tools/networking/lftp/default.nix

@@ -1,11 +1,11 @@
-{stdenv, fetchurl, readline}:
+{stdenv, fetchurl, gnutls, libtasn1, pkgconfig, readline, zlib}:
 stdenv.mkDerivation {
-  name = "lftp-3.5.14";
+  name = "lftp-4.1.3";
 
   src = fetchurl {
-    url = ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/lftp-3.5.14.tar.bz2;
-    sha256 = "0hzrbhpgvndpd4wd08whfv1iqzbcijs1nxz40rhn651xabhiasrv";
+    url = ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/lftp-4.1.3.tar.bz2;
+    sha256 = "1nbgbql8kkhdvai0glwgkq8l9ik09l5lb8znpjrv26hfzl15dvv1";
   };
 
-  buildInputs = [readline];
+  buildInputs = [gnutls libtasn1 pkgconfig readline zlib];
 }

pkgs/tools/networking/mtr/default.nix

@@ -0,0 +1,47 @@
+x@{builderDefsPackage
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="mtr";
+    version="0.80";
+    name="${baseName}-${version}";
+    url="ftp://ftp.bitwizard.nl/${baseName}/${name}.tar.gz";
+    hash="1h0fzxy5cwml3p2nq749sq8mk2dsvm4qb1ah7a9hbf7kzabxvfvn";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "A network diagnostics tool";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = a.lib.licenses.gpl2;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "ftp://ftp.bitwizard.nl/mtr/";
+    };
+  };
+}) x
+

pkgs/tools/networking/nbd/default.nix

@@ -1,15 +1,19 @@
-{stdenv, fetchurl, pkgconfig, glib}:
+{ stdenv, fetchurl, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "nbd-2.9.18";
+  name = "nbd-2.9.20";
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "afaaae330625b61ad67ba988721ddc4ad54bfc7e501daeb45f721c205bfb00f3";
+    sha256 = "98f0de421f0b2f683d46dff3eb679a3409a41f08e6fad7c2f71f60c5d409939c";
   };
 
   buildInputs = [pkgconfig glib];
   postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"'';
+  
+  # Glib calls `clock_gettime', which is in librt.  Since we're using
+  # a static Glib, we need to pass it explicitly.
+  NIX_LDFLAGS = "-lrt";
 
   meta = {
     homepage = "http://nbd.sourceforge.net";

pkgs/tools/networking/network-manager/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus, dbus_glib, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, iptables, libtasn1 }:
+stdenv.mkDerivation rec {
+
+  name = "network-manager-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/NetworkManager/0.8/NetworkManager-${version}.tar.bz2";
+    sha256 = "1yhr1zc9p2dakvg6m33jgkf09r6f6bzly7kqqjcpim4r66z6y4nw";
+  };
+
+  configureFlags = [ "--with-distro=gentoo" "--with-dhclient=${dhcp}/sbin"
+    "--with-dhcpcd=${dhcp}/sbin" "--with-iptables=${iptables}/sbin/iptables"
+    "--with-crypto=gnutls" "--disable-more-warnings"
+    "--with-udev-dir=\${out}/lib/udev" ];
+
+  buildInputs = [ intltool wirelesstools pkgconfig dbus dbus_glib udev libnl1 libuuid polkit gnutls ppp libtasn1 ];
+
+  meta = with stdenv.lib; {
+    homepage = http://projects.gnome.org/NetworkManager/;
+    description = "Network configuration and management in an easy way. Desktop environment independent.";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}

pkgs/tools/networking/openssh/default.nix

@@ -13,11 +13,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openssh-5.6p1";
+  name = "openssh-5.8p1";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "0avc7jgp8i2jlp7b8q8g4nyil56v5fp09c1v54dc4ql15cxzb2jk";
+    sha256 = "0frjn6vc0jhj5gwfl95rdnjn1h9nlcaanr4xqmwyg9b26n7pmiz1";
   };
 
   prePatch = stdenv.lib.optionalString hpnSupport

pkgs/tools/networking/p2p/seeks/default.nix

@@ -1,18 +1,18 @@
 { fetchurl, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl
-, pkgconfig, protobuf, tokyocabinet }:
+, pkgconfig, protobuf, tokyocabinet, opencv }:
 
-let version = "0.3.0"; in
+let version = "0.3.1"; in
 stdenv.mkDerivation {
   name = "seeks-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/seeks/solo/seeks-${version}.tar.gz";
-    sha256 = "07gkf7666bx5fk3zk0s47fj659czlyk3ag9bihkl5mdjfikb6k46";
+    sha256 = "0yvws1j6rh1nv230gkqz3fkf21zdx0x7w8lh3w7gjmi7hfij25gx";
   };
 
   buildInputs =
     [ zlib docbook2x pcre curl libxml2 libevent perl pkgconfig
-      protobuf tokyocabinet
+      protobuf tokyocabinet opencv
     ];
 
   configureFlags =
@@ -22,6 +22,9 @@ stdenv.mkDerivation {
       "--with-libevent=${libevent}"
     ];
 
+  # FIXME: Test suite needs <https://code.google.com/p/googletest/>.
+  doCheck = false;
+
   meta = {
     description = "Seeks, a social web search engine";
 

pkgs/tools/networking/radvd/default.nix

@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, bison, flex }:
+
+stdenv.mkDerivation rec {
+  name = "radvd-1.7";
+  
+  src = fetchurl {
+    url = "http://www.litech.org/radvd/dist/${name}.tar.gz";
+    sha256 = "04rlz5fhparridjm32wcq9h1s3vxyiac7d3l6cvfgrlxixikgrzq";
+  };
+
+  buildInputs = [ bison flex ];
+
+  meta.homepage = http://www.litech.org/radvd/;
+  meta.description = "IPv6 Router Advertisement Daemon";
+}

pkgs/tools/networking/vde2/default.nix

@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, openssl, libpcap }:
+
+stdenv.mkDerivation rec {
+  name = "vde2-2.3.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/vde/vde2/2.3.1/${name}.tar.gz";
+    sha256 = "1vbrds8k1cn1fgvpkg2ck2227l5yy2f0qxk44sg3vymq0aiw8y37";
+  };
+
+  buildInputs = [ openssl libpcap ];
+
+  meta = {
+    homepage = http://vde.sourceforge.net/;
+    description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network";
+  };
+}

pkgs/tools/networking/wicd/default.nix

@@ -74,6 +74,12 @@ stdenv.mkDerivation rec {
     python setup.py install --prefix=$out
     ensureDir $out/share/other
     cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default
+
+    # Add a template for "WPA2 Enterprise" encryption as used, e.g., by the
+    # Eduroam network.  Taken and adapted from
+    # <http://wicd.net/punbb/viewtopic.php?id=87>.
+    cp -v "${./wpa2-ttls}" "$out/etc/encryption/templates/wpa2-ttls"
+    echo "wpa2-ttls" >> "$out/etc/encryption/templates/active"
   '';
 
   meta = {

pkgs/tools/networking/wicd/wpa2-ttls

@@ -0,0 +1,19 @@
+name = WPA2-TTLS
+author = various contributors
+version = 1
+require identity *Identity anonymous_identity *Anonymous_identity password *Password ca_cert *Path_to_CA_Cert
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+        ssid="$_ESSID"
+        scan_ssid=$_SCAN
+        proto=WPA2
+        key_mgmt=WPA-EAP
+        group=CCMP TKIP
+        eap=TTLS
+        identity="$_IDENTITY"
+        password="$_PASSWORD"
+        anonymous_identity="$_ANONYMOUS_IDENTITY"
+        ca_cert="$_CA_CERT"
+        phase2="auth=PAP"
+}