aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-08 08:52:18 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-08 08:52:18 +0100
commit4eae840bd56bda22b7bf6c9a55f1118ed62461e4 (patch)
treeecc9287d1b038e36e37ef8e73c485cf915b1abd0 /debian/patches
parent54792fe297c0965c5c5d3a5db0280d064e2d7fa2 (diff)
downloadnx-libs-4eae840bd56bda22b7bf6c9a55f1118ed62461e4.tar.gz
nx-libs-4eae840bd56bda22b7bf6c9a55f1118ed62461e4.tar.bz2
nx-libs-4eae840bd56bda22b7bf6c9a55f1118ed62461e4.zip
Add patch: 111_nxcomp_byerace.full+lite.patch. Work around race condition in qtnx and libnxcl.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/111_nxcomp_byerace.full+lite.patch21
-rw-r--r--debian/patches/series1
2 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/111_nxcomp_byerace.full+lite.patch b/debian/patches/111_nxcomp_byerace.full+lite.patch
new file mode 100644
index 000000000..ff0f41c13
--- /dev/null
+++ b/debian/patches/111_nxcomp_byerace.full+lite.patch
@@ -0,0 +1,21 @@
+--- a/nxcomp/Loop.cpp
++++ b/nxcomp/Loop.cpp
+@@ -7321,6 +7321,18 @@
+ << logofs_flush;
+ #endif
+
++ // Henning Heinold
++ // fix up error from libnxcl where bye can be in front of NXPROXY
++ if (strncmp(options, "bye", strlen("bye")) == 0)
++ {
++ int bye_length = strlen("bye");
++ char *moo = &options[bye_length+1];
++
++ memmove(options, moo, DEFAULT_REMOTE_OPTIONS_LENGTH-bye_length-1);
++ *logofs << "Loop: Cleanded the bye in options, options now looks '"
++ << options << "'.\n" << logofs_flush;
++ }
++
+ if (strncmp(options, "NXPROXY-", strlen("NXPROXY-")) != 0)
+ {
+ #ifdef PANIC
diff --git a/debian/patches/series b/debian/patches/series
index 9133bf604..434e86aac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,6 +33,7 @@
108_nxagent_wine-close-delay.full.patch
109_nxagent_locale-utf8-compound-text.full.patch
110_nxagent_createpixmap-bounds-check.full.patch
+111_nxcomp_byerace.full+lite.patch
200_nxagent_check-binary-x2go-flavour.full.patch
201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
202_nx-x11_enable-xinerama.full.patch