diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-06-15 00:33:28 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-06-15 00:33:28 +0200 |
| commit | 36f4e34b2702eabe991ec97dc0064c3b2b4d12fe (patch) | |
| tree | 0eddaa828d7d01e74e022257a705d6dd5b2209e1 | |
| parent | 75987a76f0b9a3a011ab7d703b5b2fe60c146af6 (diff) | |
| download | nx-libs-36f4e34b2702eabe991ec97dc0064c3b2b4d12fe.tar.gz nx-libs-36f4e34b2702eabe991ec97dc0064c3b2b4d12fe.tar.bz2 nx-libs-36f4e34b2702eabe991ec97dc0064c3b2b4d12fe.zip | |
Add 029_nxcomp_ppc64.full+lite.patch. Fix sockaddr handling on Big Endian systems (like PPC64). (Fixes: #515).
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/029_nxcomp_ppc64.full+lite.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6e5a49ecc..2729b3066 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low * Add 302_nx-X11_xkbbasedir-detection.patch. For detecting XkbBaseDir test for xkb/rules/base instead of testing for deprecated file xkb/keymap.dir. (Fixes: #40). + * Add 029_nxcomp_ppc64.full+lite.patch. Fix sockaddr handling on + Big Endian systems (like PPC64). (Fixes: #515). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 May 2014 09:58:10 +0200 diff --git a/debian/patches/029_nxcomp_ppc64.full+lite.patch b/debian/patches/029_nxcomp_ppc64.full+lite.patch new file mode 100644 index 000000000..8040925ba --- /dev/null +++ b/debian/patches/029_nxcomp_ppc64.full+lite.patch @@ -0,0 +1,16 @@ +diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
+index c9617c3..955be85 100644
+--- a/nxcomp/Loop.cpp
++++ b/nxcomp/Loop.cpp
+@@ -6854,9 +6854,9 @@ int WaitForRemote(int portNum)
+ {
+ sockaddr_in newAddr;
+
+- size_t addrLen = sizeof(sockaddr_in);
++ socklen_t addrLen = sizeof(sockaddr_in);
+
+- newFD = accept(proxyFD, (sockaddr *) &newAddr, (socklen_t *) &addrLen);
++ newFD = accept(proxyFD, (sockaddr *) &newAddr, &addrLen);
+
+ if (newFD == -1)
+ {
diff --git a/debian/patches/series b/debian/patches/series index e9ee779ac..58a164caf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -24,6 +24,7 @@ 026_nxcompshad_honour-optflags.full.patch 027_nxcomp_abstract-X11-socket.full+lite.patch 028_nx-X11_abstract-kernel-sockets.full.patch +029_nxcomp_ppc64.full+lite.patch 030_nx-X11_configure-args.full.patch 031_nx-X11_parallel-make.full.patch 051_nxcomp_macos105-fdisset.full+lite.patch |