From 0ac7828c6b36816b41f41513f8126b9f100c6eb1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 16 Mar 2012 17:42:14 +0000
Subject: [PATCH] * portmap: Set SO_REUSEADDR to ensure that portmap can
 restart   properly.

svn path=/nixpkgs/trunk/; revision=33166
---
 pkgs/servers/portmap/default.nix        |  4 ++-
 pkgs/servers/portmap/reuse-socket.patch | 38 +++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/portmap/reuse-socket.patch

diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix
index 52635b5818f0..d7a05261ff22 100644
--- a/pkgs/servers/portmap/default.nix
+++ b/pkgs/servers/portmap/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1pj13ll4mbfwjwpn3fbg03qq9im6v2i8fcpa3ffp4viykz9j1j02";
   };
 
-  patchPhase = ''
+  patches = [ ./reuse-socket.patch ];
+
+  postPatch = ''
     substituteInPlace "Makefile" --replace "/usr/share" "" \
       --replace "install -o root -g root" "install"
   '';
diff --git a/pkgs/servers/portmap/reuse-socket.patch b/pkgs/servers/portmap/reuse-socket.patch
new file mode 100644
index 000000000000..7d1a0ca09524
--- /dev/null
+++ b/pkgs/servers/portmap/reuse-socket.patch
@@ -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);