* Sync with the trunk.

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

pkgs/tools/networking/lsh/default.nix

@@ -7,11 +7,20 @@ stdenv.mkDerivation {
     sha256 = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091";
   };
 
+  patches = [ ./pam-service-name.patch ];
+
   buildInputs = [gperf guile gmp zlib liboop gnum4 pam];
 
   meta = {
     description = "GNU lsh, a GPL'd implementation of the SSH protocol";
+
+    longDescription = ''
+      lsh is a free implementation (in the GNU sense) of the ssh
+      version 2 protocol, currently being standardised by the IETF
+      SECSH working group.
+    '';
+    
     homepage = http://www.lysator.liu.se/~nisse/lsh/;
-    license = "GPL";
+    license = "GPLv2+";
   };
 }

pkgs/tools/networking/lsh/pam-service-name.patch

@@ -0,0 +1,14 @@
+Tell `lsh-pam-checkpw', the PAM password helper program, to use a more
+descriptive service name.
+
+--- lsh-2.0.4/src/lsh-pam-checkpw.c	2003-02-16 22:30:10.000000000 +0100
++++ lsh-2.0.4/src/lsh-pam-checkpw.c	2008-11-28 16:16:58.000000000 +0100
+@@ -38,7 +38,7 @@
+ #include <security/pam_appl.h>
+ 
+ #define PWD_MAXLEN 1024
+-#define SERVICE_NAME "other"
++#define SERVICE_NAME "lshd"
+ #define TIMEOUT 600 
+ 
+ static int

pkgs/tools/networking/nc6/1.0.nix

@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
     (textClosure localDefs 
      [doConfigure doMakeInstall doForceShare doPropagate]);
   meta = {
-    description = "
-      nc6 - one more netcat, IPv6 support included.
-    ";
+    description = "A netcat implementation with IPv6 support";
     homepage = "http://www.deepspace6.net/projects/netcat6.html";
     inherit src;
   };

pkgs/tools/networking/ncat/default.nix

@@ -1,4 +1,5 @@
 {stdenv, fetchurl, openssl}:
+
 stdenv.mkDerivation {
   name = "ncat-0.10rc3";
 
@@ -7,18 +8,18 @@ stdenv.mkDerivation {
     sha256 = "1yb26ipxwhqkfannji90jxi38k35fal4ffx0jm5clr1a1rndjjzb";
   };
 
-  patches = [./ncat-0.10rc3.patch ];
+  patches = [./ncat-0.10rc3.patch];
 
-  buildInputs = [openssl ];
+  buildInputs = [openssl];
 
   CFLAGS = "-g";
 
-  postInstall = "install -D ncat \${out}/bin/ncat ; 
-	install -D docs/man/ncat.1 \${out}/man/ncat.1 ;";
+  postInstall = ''
+    install -D ncat $out/bin/ncat
+    install -D docs/man/ncat.1 $out/man/ncat.1
+  '';
 
   meta = {
-    description = "
-	Ncat - some effort to join features from different `netcat's. Supports IPv6.
-";
+    description = "A netcat implementation with IPv6 support";
   };
 }

pkgs/tools/networking/nylon/default.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchurl, libevent} :
+
+stdenv.mkDerivation {
+  name = "nylon-1.21";
+  src = fetchurl {
+    url = http://monkey.org/~marius/nylon/nylon-1.21.tar.gz;
+    sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4";
+  };
+
+  configureFlags = [ "--with-libevent=${libevent}" ];
+
+  buildInputs = [ libevent ];
+
+  meta = {
+    homepage = http://monkey.org/~marius/nylon;
+    description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode.";
+    license = "free";
+  };
+}

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

@@ -13,8 +13,6 @@ stdenv.mkDerivation ( rec {
   buildInputs = [ pkgconfig openssl libsigcxx ];
   
   meta = {
-    description = "
-      LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code.
-    ";
+    description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code";
   };
 })

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

@@ -13,8 +13,6 @@ stdenv.mkDerivation ( rec {
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
   
   meta = {
-    description = "
-      rtorrent is a ncurses client for libtorrent and is ideal for use with screen or dtach.
-    ";
+    description = "An ncurses client for libtorrent, ideal for use with screen or dtach";
   };
 })

pkgs/tools/networking/smbfs-fuse/0.8.7.nix

@@ -21,10 +21,8 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doConfigure doMakeInstall postInstall doForceShare doPropagate]);
-	meta = {
-		description = "
-		Samba mounted via FUSE.
-";
-	  inherit src;
-	};
+  meta = {
+   description = "Samba mounted via FUSE";
+   inherit src;
+  };
 }

pkgs/tools/networking/stunnel/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation {
+  name = "stunnel-4.26";
+  
+  src = fetchurl {
+    url = http://www.stunnel.org/download/stunnel/src/stunnel-4.26.tar.gz;
+    sha256 = "1lvbd25krcz1sqk5pj2fv3r32h0160qdxrbzlqqs0kz8f987krp9";
+  };
+
+  buildInputs = [openssl];
+  
+  meta = {
+    description = "Stunnel - Universal SSL wrapper";
+    homepage = http://www.stunnel.org/;
+    license = "GPLv2";
+  };
+}