nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-12 20:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

* portmap: Set SO_REUSEADDR to ensure that portmap can restart

Browse Source 
properly.

svn path=/nixpkgs/trunk/; revision=33166
This commit is contained in:
Eelco Dolstra 2012-03-16 17:42:14 +00:00
parent 1148fc2f76
commit 0ac7828c6b
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/portmap/default.nix
View File

@ -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"
'';

38
pkgs/servers/portmap/reuse-socket.patch Normal file
View File

@ -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);