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