GNU MyServer 0.10.

svn path=/nixpkgs/trunk/; revision=24359

3 files changed, 22 insertions, 40 deletions

diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix
index 45e7f33681f0..776c121399e2 100644
--- a/pkgs/servers/http/myserver/default.nix
+++ b/pkgs/servers/http/myserver/default.nix
@@ -1,22 +1,27 @@
 { fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls
-, libxml2, zlib, texinfo, cppunit, xz }:
+, libxml2, zlib, guile, texinfo, cppunit, xz }:
 
-let version = "0.9.2"; in
+let version = "0.10"; in
   stdenv.mkDerivation rec {
     name = "myserver-${version}";
 
     src = fetchurl {
       url = "mirror://gnu/myserver/${version}/${name}.tar.xz";
-      sha256 = "110001ssyrvmvqrkxbz09a5m945ahh478v1l7aq31gh1l9j0cf6n";
+      sha256 = "0w8njgka54if8ycd9cyxgmqa0ivv7r0rka7gda3x2rfr2z4nxvpb";
     };
 
-    patches = [ ./tests-in-chroot.patch ];
+    patches = [ ./disable-dns-lookup-in-chroot.patch ];
 
-    buildInputs = [ libgcrypt libevent libidn gnutls libxml2 zlib texinfo xz ]
+    buildInputs =
+      [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ]
       ++ stdenv.lib.optional doCheck cppunit;
 
+    makeFlags = [ "V=1" ];
+
     doCheck = true;
 
+    enableParallelBuilding = true;
+
     meta = {
       description = "GNU MyServer, a powerful and easy to configure web server";
 
diff --git a/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch b/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch
new file mode 100644
index 000000000000..31b24915c4da
--- /dev/null
+++ b/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch
@@ -0,0 +1,12 @@
+Disable this test because it attempts to do a DNS lookup, which fails
+in a chroot.
+
+--- myserver-0.10/tests/test_socket.cpp	2010-10-19 00:12:59.000000000 +0200
++++ myserver-0.10/tests/test_socket.cpp	2010-10-19 00:13:07.000000000 +0200
+@@ -56,7 +56,6 @@ class TestSocket : public CppUnit::TestF
+ 
+   CPPUNIT_TEST (testGethostname);
+   CPPUNIT_TEST (testRecv);
+-  CPPUNIT_TEST (testGetLocalIPsList);
+ 
+   CPPUNIT_TEST_SUITE_END ();
diff --git a/pkgs/servers/http/myserver/tests-in-chroot.patch b/pkgs/servers/http/myserver/tests-in-chroot.patch
deleted file mode 100644
index 83d1adf7c5b6..000000000000
--- a/pkgs/servers/http/myserver/tests-in-chroot.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Some of the tests can't be run in a chroot:
-
-  - `test_homedir' wants to access /etc/passwd.
-  - `test_socket' would want /etc/hosts.
-
---- myserver-0.9.2/tests/test_homedir.cpp	2010-02-14 21:04:14.000000000 +0100
-+++ myserver-0.9.2/tests/test_homedir.cpp	2010-02-16 11:22:23.000000000 +0100
-@@ -58,6 +58,7 @@ public:
-      * if it doesn't handle this differently.  */
-     username.assign ("root");
- #endif
-+#if 0
-     string dir;
- 
-     CPPUNIT_ASSERT_EQUAL (homeDir->getHomeDir (username, dir), 0);
-@@ -65,6 +66,7 @@ public:
-     CPPUNIT_ASSERT (dir.length ());
- 
-     homeDir->clear ();
-+#endif
-   }
- 
- };
-
---- myserver-0.9.2/tests/test_socket.cpp	2010-02-14 21:04:14.000000000 +0100
-+++ myserver-0.9.2/tests/test_socket.cpp	2010-02-16 11:31:00.000000000 +0100
-@@ -178,7 +178,7 @@ static DEFINE_THREAD (testRecvClient, pP
-     {
-       int ret;
-       Socket *obj2 = new Socket;
--      char host[] = "localhost";
-+      char host[] = "127.0.0.1";
- 
-       ret = obj2->socket (AF_INET, SOCK_STREAM, 0);
-       CPPUNIT_ASSERT (ret != -1);