aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-06-11 10:43:14 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-06-11 10:43:14 +0200
commit5a07d00e0476ad278d1e54e51b667e1b5b95fd2e (patch)
treeaf671900f0b9f796824f5b39d47facf6f75f83f0 /debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch
parent57fb5bb5733fb69c98a9c2fecb06ed4cd7b922f3 (diff)
downloadnx-libs-5a07d00e0476ad278d1e54e51b667e1b5b95fd2e.tar.gz
nx-libs-5a07d00e0476ad278d1e54e51b667e1b5b95fd2e.tar.bz2
nx-libs-5a07d00e0476ad278d1e54e51b667e1b5b95fd2e.zip
Make 220_nxproxy-bind-loopback-only.full+lite.patch cleanly apply after having added 027_nxcomp_abstract-X11-socket.patch.
Diffstat (limited to 'debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch')
-rw-r--r--debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch b/debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch
index b8f87650b..fc268a55f 100644
--- a/debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch
+++ b/debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch
@@ -26,7 +26,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
if (bind(tcpFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
{
-@@ -4512,7 +4520,14 @@
+@@ -4550,7 +4558,14 @@
tcpAddr.sin_family = AF_INET;
tcpAddr.sin_port = htons(portTCP);
@@ -42,7 +42,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
if (bind(newFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
{
-@@ -6680,7 +6695,14 @@
+@@ -6718,7 +6733,14 @@
#ifdef __APPLE__
@@ -58,7 +58,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
#else
-@@ -8359,6 +8381,10 @@
+@@ -8397,6 +8419,10 @@
listenPort = ValidateArg("local", name, value);
}
@@ -69,7 +69,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
else if (strcasecmp(name, "accept") == 0)
{
if (*connectHost != '\0')
-@@ -13735,7 +13761,14 @@
+@@ -13773,7 +13799,14 @@
}
else
{