Author: eelco Date: Thu Mar 22 11:16:28 2012 New Revision: 33353 URL: https://nixos.org/websvn/nix/?rev=33353&sc=1
Log: * Fix rpcbind. It wasn't listening on port 111, causing nfsd to fail (http://hydra.nixos.org/build/2315333). Added: nixpkgs/trunk/pkgs/servers/rpcbind/sunrpc.patch Modified: nixpkgs/trunk/pkgs/servers/rpcbind/default.nix Modified: nixpkgs/trunk/pkgs/servers/rpcbind/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/servers/rpcbind/default.nix Thu Mar 22 10:44:57 2012 (r33352) +++ nixpkgs/trunk/pkgs/servers/rpcbind/default.nix Thu Mar 22 11:16:28 2012 (r33353) @@ -8,6 +8,8 @@ sha256 = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3"; }; + patches = [ ./sunrpc.patch ]; + preConfigure = '' export CPPFLAGS=-I${libtirpc}/include/tirpc ''; Added: nixpkgs/trunk/pkgs/servers/rpcbind/sunrpc.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/servers/rpcbind/sunrpc.patch Thu Mar 22 11:16:28 2012 (r33353) @@ -0,0 +1,27 @@ +http://projects.archlinux.org/svntogit/packages.git/tree/trunk/rpcbind-sunrpc.patch?h=packages/rpcbind + +Lookup "sunrpc" instead of "rpcbind" in /etc/services, since the former is the +official IANA name. + +--- rpcbind-0.1.7/src/rpcbind.c.orig 2008-11-19 14:17:34.000000000 +0100 ++++ rpcbind-0.1.7/src/rpcbind.c 2010-01-07 13:03:37.416632894 +0100 +@@ -114,7 +114,7 @@ + char *udp_uaddr; /* Universal UDP address */ + char *tcp_uaddr; /* Universal TCP address */ + #endif +-static char servname[] = "rpcbind"; ++static char servname[] = "sunrpc"; + static char superuser[] = "superuser"; + + int main __P((int, char *[])); +--- rpcbind-0.1.7/src/rpcinfo.c~ 2010-01-08 16:14:24.592156602 +0000 ++++ rpcbind-0.1.7/src/rpcinfo.c 2010-01-08 16:14:31.578838609 +0000 +@@ -633,7 +633,7 @@ + { + memset (&hints, 0, sizeof hints); + hints.ai_family = AF_INET; +- if ((error = getaddrinfo (host, "rpcbind", &hints, &res)) != 0 && ++ if ((error = getaddrinfo (host, "sunrpc", &hints, &res)) != 0 && + (error = getaddrinfo (host, "portmapper", &hints, &res)) != 0) + { + fprintf (stderr, "rpcinfo: %s: %s\n", _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
