Author: eelco
Date: Fri Mar 16 17:42:14 2012
New Revision: 33166
URL: https://nixos.org/websvn/nix/?rev=33166&sc=1
Log:
* portmap: Set SO_REUSEADDR to ensure that portmap can restart
properly.
Added:
nixpkgs/trunk/pkgs/servers/portmap/reuse-socket.patch
Modified:
nixpkgs/trunk/pkgs/servers/portmap/default.nix
Modified: nixpkgs/trunk/pkgs/servers/portmap/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/portmap/default.nix Fri Mar 16 17:20:04
2012 (r33165)
+++ nixpkgs/trunk/pkgs/servers/portmap/default.nix Fri Mar 16 17:42:14
2012 (r33166)
@@ -11,7 +11,9 @@
sha256 = "1pj13ll4mbfwjwpn3fbg03qq9im6v2i8fcpa3ffp4viykz9j1j02";
};
- patchPhase = ''
+ patches = [ ./reuse-socket.patch ];
+
+ postPatch = ''
substituteInPlace "Makefile" --replace "/usr/share" "" \
--replace "install -o root -g root" "install"
'';
Added: nixpkgs/trunk/pkgs/servers/portmap/reuse-socket.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/servers/portmap/reuse-socket.patch Fri Mar 16
17:42:14 2012 (r33166)
@@ -0,0 +1,38 @@
+Set SO_REUSEADDR to ensure that portmap can restart properly.
+
+https://bugs.launchpad.net/ubuntu/+source/portmap/+bug/688550
+
+===================================================================
+--- portmap-6.0.0.orig/portmap.c 2011-03-16 20:43:26.000000000 +0100
++++ portmap-6.0.0/portmap.c 2011-03-17 07:30:17.000000000 +0100
+@@ -142,9 +142,9 @@
+ * loopback interface address.
+ */
+
++static int on = 1;
+ #ifdef LOOPBACK_SETUNSET
+ static SVCXPRT *ludpxprt, *ltcpxprt;
+-static int on = 1;
+ #ifndef INADDR_LOOPBACK
+ #define INADDR_LOOPBACK ntohl(inet_addr("127.0.0.1"))
+ #endif
+@@ -399,9 +399,7 @@
+ syslog(LOG_ERR, "cannot create udp socket: %m");
+ exit(1);
+ }
+-#ifdef LOOPBACK_SETUNSET
+ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on);
+-#endif
+
+ memset((char *) &addr, 0, sizeof(addr));
+ addr.sin_addr.s_addr = 0;
+@@ -434,9 +432,7 @@
+ syslog(LOG_ERR, "cannot create tcp socket: %m");
+ exit(1);
+ }
+-#ifdef LOOPBACK_SETUNSET
+ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on);
+-#endif
+ if (bind(sock, (struct sockaddr *)&addr, len) != 0) {
+ syslog(LOG_ERR, "cannot bind tcp: %m");
+ exit(1);
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
