This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from 359c458 update last committed patch, fix EOL style new cfb1990 Add 057_nx-X11-bigendian-ppc64-no-session-window.patch. Fix failures in session windows coming up on Big Endian systems like PPC64. (Fixes: #516). new afcc7a9 Improve 105_nxagent_export-remote-keyboard-config.full.patch. Don't print out nonsensical information, if there really was no error when creating the keyboard file or the other way around. Also add the reason when failing to create the keyboard file. Only print an error message if SessionPath *really* is not defined. new 3446d14 Improve 028_nx-X11_abstract-kernel-sockets.full.patch. Make it more Big Endian robust by assigning correct types for socklen_t objects. new abbe7e8 Add 990_fix-DEBUG-and-TEST-builds.full.patch. Fix debug builds (e.g. when globally setting -DDEBUG and -DTEST at build time). new 8be0a04 fix 057, rebase new eca0ee9 Update patches, to make them apply cleanly after above changes: The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 29 ++++++-- .../028_nx-X11_abstract-kernel-sockets.full.patch | 54 ++++++++++----- .../056_nx-X11-Werror-format-security.full.patch | 6 +- ...11-bigendian-ppc64-no-session-window.full.patch | 69 ++++++++++++++++++++ ...xagent_export-remote-keyboard-config.full.patch | 21 +++++- .../108_nxagent_wine-close-delay.full.patch | 4 +- debian/patches/300_nxagent_set-wm-class.full.patch | 2 +- .../990_fix-DEBUG-and-TEST-builds.full.patch | 69 ++++++++++++++++++++ debian/patches/series | 2 + 9 files changed, 225 insertions(+), 31 deletions(-) create mode 100644 debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch create mode 100644 debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit cfb1990d4e845201182ef254da0ae9fe0536c616 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 21 22:29:44 2014 +0200 Add 057_nx-X11-bigendian-ppc64-no-session-window.patch. Fix failures in session windows coming up on Big Endian systems like PPC64. (Fixes: #516). --- debian/changelog | 12 ++++-- ...11-bigendian-ppc64-no-session-window.full.patch | 43 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 47a74ec..f6d55fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,13 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low + [ Mihai Moldovan ] + * Add 029_nxcomp_ppc64.full+lite.patch. Fix sockaddr handling on + Big Endian systems (like PPC64). (Fixes: #515). + * Add 057_nx-X11-bigendian-ppc64-no-session-window.patch. Fix + failures in session windows coming up on Big Endian systems + like PPC64. (Fixes: #516). + + [ Mike Gabriel ] * Add 606_nx-X11_build-on-aarch64.full.patch. Build on aarch64 architectures. (Fixes: #490). * Add 027_nxcomp_abstract-X11-socket.full+lite.patch. In proxy mode "server" @@ -16,10 +24,6 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low test for xkb/rules/base instead of testing for deprecated file xkb/keymap.dir. (Fixes: #40). - [ Mihai Moldovan ] - * 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 nx-libs (2:3.5.0.24-0x2go1) unstable; urgency=low diff --git a/debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch b/debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch new file mode 100644 index 0000000..eae46e1 --- /dev/null +++ b/debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch @@ -0,0 +1,43 @@ +Description: No session window with on PPC64 builds +Author: Mihai Moldovan <ionic@ionic.de> +Abstract: + An endiannes issue was setting incorrect event masks when creating X11 windows. + . + This time, a smaller integer has been casted to a bigger one and passed to some + function actually setting its value. + . + This meant, that garbage from stack was attached to the smaller integer value, + putting unknown memory into the lower bytes of the bigger integer. + . + Fix this by creating a big, initialized temporary variable, let the function do + its magic on that one and pass the value back to the smaller variable -- and + cross your fingers the smaller variable can hold it without overrunning. (The + last bit is a design issue we can't really fix and has been around even before + this patch.) + +--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c +@@ -327,7 +327,10 @@ + + if (mask & CWEventMask) + { +- nxagentGetEventMask(pWin, (Mask*)&attributes.event_mask); ++ /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */ ++ Mask tmp_mask = attributes.event_mask; ++ nxagentGetEventMask(pWin, &tmp_mask); ++ attributes.event_mask = (int)tmp_mask; + } + #ifdef WARNING + else +@@ -2891,7 +2894,10 @@ + + if (mask & CWEventMask) + { +- nxagentGetEventMask(pWin, (Mask*)&attributes.event_mask); ++ /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */ ++ Mask tmp_mask = attributes.event_mask; ++ nxagentGetEventMask(pWin, &tmp_mask); ++ attributes.event_mask = (int)tmp_mask; + } + #ifdef WARNING + else diff --git a/debian/patches/series b/debian/patches/series index 58a164c..5d28ae7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,6 +33,7 @@ 054_nx-X11_ppc64-ftbfs.full.patch 055_nx-X11_imake-Werror-format-security.full.patch 056_nx-X11-Werror-format-security.full.patch +057_nx-X11-bigendian-ppc64-no-session-window.full.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 103_nxagent_set-X0-config-path.full.patch -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit afcc7a93dfcbc096a2bcc1b1a572e2dd704918c0 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 21 22:35:47 2014 +0200 Improve 105_nxagent_export-remote-keyboard-config.full.patch. Don't print out nonsensical information, if there really was no error when creating the keyboard file or the other way around. Also add the reason when failing to create the keyboard file. Only print an error message if SessionPath *really* is not defined. --- debian/changelog | 5 +++++ ...xagent_export-remote-keyboard-config.full.patch | 21 +++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6d55fb..1a09e16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,11 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low * Add 057_nx-X11-bigendian-ppc64-no-session-window.patch. Fix failures in session windows coming up on Big Endian systems like PPC64. (Fixes: #516). + * Improve 105_nxagent_export-remote-keyboard-config.full.patch. + Don't print out nonsensical information, if there really was + no error when creating the keyboard file or the other way around. + Also add the reason when failing to create the keyboard file. + Only print an error message if SessionPath *really* is not defined. [ Mike Gabriel ] * Add 606_nx-X11_build-on-aarch64.full.patch. Build on aarch64 diff --git a/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch b/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch index 2ea3a2c..389feaf 100644 --- a/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch +++ b/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch @@ -36,7 +36,16 @@ Last-Update: 2011-12-31 #include "NXlib.h" -@@ -1790,6 +1791,42 @@ +@@ -72,6 +73,8 @@ + + #include "Xatom.h" + ++#include <errno.h> ++ + static int nxagentXkbGetNames(char **rules, char **model, char **layout, + char **variant, char **options); + +@@ -1790,6 +1793,48 @@ } #endif @@ -65,11 +74,17 @@ Last-Update: 2011-12-31 + if ( doptions != NULL ) + fprintf(keyboard_file, "options=%s\n", doptions); + fclose(keyboard_file); ++ fprintf(stderr, "keyboard file created\n"); ++ } ++ else { ++ int save_err = errno; ++ fprintf(stderr, "keyboard file not created: %s\n", strerror(save_err)); + } + free(keyboard_file_path); -+ fprintf(stderr, "keyboard file created\n"); + } -+ fprintf(stderr, "SessionPath not defined\n"); ++ else { ++ fprintf(stderr, "SessionPath not defined\n"); ++ } + } + else + { -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 3446d14ea37114679d9f84c98a2c67302ce306b8 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 21 22:39:10 2014 +0200 Improve 028_nx-X11_abstract-kernel-sockets.full.patch. Make it more Big Endian robust by assigning correct types for socklen_t objects. --- debian/changelog | 2 + .../028_nx-X11_abstract-kernel-sockets.full.patch | 54 ++++++++++++++------ 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a09e16..02346d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low no error when creating the keyboard file or the other way around. Also add the reason when failing to create the keyboard file. Only print an error message if SessionPath *really* is not defined. + * Improve 028_nx-X11_abstract-kernel-sockets.full.patch. Make it more + Big Endian robust by assigning correct types for socklen_t objects. [ Mike Gabriel ] * Add 606_nx-X11_build-on-aarch64.full.patch. Build on aarch64 diff --git a/debian/patches/028_nx-X11_abstract-kernel-sockets.full.patch b/debian/patches/028_nx-X11_abstract-kernel-sockets.full.patch index ae672e9..279f9a9 100644 --- a/debian/patches/028_nx-X11_abstract-kernel-sockets.full.patch +++ b/debian/patches/028_nx-X11_abstract-kernel-sockets.full.patch @@ -34,7 +34,29 @@ Abstract: struct sockaddr sa; fd_set fs; struct timeval t; -@@ -1477,23 +1483,28 @@ +@@ -914,9 +920,11 @@ + struct sockaddr_in socknamev4; + void *socknamePtr; + #if defined(SVR4) || defined(__SCO__) ++# define SOCKLEN_T_PTR void* + size_t namelen; + #else +- int namelen; ++# define SOCKLEN_T_PTR socklen_t* ++ socklen_t namelen; + #endif + + PRMSG (3,"SocketINETGetAddr(%p)\n", ciptr, 0, 0); +@@ -935,7 +943,7 @@ + } + + if (getsockname (ciptr->fd,(struct sockaddr *) socknamePtr, +- (void *)&namelen) < 0) ++ (SOCKLEN_T_PTR)&namelen) < 0) + { + #ifdef WIN32 + errno = WSAGetLastError(); +@@ -1477,23 +1485,28 @@ #ifdef UNIXCONN static int @@ -73,7 +95,7 @@ Abstract: return 0; } #endif -@@ -1726,6 +1737,12 @@ +@@ -1726,6 +1739,12 @@ int oldUmask; int status; unsigned int mode; @@ -86,7 +108,7 @@ Abstract: PRMSG (2, "SocketUNIXCreateListener(%s)\n", port ? port : "NULL", 0, 0); -@@ -1741,11 +1758,11 @@ +@@ -1741,11 +1760,11 @@ mode = 0777; #endif #ifdef NX_TRANS_SOCKET @@ -100,7 +122,7 @@ Abstract: PRMSG (1, "SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n", UNIX_DIR, errno, 0); #endif -@@ -1754,13 +1771,18 @@ +@@ -1754,13 +1773,18 @@ } #endif @@ -121,7 +143,7 @@ Abstract: #endif PRMSG (1, "SocketUNIXCreateListener: path too long\n", 0, 0, 0); return TRANS_CREATE_LISTENER_FAILED; -@@ -1784,7 +1806,12 @@ +@@ -1784,7 +1808,12 @@ fprintf(stderr, "SocketUNIXCreateListener: Unlinking path [%s] for ciptr at [%p].\n", sockname.sun_path, (void *) ciptr); #endif @@ -135,7 +157,7 @@ Abstract: if ((status = TRANS(SocketCreateListener) (ciptr, (struct sockaddr *) &sockname, namelen, flags)) < 0) -@@ -1814,6 +1841,9 @@ +@@ -1814,6 +1843,9 @@ return TRANS_CREATE_LISTENER_FAILED; } @@ -145,7 +167,7 @@ Abstract: ciptr->family = sockname.sun_family; ciptr->addrlen = namelen; memcpy (ciptr->addr, &sockname, ciptr->addrlen); -@@ -1823,7 +1853,6 @@ +@@ -1823,7 +1855,6 @@ return 0; } @@ -153,7 +175,7 @@ Abstract: static int TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr) -@@ -1836,15 +1865,20 @@ +@@ -1836,15 +1867,20 @@ struct stat statb; int status = TRANS_RESET_NOOP; unsigned int mode; @@ -176,7 +198,7 @@ Abstract: #endif { int oldUmask = umask (0); -@@ -2034,6 +2068,11 @@ +@@ -2034,6 +2070,11 @@ } @@ -188,7 +210,7 @@ Abstract: newciptr->addrlen = ciptr->addrlen; memcpy (newciptr->addr, ciptr->addr, newciptr->addrlen); -@@ -2626,6 +2665,12 @@ +@@ -2626,6 +2667,12 @@ struct sockaddr_un sockname; int namelen; @@ -201,7 +223,7 @@ Abstract: #if defined(hpux) && defined(X11_t) struct sockaddr_un old_sockname; int old_namelen; -@@ -2674,9 +2719,9 @@ +@@ -2674,9 +2721,9 @@ sockname.sun_family = AF_UNIX; #ifdef NX_TRANS_SOCKET @@ -213,7 +235,7 @@ Abstract: #endif PRMSG (1, "SocketUNIXConnect: path too long\n", 0, 0, 0); return TRANS_CONNECT_FAILED; -@@ -2722,6 +2767,14 @@ +@@ -2722,6 +2769,14 @@ #endif /* @@ -228,7 +250,7 @@ Abstract: * Do the connect() */ -@@ -2757,12 +2810,18 @@ +@@ -2757,12 +2812,18 @@ * should try again. */ @@ -252,7 +274,7 @@ Abstract: PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n", EGET(),0, 0); -@@ -2791,6 +2850,9 @@ +@@ -2791,6 +2852,9 @@ return TRANS_CONNECT_FAILED; } @@ -262,7 +284,7 @@ Abstract: ciptr->family = AF_UNIX; ciptr->addrlen = namelen; ciptr->peeraddrlen = namelen; -@@ -3323,7 +3385,11 @@ +@@ -3323,7 +3387,11 @@ Xtransport TRANS(SocketLocalFuncs) = { /* Socket Interface */ "local", @@ -274,7 +296,7 @@ Abstract: #ifdef TRANS_CLIENT TRANS(SocketOpenCOTSClient), #endif /* TRANS_CLIENT */ -@@ -3369,7 +3435,7 @@ +@@ -3369,7 +3437,7 @@ Xtransport TRANS(SocketUNIXFuncs) = { /* Socket Interface */ "unix", -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit abbe7e8401f3ffdc40c2ff4bf16fa9801fbd0610 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 21 23:04:16 2014 +0200 Add 990_fix-DEBUG-and-TEST-builds.full.patch. Fix debug builds (e.g. when globally setting -DDEBUG and -DTEST at build time). --- debian/changelog | 2 + .../990_fix-DEBUG-and-TEST-builds.full.patch | 69 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 72 insertions(+) diff --git a/debian/changelog b/debian/changelog index 02346d0..3edfbbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low Only print an error message if SessionPath *really* is not defined. * Improve 028_nx-X11_abstract-kernel-sockets.full.patch. Make it more Big Endian robust by assigning correct types for socklen_t objects. + * Add 990_fix-DEBUG-and-TEST-builds.full.patch. Fix debug builds (e.g. + when globally setting -DDEBUG and -DTEST at build time). [ Mike Gabriel ] * Add 606_nx-X11_build-on-aarch64.full.patch. Build on aarch64 diff --git a/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch b/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch new file mode 100644 index 0000000..0fef1a9 --- /dev/null +++ b/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch @@ -0,0 +1,69 @@ +Author: Mihai Moldovan <ionic@ionic.de> +Description: Several fixes for building debug versions of NX +Abstract: + (1) In nx-X11/programs/Xserver/dix: + . + Fix several compile errors when specifying -DDEBUG globally. Previous GCC + versions were more liberal and the code thus compiled. + . + Also initialize/reset a count variable correctly. + . + . + (2) In nx-X11/programs/Xserver/hw/nxagent/Render.c: + . + Check for pSrc->pDrawable to exist instead of having nxagent segfault when + it does not. + . + This enables the possibility of compiling all nxagent modules in TEST mode. + +--- a/nx-X11/programs/Xserver/dix/dixfonts.c ++++ b/nx-X11/programs/Xserver/dix/dixfonts.c +@@ -2203,7 +2203,7 @@ + byte = 0; + for (l = 0; l <= (cip->metrics.rightSideBearing - + cip->metrics.leftSideBearing); l++) { +- if (maskTab[l & 7] & row[l >> 3]) ++ if (maskTab[l & 7] & (((int*)row)[l >> 3])) + putchar('X'); + else + putchar('.'); +--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c +@@ -1678,10 +1678,11 @@ + + #ifdef TEST + +- fprintf(stderr, "nxagentTrapezoids: Source is a [%s] of geometry [%d,%d].\n", +- (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), +- pSrc -> pDrawable -> width, pSrc -> pDrawable -> height); +- ++ if (pSrc->pDrawable) { ++ fprintf(stderr, "nxagentTrapezoids: Source is a [%s] of geometry [%d,%d].\n", ++ (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), ++ pSrc -> pDrawable -> width, pSrc -> pDrawable -> height); ++ } + if (pSrc ->pDrawable != pDst -> pDrawable) + { + fprintf(stderr, "nxagentTrapezoids: Destination is a [%s] of geometry [%d,%d].\n", +--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c +@@ -734,7 +734,7 @@ + + client->sequence++; + #ifdef DEBUG +- if (client->requestLogIndex == MAX_REQUEST_LOG) ++ if ((client->requestLogIndex >= MAX_REQUEST_LOG) || (client->requestLogIndex <= 0)) + client->requestLogIndex = 0; + client->requestLog[client->requestLogIndex] = MAJOROP; + client->requestLogIndex++; +--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c +@@ -2351,7 +2351,7 @@ + byte = 0; + for (l = 0; l <= (cip->metrics.rightSideBearing - + cip->metrics.leftSideBearing); l++) { +- if (maskTab[l & 7] & row[l >> 3]) ++ if (maskTab[l & 7] & (((int *)row)[l >> 3])) + putchar('X'); + else + putchar('.'); diff --git a/debian/patches/series b/debian/patches/series index 5d28ae7..ad78912 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -61,6 +61,7 @@ 604_nx-X11_recent-freetype-API.full.patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch 606_nx-X11_build-on-aarch64.full.patch +990_fix-DEBUG-and-TEST-builds.full.patch 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch 016_nx-X11_install-location.debian.patch 102_xserver-xext_set-securitypolicy-path.debian.patch -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 8be0a04722995e1bd77b0b3c95dfe272ad91f26c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jun 21 23:17:41 2014 +0200 fix 057, rebase --- ...11-bigendian-ppc64-no-session-window.full.patch | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch b/debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch index eae46e1..8795904 100644 --- a/debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch +++ b/debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch @@ -41,3 +41,29 @@ Abstract: } #ifdef WARNING else +@@ -3352,7 +3358,10 @@ + + if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin)) + { +- nxagentGetEventMask(pWin, (Mask*)&attributes.event_mask); ++ /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */ ++ Mask tmp_mask = attributes.event_mask; ++ nxagentGetEventMask(pWin, &tmp_mask); ++ attributes.event_mask = (int)tmp_mask; + + XChangeWindowAttributes(nxagentDisplay, nxagentWindow(pWin), mask, &attributes); + } +--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c +@@ -1665,7 +1665,10 @@ + + attributes.background_pixel = nxagentBlackPixel; + +- nxagentGetDefaultEventMask((Mask*)&attributes.event_mask); ++ /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */ ++ Mask tmp_mask = attributes.event_mask; ++ nxagentGetDefaultEventMask(&tmp_mask); ++ attributes.event_mask = (int)tmp_mask; + + attributes.colormap = nxagentDefaultVisualColormap(nxagentDefaultVisual(pScreen)); + -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit eca0ee98cfba39cb37c5da1779716b6b8b2ee602 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jun 21 23:20:33 2014 +0200 Update patches, to make them apply cleanly after above changes: + 056_nx-X11-Werror-format-security.full.patch + 108_nxagent_wine-close-delay.full.patch + 300_nxagent_set-wm-class.full.patch --- debian/changelog | 10 +++++++--- .../056_nx-X11-Werror-format-security.full.patch | 6 +++--- .../108_nxagent_wine-close-delay.full.patch | 4 ++-- debian/patches/300_nxagent_set-wm-class.full.patch | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3edfbbe..78f6314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,9 +23,6 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low let 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.full+lite.patch. - * Make 016_nx-X11_install-location.debian.patch cleanly apply again. * Add 028_nx-X11_abstract-kernel-sockets.full.patch. Provide abstract local socket support for Linux based systems. This patch pulls in abstract socket relevant code from xtrans 1.2.7. (Fixes: #504). @@ -33,6 +30,13 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low test for xkb/rules/base instead of testing for deprecated file xkb/keymap.dir. (Fixes: #40). + * Update patches, to make them apply cleanly after above changes: + + 220_nxproxy-bind-loopback-only.full+lite.patch + + 016_nx-X11_install-location.debian.patch + + 056_nx-X11-Werror-format-security.full.patch + + 108_nxagent_wine-close-delay.full.patch + + 300_nxagent_set-wm-class.full.patch + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 May 2014 09:58:10 +0200 nx-libs (2:3.5.0.24-0x2go1) unstable; urgency=low diff --git a/debian/patches/056_nx-X11-Werror-format-security.full.patch b/debian/patches/056_nx-X11-Werror-format-security.full.patch index e9d8bb4..a047de7 100644 --- a/debian/patches/056_nx-X11-Werror-format-security.full.patch +++ b/debian/patches/056_nx-X11-Werror-format-security.full.patch @@ -6,7 +6,7 @@ Abstract: idea why. --- a/nx-X11/lib/xtrans/Xtransint.h +++ b/nx-X11/lib/xtrans/Xtransint.h -@@ -443,7 +443,7 @@ +@@ -444,7 +444,7 @@ int hack= 0, saveerrno=errno; \ struct timeval tp;\ gettimeofday(&tp,0); \ @@ -15,7 +15,7 @@ Abstract: ErrorF(x+hack,a,b,c); \ ErrorF("timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \ errno=saveerrno; \ -@@ -453,7 +453,7 @@ +@@ -454,7 +454,7 @@ int hack= 0, saveerrno=errno; \ struct timeval tp;\ gettimeofday(&tp,0); \ @@ -24,7 +24,7 @@ Abstract: fprintf(stderr, x+hack,a,b,c); fflush(stderr); \ fprintf(stderr, "timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \ fflush(stderr); \ -@@ -465,14 +465,14 @@ +@@ -466,14 +466,14 @@ /* Use ErrorF() for the X server */ #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \ int hack= 0, saveerrno=errno; \ diff --git a/debian/patches/108_nxagent_wine-close-delay.full.patch b/debian/patches/108_nxagent_wine-close-delay.full.patch index 875571c..7a9c18c 100644 --- a/debian/patches/108_nxagent_wine-close-delay.full.patch +++ b/debian/patches/108_nxagent_wine-close-delay.full.patch @@ -22,7 +22,7 @@ Last-Update: 2011-12-31 /* * This is currently unused. */ -@@ -1858,6 +1866,17 @@ +@@ -1861,6 +1869,17 @@ nxagentAddConfiguredWindow(pWin, CWStackingOrder); nxagentAddConfiguredWindow(pWin, CW_Shape); @@ -40,7 +40,7 @@ Last-Update: 2011-12-31 #ifdef SHAPE /* -@@ -1904,6 +1923,17 @@ +@@ -1907,6 +1926,17 @@ return True; } diff --git a/debian/patches/300_nxagent_set-wm-class.full.patch b/debian/patches/300_nxagent_set-wm-class.full.patch index 7a67e43..70b1c92 100644 --- a/debian/patches/300_nxagent_set-wm-class.full.patch +++ b/debian/patches/300_nxagent_set-wm-class.full.patch @@ -15,7 +15,7 @@ Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Last-Update: 2012-01-11 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c -@@ -1759,6 +1759,42 @@ +@@ -1762,6 +1762,42 @@ nxagentDefaultWindows[pScreen->myNum]); #endif -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org