diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-22 11:16:28 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-22 11:16:28 +0000 |
| commit | d905637b44a6901ef6e27cdac2cbba0d9edb66e2 (patch) | |
| tree | 2c0bef7871926f36829777308b4de487e687ceed /pkgs/servers/rpcbind | |
| parent | acf3b221a752d4d4e3c208e8aa9a5c2d477f504f (diff) | |
| download | nixpkgs-d905637b44a6901ef6e27cdac2cbba0d9edb66e2.tar nixpkgs-d905637b44a6901ef6e27cdac2cbba0d9edb66e2.tar.gz nixpkgs-d905637b44a6901ef6e27cdac2cbba0d9edb66e2.tar.bz2 nixpkgs-d905637b44a6901ef6e27cdac2cbba0d9edb66e2.tar.lz nixpkgs-d905637b44a6901ef6e27cdac2cbba0d9edb66e2.tar.xz nixpkgs-d905637b44a6901ef6e27cdac2cbba0d9edb66e2.tar.zst nixpkgs-d905637b44a6901ef6e27cdac2cbba0d9edb66e2.zip | |
* Fix rpcbind. It wasn't listening on port 111, causing nfsd to fail
(http://hydra.nixos.org/build/2315333). svn path=/nixpkgs/trunk/; revision=33353
Diffstat (limited to 'pkgs/servers/rpcbind')
| -rw-r--r-- | pkgs/servers/rpcbind/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/rpcbind/sunrpc.patch | 27 |
2 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index db543cd2c01..33965299a9b 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3"; }; + patches = [ ./sunrpc.patch ]; + preConfigure = '' export CPPFLAGS=-I${libtirpc}/include/tirpc ''; diff --git a/pkgs/servers/rpcbind/sunrpc.patch b/pkgs/servers/rpcbind/sunrpc.patch new file mode 100644 index 00000000000..af9b3b71679 --- /dev/null +++ b/pkgs/servers/rpcbind/sunrpc.patch @@ -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", |