aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch8
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 60c5fe796..54992628b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low
NX proxy attempt connecting to the abstract X11 socket first, and only
fallback to the file system socket, if the abstract socket is not
available. (Fixes: #505).
+ * Make 220_nxproxy-bind-loopback-only.full+lite.patch cleanly apply after
+ having added 027_nxcomp_abstract-X11-socket.patch.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 May 2014 09:58:10 +0200
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
{