Updating from trunk. I had to do some changes to make it fit.

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

pkgs/tools/networking/openssh/default.nix

@@ -13,17 +13,18 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openssh-5.5p1";
+  name = "openssh-5.6p1";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "12kywhjnz6w6kx5fk526fhs2xc7rf234hwrms9p1hqv6zrpdvvin";
+    sha256 = "0avc7jgp8i2jlp7b8q8g4nyil56v5fp09c1v54dc4ql15cxzb2jk";
   };
 
   prePatch = stdenv.lib.optionalString hpnSupport
     ''
       gunzip -c ${hpnSrc} | patch -p1
     '';
+    
   patches = [ ./locale_archive.patch ];
 
   buildInputs = [ zlib openssl perl libedit pkgconfig pam ];

pkgs/tools/networking/sitecopy/default.nix

@@ -1,14 +1,18 @@
-{stdenv, fetchurl, neon, openssl}:
+{ stdenv, fetchurl, neon, zlib, openssl, autoconf, automake, libtool }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "sitecopy-0.16.6";
 
   src = fetchurl {
-    url = http://www.manyfish.co.uk/sitecopy/sitecopy-0.16.6.tar.gz;
+    url = "http://www.manyfish.co.uk/sitecopy/${name}.tar.gz";
     sha256 = "1bsqfhfq83g1qambqf8i1ivvggz5d2byg94hmrpxqkg50yhdsvz0";
   };
 
-  buildInputs = [openssl]; 
+  patches = [ ./neon-29.patch ];
+
+  preConfigure = "autoreconf";
+
+  buildInputs = [ openssl neon zlib autoconf automake libtool ]; 
 
   configureFlags= "--with-ssl=openssl"; 
 }

pkgs/tools/networking/sitecopy/neon-29.patch

@@ -0,0 +1,15 @@
+diff -ru sitecopy-0.16.6-orig/configure.in sitecopy-0.16.6/configure.in
+--- sitecopy-0.16.6-orig/configure.in	2008-04-02 13:59:30.000000000 +0200
++++ sitecopy-0.16.6/configure.in	2010-08-26 15:07:04.000000000 +0200
+@@ -112,8 +112,8 @@
+    AC_LIBOBJ(lib/fnmatch)
+ fi
+ 
+-# Support neon 0.24 through 0.28
+-NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])
++# Support neon 0.24 through 0.29
++#NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29])
+ 
+ dnl But we don't use zlib or ACL support
+ NEON_WITHOUT_ZLIB
+Only in sitecopy-0.16.6/: configure.in~