This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.5.0.x in repository nx-libs. commit 79a4ed92dbae5089d3ddfcc0acec427ff057ad9b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Apr 26 21:51:23 2015 +0200 Security fixes: X.Org CVE-2013-7439: v2: backport to 3.5.0.x branch. (Mihai Moldovan) Adds: - 1200-CVE-2013-7439-MakeBigReq-don-t-move-the-last-wo.full.patch --- debian/changelog | 5 ++ ...39-MakeBigReq-don-t-move-the-last-wo.full.patch | 77 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 83 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0534c5e..079b2de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,11 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low Adds: - 0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch + [ Mike Gabriel ] + * Security fixes: + - X.Org CVE-2013-7439: + 1200-CVE-2013-7439-MakeBigReq-don-t-move-the-last-wo.full.patch + -- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100 nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low diff --git a/debian/patches/1200-CVE-2013-7439-MakeBigReq-don-t-move-the-last-wo.full.patch b/debian/patches/1200-CVE-2013-7439-MakeBigReq-don-t-move-the-last-wo.full.patch new file mode 100644 index 0000000..6613d80 --- /dev/null +++ b/debian/patches/1200-CVE-2013-7439-MakeBigReq-don-t-move-the-last-wo.full.patch @@ -0,0 +1,77 @@ +commit ac9fbaabd6bdbca6dd1d94fa385aea41fdebf2c1 +Author: Karl Tomlinson <xmail@karlt.net> +Date: Wed Apr 15 10:16:18 2015 +0200 + + MakeBigReq: don't move the last word, already handled by Data32 (X.Org CVE-2013-7439). + + MakeBigReq inserts a length field after the first 4 bytes of the request + (after req->length), pushing everything else back by 4 bytes. + + The current memmove moves everything but the first 4 bytes back. If a + request aligns to the end of the buffer pointer when MakeBigReq is + invoked for that request, this runs over the buffer. Instead, we need to + memmove minus the first 4 bytes (which aren't moved), minus the last 4 + bytes (so we still align to the previous tail). + + The 4 bytes that fell out are already handled with Data32, which will + handle the buffermax correctly. + + The case where req->length = 1 was already not functional. + + Reported by Abhishek Arya <inferno@chromium.org> (against X.Org BTS). + + https://bugzilla.mozilla.org/show_bug.cgi?id=803762 + + Reviewed-by: Jeff Muizelaar <jmuizelaar@mozilla.com> + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Rebased-for-NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +--- a/nx-X11/lib/X11/Xlibint.h ++++ b/nx-X11/lib/X11/Xlibint.h +@@ -561,6 +561,14 @@ extern LockInfoPtr _Xglobal_lock; + dpy->request++ + #endif + ++/* ++ * MakeBigReq sets the CARD16 "req->length" to 0 and inserts a new CARD32 ++ * length, after req->length, before the data in the request. The new length ++ * includes the "n" extra 32-bit words. ++ * ++ * Do not use MakeBigReq if there is no data already in the request. ++ * req->length must already be >= 2. ++ */ + #ifdef WORD64 + #define MakeBigReq(req,n) \ + { \ +@@ -580,7 +588,7 @@ extern LockInfoPtr _Xglobal_lock; + CARD32 _BRlen = req->length - 1; \ + req->length = 0; \ + _BRdat = ((CARD32 *)req)[_BRlen]; \ +- memmove(((char *)req) + 8, ((char *)req) + 4, _BRlen << 2); \ ++ memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) << 2); \ + ((CARD32 *)req)[1] = _BRlen + n + 2; \ + Data32(dpy, &_BRdat, 4); \ + } +@@ -591,13 +599,20 @@ extern LockInfoPtr _Xglobal_lock; + CARD32 _BRlen = req->length - 1; \ + req->length = 0; \ + _BRdat = ((CARD32 *)req)[_BRlen]; \ +- memmove(((char *)req) + 8, ((char *)req) + 4, _BRlen << 2); \ ++ memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) << 2); \ + ((CARD32 *)req)[1] = _BRlen + n + 2; \ + Data32(dpy, &_BRdat, 4); \ + } + #endif + #endif + ++/* ++ * SetReqLen increases the count of 32-bit words in the request by "n", ++ * or by "badlen" if "n" is too large. ++ * ++ * Do not use SetReqLen if "req" does not already have data after the ++ * xReq header. req->length must already be >= 2. ++ */ + #define SetReqLen(req,n,badlen) \ + if ((req->length + n) > (unsigned)65535) { \ + if (dpy->bigreq_size) { \ diff --git a/debian/patches/series b/debian/patches/series index f0870d9..2856cbe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -129,5 +129,6 @@ 1102-include-introduce-byte-counting-functions.patch 1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch 1104-xkb-Check-strings-length-against-request-size.patch +1200-CVE-2013-7439-MakeBigReq-don-t-move-the-last-wo.full.patch 0016_nx-X11_install-location.debian.patch 0102_xserver-xext_set-securitypolicy-path.debian.patch -- Alioth's /srv/git/code.x2go.org/nx-libs.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 3.5.0.x in repository nx-libs. commit 9525d07396ba8ba30effc234354d6142b5e67895 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 27 01:14:23 2015 +0200 nxcompshad: Prevent underlinking by linking to libNX_Xext. Adds: - 0650_nxcompshad_link-to-NX_Xext.full.patch --- debian/changelog | 3 +++ .../0650_nxcompshad_link-to-NX_Xext.full.patch | 14 ++++++++++++++ debian/patches/series | 1 + 3 files changed, 18 insertions(+) diff --git a/debian/changelog b/debian/changelog index 925ad86..feea311 100644 --- a/debian/changelog +++ b/debian/changelog @@ -126,6 +126,9 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low * nx-X11: Prevent underlinking by linking to libNX_X{11,damage,fixes). Adds: - 0640_nx-X11_fix-underlinking-libNX_Xcomposite_damage_fixes.full.patch + * nxcompshad: Prevent underlinking by linking to libNX_Xext. + Adds: + - 0650_nxcompshad_link-to-NX_Xext.full.patch -- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100 diff --git a/debian/patches/0650_nxcompshad_link-to-NX_Xext.full.patch b/debian/patches/0650_nxcompshad_link-to-NX_Xext.full.patch new file mode 100644 index 0000000..c147f15 --- /dev/null +++ b/debian/patches/0650_nxcompshad_link-to-NX_Xext.full.patch @@ -0,0 +1,14 @@ +Description: Prevent underlinking by linking to libNX_Xext. +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +--- a/nxcompshad/Makefile.in ++++ b/nxcompshad/Makefile.in +@@ -148,7 +148,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) + + else + +-EXTRALIBS = -lNX_Xtst -lNX_Xrandr -lNX_Xdamage ++EXTRALIBS = -lNX_Xext -lNX_Xtst -lNX_Xrandr -lNX_Xdamage + + all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) + diff --git a/debian/patches/series b/debian/patches/series index f28170f..2c7d970 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -80,6 +80,7 @@ 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch 0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch 0640_nx-X11_fix-underlinking-libNX_Xcomposite_damage_fixes.full.patch +0650_nxcompshad_link-to-NX_Xext.full.patch 0990_fix-DEBUG-and-TEST-builds.full.patch 0991_fix-hr-typos.full+lite.patch 0991_fix-hr-typos.full.patch -- Alioth's /srv/git/code.x2go.org/nx-libs.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 3.5.0.x in repository nx-libs. commit 96efadac50bf40bc502680072570a2950f132fe3 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Apr 26 23:32:32 2015 +0200 CVE patches were previously not included in release tarballs. Rename: - 1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-lib-X.patch => 1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-.full.patch - 1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.-ups.patch => 1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.full.patch - 1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch => 1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageT.full.patch - 1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-buffe.patch => 1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-.full.patch - 1005-CVE-2014-0209-integer-overflow-of-realloc-size-in-Fo.patch => 1005-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch - 1006-CVE-2014-0209-integer-overflow-of-realloc-size-in-le.patch => 1006-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch - 1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_conn_se.patch => 1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch - 1008-Don-t-crash-when-we-receive-an-FS_Error-from-the-fon.patch => 1008-Don-t-crash-when-we-receive-an-FS_Error-from-th.full.patch - 1009-CVE-2014-0210-unvalidated-lengths-when-reading-repli.patch => 1009-CVE-2014-0210-unvalidated-lengths-when-reading-.full.patch - 1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-_fs_s.patch => 1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-.full.patch - 1011-CVE-2014-0210-unvalidated-length-fields-in-fs_read_q.patch => 1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch - 1012-CVE-2014-0211-integer-overflow-in-fs_read_extent_inf.patch => 1012-CVE-2014-0211-integer-overflow-in-fs_read_exten.full.patch - 1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyphs-fr.patch => 1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyp.full.patch - 1014-CVE-2014-0210-unvalidated-length-fields-in-fs_read_e.patch => 1014-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch - 1015-CVE-2014-0210-unvalidated-length-fields-in-fs_read_g.patch => 1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch - 1016-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch => 1016-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch - 1017-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch => 1017-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch - 1018-unchecked-malloc-may-allow-unauthed-client-to-crash-.patch => 1018-unchecked-malloc-may-allow-unauthed-client-to-c.full.patch - 1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8092-1.patch => 1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8.full.patch - 1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-2-4.patch => 1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-.full.patch - 1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8092-3.patch => 1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch - 1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-2014-.patch => 1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-.full.patch - 1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls-CVE-.patch => 1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls.full.patch - 1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-2014-.patch => 1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-.full.patch - 1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDList-C.patch => 1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDL.full.patch - 1026-Xv-unvalidated-lengths-in-XVideo-extension-swapped-p.patch => 1026-Xv-unvalidated-lengths-in-XVideo-extension-swap.full.patch - 1027-render-check-request-size-before-reading-it-CVE-2014.patch => 1027-render-check-request-size-before-reading-it-CVE.full.patch - 1028-render-unvalidated-lengths-in-Render-extn.-swapped-p.patch => 1028-render-unvalidated-lengths-in-Render-extn.-swap.full.patch - 1029-xfixes-unvalidated-length-in-SProcXFixesSelectSelect.patch => 1029-xfixes-unvalidated-length-in-SProcXFixesSelectS.full.patch - 1030-randr-unvalidated-lengths-in-RandR-extension-swapped.patch => 1030-randr-unvalidated-lengths-in-RandR-extension-sw.full.patch - 1031-glx-Be-more-paranoid-about-variable-length-requests-.patch => 1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch - 1032-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch => 1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch - 1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch => 1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer.full.patch - 1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-v4.patch => 1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-.full.patch - 1035-glx-Length-checking-for-GLXRender-requests-v2-CVE-20.patch => 1035-glx-Length-checking-for-GLXRender-requests-v2-C.full.patch - 1036-glx-Integer-overflow-protection-for-non-generated-re.patch => 1036-glx-Integer-overflow-protection-for-non-generat.full.patch - 1037-glx-Top-level-length-checking-for-swapped-VendorPriv.patch => 1037-glx-Top-level-length-checking-for-swapped-Vendo.full.patch - 1038-glx-Length-checking-for-non-generated-single-request.patch => 1038-glx-Length-checking-for-non-generated-single-re.full.patch - 1039-glx-Length-checking-for-RenderLarge-requests-v2-CVE-.patch => 1039-glx-Length-checking-for-RenderLarge-requests-v2.full.patch - 1040-glx-Pass-remaining-request-length-into-varsize-v2-CV.patch => 1040-glx-Pass-remaining-request-length-into-varsize-.full.patch - 1041-nx-X11-lib-font-fc-fserve.c-initialize-remaining-buf.patch => 1041-nx-X11-lib-font-fc-fserve.c-initialize-remainin.full.patch - 1042-Do-proper-input-validation-to-fix-for-CVE-2011-2895.patch => 1042-Do-proper-input-validation-to-fix-for-CVE-2011-.full.patch - 1101-Coverity-844-845-846-Fix-memory-leaks.patch => 1101-Coverity-844-845-846-Fix-memory-leaks.full.patch - 1102-include-introduce-byte-counting-functions.patch => 1102-include-introduce-byte-counting-functions.full.patch - 1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch => 1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input.full.patch - 1104-xkb-Check-strings-length-against-request-size.patch => 1104-xkb-Check-strings-length-against-request-size.full.patch --- debian/changelog | 94 ++++++++++++++++++++ ...ss-fix-for-CVE-2011-2895-From-xorg-.full.patch} | 0 ...-4028-File-disclosure-vulnerability.full.patch} | 0 ...ter-free-in-dix-dixfonts.c-doImageT.full.patch} | 0 ...2-unlimited-sscanf-overflows-stack-.full.patch} | 0 ...9-integer-overflow-of-realloc-size-.full.patch} | 0 ...9-integer-overflow-of-realloc-size-.full.patch} | 0 ...0-unvalidated-length-in-_fs_recv_co.full.patch} | 0 ...when-we-receive-an-FS_Error-from-th.full.patch} | 0 ...0-unvalidated-lengths-when-reading-.full.patch} | 0 ...1-Integer-overflow-in-fs_get_reply-.full.patch} | 0 ...0-unvalidated-length-fields-in-fs_r.full.patch} | 0 ...1-integer-overflow-in-fs_read_exten.full.patch} | 0 ...1-integer-overflow-in-fs_alloc_glyp.full.patch} | 0 ...0-unvalidated-length-fields-in-fs_r.full.patch} | 0 ...0-unvalidated-length-fields-in-fs_r.full.patch} | 0 ...0-unvalidated-length-fields-in-fs_r.full.patch} | 0 ...0-unvalidated-length-fields-in-fs_r.full.patch} | 0 ...lloc-may-allow-unauthed-client-to-c.full.patch} | 0 ...overflow-in-ProcPutImage-CVE-2014-8.full.patch} | 0 ...overflow-in-GetHosts-CVE-2014-8092-.full.patch} | 0 ...overflow-in-RegionSizeof-CVE-2014-8.full.patch} | 0 ...overflow-in-REQUEST_FIXED_SIZE-CVE-.full.patch} | 0 ...ted-lengths-in-DbeSwapBuffers-calls.full.patch} | 0 ...ed-lengths-in-Xinput-extension-CVE-.full.patch} | 0 ...idated-length-in-SProcXCMiscGetXIDL.full.patch} | 0 ...ed-lengths-in-XVideo-extension-swap.full.patch} | 0 ...-request-size-before-reading-it-CVE.full.patch} | 0 ...idated-lengths-in-Render-extn.-swap.full.patch} | 0 ...idated-length-in-SProcXFixesSelectS.full.patch} | 0 ...dated-lengths-in-RandR-extension-sw.full.patch} | 0 ...paranoid-about-variable-length-requ.full.patch} | 0 ...strict-about-rejecting-invalid-imag.full.patch} | 0 ...al-paranoia-in-__glXGetAnswerBuffer.full.patch} | 0 ..._-add-mul-pad-v3-CVE-2014-8093-4-6-.full.patch} | 0 ...hecking-for-GLXRender-requests-v2-C.full.patch} | 0 ...overflow-protection-for-non-generat.full.patch} | 0 ...l-length-checking-for-swapped-Vendo.full.patch} | 0 ...hecking-for-non-generated-single-re.full.patch} | 0 ...hecking-for-RenderLarge-requests-v2.full.patch} | 0 ...aining-request-length-into-varsize-.full.patch} | 0 ...ont-fc-fserve.c-initialize-remainin.full.patch} | 0 ...put-validation-to-fix-for-CVE-2011-.full.patch} | 0 ...verity-844-845-846-Fix-memory-leaks.full.patch} | 0 ...e-introduce-byte-counting-functions.full.patch} | 0 ...ap-XkbSetGeometry-data-in-the-input.full.patch} | 0 ...strings-length-against-request-size.full.patch} | 0 debian/patches/series | 92 +++++++++---------- 48 files changed, 140 insertions(+), 46 deletions(-) diff --git a/debian/changelog b/debian/changelog index 079b2de..09dca43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,100 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low * nx-X11: add more NULL guards to TEST and DEBUG sections of Render.c. Affects: - 0990_fix-DEBUG-and-TEST-builds.full.patch + * CVE patches were previously not included in release tarballs. + Rename: + - 1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-lib-X.patch => + 1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-.full.patch + - 1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.-ups.patch => + 1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.full.patch + - 1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch => + 1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageT.full.patch + - 1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-buffe.patch => + 1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-.full.patch + - 1005-CVE-2014-0209-integer-overflow-of-realloc-size-in-Fo.patch => + 1005-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch + - 1006-CVE-2014-0209-integer-overflow-of-realloc-size-in-le.patch => + 1006-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch + - 1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_conn_se.patch => + 1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch + - 1008-Don-t-crash-when-we-receive-an-FS_Error-from-the-fon.patch => + 1008-Don-t-crash-when-we-receive-an-FS_Error-from-th.full.patch + - 1009-CVE-2014-0210-unvalidated-lengths-when-reading-repli.patch => + 1009-CVE-2014-0210-unvalidated-lengths-when-reading-.full.patch + - 1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-_fs_s.patch => + 1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-.full.patch + - 1011-CVE-2014-0210-unvalidated-length-fields-in-fs_read_q.patch => + 1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch + - 1012-CVE-2014-0211-integer-overflow-in-fs_read_extent_inf.patch => + 1012-CVE-2014-0211-integer-overflow-in-fs_read_exten.full.patch + - 1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyphs-fr.patch => + 1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyp.full.patch + - 1014-CVE-2014-0210-unvalidated-length-fields-in-fs_read_e.patch => + 1014-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch + - 1015-CVE-2014-0210-unvalidated-length-fields-in-fs_read_g.patch => + 1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch + - 1016-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch => + 1016-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch + - 1017-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch => + 1017-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch + - 1018-unchecked-malloc-may-allow-unauthed-client-to-crash-.patch => + 1018-unchecked-malloc-may-allow-unauthed-client-to-c.full.patch + - 1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8092-1.patch => + 1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8.full.patch + - 1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-2-4.patch => + 1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-.full.patch + - 1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8092-3.patch => + 1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch + - 1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-2014-.patch => + 1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-.full.patch + - 1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls-CVE-.patch => + 1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls.full.patch + - 1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-2014-.patch => + 1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-.full.patch + - 1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDList-C.patch => + 1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDL.full.patch + - 1026-Xv-unvalidated-lengths-in-XVideo-extension-swapped-p.patch => + 1026-Xv-unvalidated-lengths-in-XVideo-extension-swap.full.patch + - 1027-render-check-request-size-before-reading-it-CVE-2014.patch => + 1027-render-check-request-size-before-reading-it-CVE.full.patch + - 1028-render-unvalidated-lengths-in-Render-extn.-swapped-p.patch => + 1028-render-unvalidated-lengths-in-Render-extn.-swap.full.patch + - 1029-xfixes-unvalidated-length-in-SProcXFixesSelectSelect.patch => + 1029-xfixes-unvalidated-length-in-SProcXFixesSelectS.full.patch + - 1030-randr-unvalidated-lengths-in-RandR-extension-swapped.patch => + 1030-randr-unvalidated-lengths-in-RandR-extension-sw.full.patch + - 1031-glx-Be-more-paranoid-about-variable-length-requests-.patch => + 1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch + - 1032-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch => + 1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch + - 1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch => + 1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer.full.patch + - 1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-v4.patch => + 1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-.full.patch + - 1035-glx-Length-checking-for-GLXRender-requests-v2-CVE-20.patch => + 1035-glx-Length-checking-for-GLXRender-requests-v2-C.full.patch + - 1036-glx-Integer-overflow-protection-for-non-generated-re.patch => + 1036-glx-Integer-overflow-protection-for-non-generat.full.patch + - 1037-glx-Top-level-length-checking-for-swapped-VendorPriv.patch => + 1037-glx-Top-level-length-checking-for-swapped-Vendo.full.patch + - 1038-glx-Length-checking-for-non-generated-single-request.patch => + 1038-glx-Length-checking-for-non-generated-single-re.full.patch + - 1039-glx-Length-checking-for-RenderLarge-requests-v2-CVE-.patch => + 1039-glx-Length-checking-for-RenderLarge-requests-v2.full.patch + - 1040-glx-Pass-remaining-request-length-into-varsize-v2-CV.patch => + 1040-glx-Pass-remaining-request-length-into-varsize-.full.patch + - 1041-nx-X11-lib-font-fc-fserve.c-initialize-remaining-buf.patch => + 1041-nx-X11-lib-font-fc-fserve.c-initialize-remainin.full.patch + - 1042-Do-proper-input-validation-to-fix-for-CVE-2011-2895.patch => + 1042-Do-proper-input-validation-to-fix-for-CVE-2011-.full.patch + - 1101-Coverity-844-845-846-Fix-memory-leaks.patch => + 1101-Coverity-844-845-846-Fix-memory-leaks.full.patch + - 1102-include-introduce-byte-counting-functions.patch => + 1102-include-introduce-byte-counting-functions.full.patch + - 1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch => + 1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input.full.patch + - 1104-xkb-Check-strings-length-against-request-size.patch => + 1104-xkb-Check-strings-length-against-request-size.full.patch [ Bernard Cafarelli ] * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. diff --git a/debian/patches/1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-lib-X.patch b/debian/patches/1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-.full.patch similarity index 100% rename from debian/patches/1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-lib-X.patch rename to debian/patches/1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-.full.patch diff --git a/debian/patches/1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.-ups.patch b/debian/patches/1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.full.patch similarity index 100% rename from debian/patches/1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.-ups.patch rename to debian/patches/1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.full.patch diff --git a/debian/patches/1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch b/debian/patches/1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageT.full.patch similarity index 100% rename from debian/patches/1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch rename to debian/patches/1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageT.full.patch diff --git a/debian/patches/1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-buffe.patch b/debian/patches/1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-.full.patch similarity index 100% rename from debian/patches/1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-buffe.patch rename to debian/patches/1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-.full.patch diff --git a/debian/patches/1005-CVE-2014-0209-integer-overflow-of-realloc-size-in-Fo.patch b/debian/patches/1005-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch similarity index 100% rename from debian/patches/1005-CVE-2014-0209-integer-overflow-of-realloc-size-in-Fo.patch rename to debian/patches/1005-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch diff --git a/debian/patches/1006-CVE-2014-0209-integer-overflow-of-realloc-size-in-le.patch b/debian/patches/1006-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch similarity index 100% rename from debian/patches/1006-CVE-2014-0209-integer-overflow-of-realloc-size-in-le.patch rename to debian/patches/1006-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch diff --git a/debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_conn_se.patch b/debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch similarity index 100% rename from debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_conn_se.patch rename to debian/patches/1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch diff --git a/debian/patches/1008-Don-t-crash-when-we-receive-an-FS_Error-from-the-fon.patch b/debian/patches/1008-Don-t-crash-when-we-receive-an-FS_Error-from-th.full.patch similarity index 100% rename from debian/patches/1008-Don-t-crash-when-we-receive-an-FS_Error-from-the-fon.patch rename to debian/patches/1008-Don-t-crash-when-we-receive-an-FS_Error-from-th.full.patch diff --git a/debian/patches/1009-CVE-2014-0210-unvalidated-lengths-when-reading-repli.patch b/debian/patches/1009-CVE-2014-0210-unvalidated-lengths-when-reading-.full.patch similarity index 100% rename from debian/patches/1009-CVE-2014-0210-unvalidated-lengths-when-reading-repli.patch rename to debian/patches/1009-CVE-2014-0210-unvalidated-lengths-when-reading-.full.patch diff --git a/debian/patches/1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-_fs_s.patch b/debian/patches/1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-.full.patch similarity index 100% rename from debian/patches/1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-_fs_s.patch rename to debian/patches/1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-.full.patch diff --git a/debian/patches/1011-CVE-2014-0210-unvalidated-length-fields-in-fs_read_q.patch b/debian/patches/1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch similarity index 100% rename from debian/patches/1011-CVE-2014-0210-unvalidated-length-fields-in-fs_read_q.patch rename to debian/patches/1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch diff --git a/debian/patches/1012-CVE-2014-0211-integer-overflow-in-fs_read_extent_inf.patch b/debian/patches/1012-CVE-2014-0211-integer-overflow-in-fs_read_exten.full.patch similarity index 100% rename from debian/patches/1012-CVE-2014-0211-integer-overflow-in-fs_read_extent_inf.patch rename to debian/patches/1012-CVE-2014-0211-integer-overflow-in-fs_read_exten.full.patch diff --git a/debian/patches/1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyphs-fr.patch b/debian/patches/1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyp.full.patch similarity index 100% rename from debian/patches/1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyphs-fr.patch rename to debian/patches/1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyp.full.patch diff --git a/debian/patches/1014-CVE-2014-0210-unvalidated-length-fields-in-fs_read_e.patch b/debian/patches/1014-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch similarity index 100% rename from debian/patches/1014-CVE-2014-0210-unvalidated-length-fields-in-fs_read_e.patch rename to debian/patches/1014-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch diff --git a/debian/patches/1015-CVE-2014-0210-unvalidated-length-fields-in-fs_read_g.patch b/debian/patches/1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch similarity index 100% rename from debian/patches/1015-CVE-2014-0210-unvalidated-length-fields-in-fs_read_g.patch rename to debian/patches/1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch diff --git a/debian/patches/1016-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch b/debian/patches/1016-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch similarity index 100% rename from debian/patches/1016-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch rename to debian/patches/1016-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch diff --git a/debian/patches/1017-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch b/debian/patches/1017-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch similarity index 100% rename from debian/patches/1017-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch rename to debian/patches/1017-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch diff --git a/debian/patches/1018-unchecked-malloc-may-allow-unauthed-client-to-crash-.patch b/debian/patches/1018-unchecked-malloc-may-allow-unauthed-client-to-c.full.patch similarity index 100% rename from debian/patches/1018-unchecked-malloc-may-allow-unauthed-client-to-crash-.patch rename to debian/patches/1018-unchecked-malloc-may-allow-unauthed-client-to-c.full.patch diff --git a/debian/patches/1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8092-1.patch b/debian/patches/1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8.full.patch similarity index 100% rename from debian/patches/1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8092-1.patch rename to debian/patches/1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8.full.patch diff --git a/debian/patches/1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-2-4.patch b/debian/patches/1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-.full.patch similarity index 100% rename from debian/patches/1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-2-4.patch rename to debian/patches/1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-.full.patch diff --git a/debian/patches/1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8092-3.patch b/debian/patches/1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch similarity index 100% rename from debian/patches/1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8092-3.patch rename to debian/patches/1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch diff --git a/debian/patches/1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-2014-.patch b/debian/patches/1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-.full.patch similarity index 100% rename from debian/patches/1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-2014-.patch rename to debian/patches/1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-.full.patch diff --git a/debian/patches/1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls-CVE-.patch b/debian/patches/1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls.full.patch similarity index 100% rename from debian/patches/1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls-CVE-.patch rename to debian/patches/1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls.full.patch diff --git a/debian/patches/1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-2014-.patch b/debian/patches/1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-.full.patch similarity index 100% rename from debian/patches/1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-2014-.patch rename to debian/patches/1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-.full.patch diff --git a/debian/patches/1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDList-C.patch b/debian/patches/1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDL.full.patch similarity index 100% rename from debian/patches/1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDList-C.patch rename to debian/patches/1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDL.full.patch diff --git a/debian/patches/1026-Xv-unvalidated-lengths-in-XVideo-extension-swapped-p.patch b/debian/patches/1026-Xv-unvalidated-lengths-in-XVideo-extension-swap.full.patch similarity index 100% rename from debian/patches/1026-Xv-unvalidated-lengths-in-XVideo-extension-swapped-p.patch rename to debian/patches/1026-Xv-unvalidated-lengths-in-XVideo-extension-swap.full.patch diff --git a/debian/patches/1027-render-check-request-size-before-reading-it-CVE-2014.patch b/debian/patches/1027-render-check-request-size-before-reading-it-CVE.full.patch similarity index 100% rename from debian/patches/1027-render-check-request-size-before-reading-it-CVE-2014.patch rename to debian/patches/1027-render-check-request-size-before-reading-it-CVE.full.patch diff --git a/debian/patches/1028-render-unvalidated-lengths-in-Render-extn.-swapped-p.patch b/debian/patches/1028-render-unvalidated-lengths-in-Render-extn.-swap.full.patch similarity index 100% rename from debian/patches/1028-render-unvalidated-lengths-in-Render-extn.-swapped-p.patch rename to debian/patches/1028-render-unvalidated-lengths-in-Render-extn.-swap.full.patch diff --git a/debian/patches/1029-xfixes-unvalidated-length-in-SProcXFixesSelectSelect.patch b/debian/patches/1029-xfixes-unvalidated-length-in-SProcXFixesSelectS.full.patch similarity index 100% rename from debian/patches/1029-xfixes-unvalidated-length-in-SProcXFixesSelectSelect.patch rename to debian/patches/1029-xfixes-unvalidated-length-in-SProcXFixesSelectS.full.patch diff --git a/debian/patches/1030-randr-unvalidated-lengths-in-RandR-extension-swapped.patch b/debian/patches/1030-randr-unvalidated-lengths-in-RandR-extension-sw.full.patch similarity index 100% rename from debian/patches/1030-randr-unvalidated-lengths-in-RandR-extension-swapped.patch rename to debian/patches/1030-randr-unvalidated-lengths-in-RandR-extension-sw.full.patch diff --git a/debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requests-.patch b/debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch similarity index 100% rename from debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requests-.patch rename to debian/patches/1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch diff --git a/debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch b/debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch similarity index 100% rename from debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch rename to debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch diff --git a/debian/patches/1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch b/debian/patches/1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer.full.patch similarity index 100% rename from debian/patches/1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch rename to debian/patches/1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer.full.patch diff --git a/debian/patches/1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-v4.patch b/debian/patches/1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-.full.patch similarity index 100% rename from debian/patches/1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-v4.patch rename to debian/patches/1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-.full.patch diff --git a/debian/patches/1035-glx-Length-checking-for-GLXRender-requests-v2-CVE-20.patch b/debian/patches/1035-glx-Length-checking-for-GLXRender-requests-v2-C.full.patch similarity index 100% rename from debian/patches/1035-glx-Length-checking-for-GLXRender-requests-v2-CVE-20.patch rename to debian/patches/1035-glx-Length-checking-for-GLXRender-requests-v2-C.full.patch diff --git a/debian/patches/1036-glx-Integer-overflow-protection-for-non-generated-re.patch b/debian/patches/1036-glx-Integer-overflow-protection-for-non-generat.full.patch similarity index 100% rename from debian/patches/1036-glx-Integer-overflow-protection-for-non-generated-re.patch rename to debian/patches/1036-glx-Integer-overflow-protection-for-non-generat.full.patch diff --git a/debian/patches/1037-glx-Top-level-length-checking-for-swapped-VendorPriv.patch b/debian/patches/1037-glx-Top-level-length-checking-for-swapped-Vendo.full.patch similarity index 100% rename from debian/patches/1037-glx-Top-level-length-checking-for-swapped-VendorPriv.patch rename to debian/patches/1037-glx-Top-level-length-checking-for-swapped-Vendo.full.patch diff --git a/debian/patches/1038-glx-Length-checking-for-non-generated-single-request.patch b/debian/patches/1038-glx-Length-checking-for-non-generated-single-re.full.patch similarity index 100% rename from debian/patches/1038-glx-Length-checking-for-non-generated-single-request.patch rename to debian/patches/1038-glx-Length-checking-for-non-generated-single-re.full.patch diff --git a/debian/patches/1039-glx-Length-checking-for-RenderLarge-requests-v2-CVE-.patch b/debian/patches/1039-glx-Length-checking-for-RenderLarge-requests-v2.full.patch similarity index 100% rename from debian/patches/1039-glx-Length-checking-for-RenderLarge-requests-v2-CVE-.patch rename to debian/patches/1039-glx-Length-checking-for-RenderLarge-requests-v2.full.patch diff --git a/debian/patches/1040-glx-Pass-remaining-request-length-into-varsize-v2-CV.patch b/debian/patches/1040-glx-Pass-remaining-request-length-into-varsize-.full.patch similarity index 100% rename from debian/patches/1040-glx-Pass-remaining-request-length-into-varsize-v2-CV.patch rename to debian/patches/1040-glx-Pass-remaining-request-length-into-varsize-.full.patch diff --git a/debian/patches/1041-nx-X11-lib-font-fc-fserve.c-initialize-remaining-buf.patch b/debian/patches/1041-nx-X11-lib-font-fc-fserve.c-initialize-remainin.full.patch similarity index 100% rename from debian/patches/1041-nx-X11-lib-font-fc-fserve.c-initialize-remaining-buf.patch rename to debian/patches/1041-nx-X11-lib-font-fc-fserve.c-initialize-remainin.full.patch diff --git a/debian/patches/1042-Do-proper-input-validation-to-fix-for-CVE-2011-2895.patch b/debian/patches/1042-Do-proper-input-validation-to-fix-for-CVE-2011-.full.patch similarity index 100% rename from debian/patches/1042-Do-proper-input-validation-to-fix-for-CVE-2011-2895.patch rename to debian/patches/1042-Do-proper-input-validation-to-fix-for-CVE-2011-.full.patch diff --git a/debian/patches/1101-Coverity-844-845-846-Fix-memory-leaks.patch b/debian/patches/1101-Coverity-844-845-846-Fix-memory-leaks.full.patch similarity index 100% rename from debian/patches/1101-Coverity-844-845-846-Fix-memory-leaks.patch rename to debian/patches/1101-Coverity-844-845-846-Fix-memory-leaks.full.patch diff --git a/debian/patches/1102-include-introduce-byte-counting-functions.patch b/debian/patches/1102-include-introduce-byte-counting-functions.full.patch similarity index 100% rename from debian/patches/1102-include-introduce-byte-counting-functions.patch rename to debian/patches/1102-include-introduce-byte-counting-functions.full.patch diff --git a/debian/patches/1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch b/debian/patches/1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input.full.patch similarity index 100% rename from debian/patches/1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch rename to debian/patches/1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input.full.patch diff --git a/debian/patches/1104-xkb-Check-strings-length-against-request-size.patch b/debian/patches/1104-xkb-Check-strings-length-against-request-size.full.patch similarity index 100% rename from debian/patches/1104-xkb-Check-strings-length-against-request-size.patch rename to debian/patches/1104-xkb-Check-strings-length-against-request-size.full.patch diff --git a/debian/patches/series b/debian/patches/series index 2856cbe..80a0e5e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -83,52 +83,52 @@ 0991_fix-hr-typos.full+lite.patch 0991_fix-hr-typos.full.patch 0999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch -1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-lib-X.patch -1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.-ups.patch -1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch -1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-buffe.patch -1005-CVE-2014-0209-integer-overflow-of-realloc-size-in-Fo.patch -1006-CVE-2014-0209-integer-overflow-of-realloc-size-in-le.patch -1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_conn_se.patch -1008-Don-t-crash-when-we-receive-an-FS_Error-from-the-fon.patch -1009-CVE-2014-0210-unvalidated-lengths-when-reading-repli.patch -1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-_fs_s.patch -1011-CVE-2014-0210-unvalidated-length-fields-in-fs_read_q.patch -1012-CVE-2014-0211-integer-overflow-in-fs_read_extent_inf.patch -1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyphs-fr.patch -1014-CVE-2014-0210-unvalidated-length-fields-in-fs_read_e.patch -1015-CVE-2014-0210-unvalidated-length-fields-in-fs_read_g.patch -1016-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch -1017-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch -1018-unchecked-malloc-may-allow-unauthed-client-to-crash-.patch -1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8092-1.patch -1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-2-4.patch -1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8092-3.patch -1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-2014-.patch -1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls-CVE-.patch -1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-2014-.patch -1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDList-C.patch -1026-Xv-unvalidated-lengths-in-XVideo-extension-swapped-p.patch -1027-render-check-request-size-before-reading-it-CVE-2014.patch -1028-render-unvalidated-lengths-in-Render-extn.-swapped-p.patch -1029-xfixes-unvalidated-length-in-SProcXFixesSelectSelect.patch -1030-randr-unvalidated-lengths-in-RandR-extension-swapped.patch -1031-glx-Be-more-paranoid-about-variable-length-requests-.patch -1032-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch -1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch -1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-v4.patch -1035-glx-Length-checking-for-GLXRender-requests-v2-CVE-20.patch -1036-glx-Integer-overflow-protection-for-non-generated-re.patch -1037-glx-Top-level-length-checking-for-swapped-VendorPriv.patch -1038-glx-Length-checking-for-non-generated-single-request.patch -1039-glx-Length-checking-for-RenderLarge-requests-v2-CVE-.patch -1040-glx-Pass-remaining-request-length-into-varsize-v2-CV.patch -1041-nx-X11-lib-font-fc-fserve.c-initialize-remaining-buf.patch -1042-Do-proper-input-validation-to-fix-for-CVE-2011-2895.patch -1101-Coverity-844-845-846-Fix-memory-leaks.patch -1102-include-introduce-byte-counting-functions.patch -1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch -1104-xkb-Check-strings-length-against-request-size.patch +1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-.full.patch +1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.full.patch +1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageT.full.patch +1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-.full.patch +1005-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch +1006-CVE-2014-0209-integer-overflow-of-realloc-size-.full.patch +1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_co.full.patch +1008-Don-t-crash-when-we-receive-an-FS_Error-from-th.full.patch +1009-CVE-2014-0210-unvalidated-lengths-when-reading-.full.patch +1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-.full.patch +1011-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch +1012-CVE-2014-0211-integer-overflow-in-fs_read_exten.full.patch +1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyp.full.patch +1014-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch +1015-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch +1016-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch +1017-CVE-2014-0210-unvalidated-length-fields-in-fs_r.full.patch +1018-unchecked-malloc-may-allow-unauthed-client-to-c.full.patch +1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8.full.patch +1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-.full.patch +1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8.full.patch +1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-.full.patch +1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls.full.patch +1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-.full.patch +1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDL.full.patch +1026-Xv-unvalidated-lengths-in-XVideo-extension-swap.full.patch +1027-render-check-request-size-before-reading-it-CVE.full.patch +1028-render-unvalidated-lengths-in-Render-extn.-swap.full.patch +1029-xfixes-unvalidated-length-in-SProcXFixesSelectS.full.patch +1030-randr-unvalidated-lengths-in-RandR-extension-sw.full.patch +1031-glx-Be-more-paranoid-about-variable-length-requ.full.patch +1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch +1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer.full.patch +1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-.full.patch +1035-glx-Length-checking-for-GLXRender-requests-v2-C.full.patch +1036-glx-Integer-overflow-protection-for-non-generat.full.patch +1037-glx-Top-level-length-checking-for-swapped-Vendo.full.patch +1038-glx-Length-checking-for-non-generated-single-re.full.patch +1039-glx-Length-checking-for-RenderLarge-requests-v2.full.patch +1040-glx-Pass-remaining-request-length-into-varsize-.full.patch +1041-nx-X11-lib-font-fc-fserve.c-initialize-remainin.full.patch +1042-Do-proper-input-validation-to-fix-for-CVE-2011-.full.patch +1101-Coverity-844-845-846-Fix-memory-leaks.full.patch +1102-include-introduce-byte-counting-functions.full.patch +1103-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input.full.patch +1104-xkb-Check-strings-length-against-request-size.full.patch 1200-CVE-2013-7439-MakeBigReq-don-t-move-the-last-wo.full.patch 0016_nx-X11_install-location.debian.patch 0102_xserver-xext_set-securitypolicy-path.debian.patch -- Alioth's /srv/git/code.x2go.org/nx-libs.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 3.5.0.x in repository nx-libs. commit 56b383b8c68b8f63b30e1b9151485f0c6087a662 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Apr 27 01:22:41 2015 +0200 debian/roll-tarballs.sh: whitespace changes for consistency. --- debian/roll-tarballs.sh | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 38627fa..4eb0d12 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -141,36 +141,36 @@ test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefil if [ "x$MODE" = "xfull" ]; then - #### stuff we do not needed - UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED` - CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL` - UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES` - PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` - PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-INCLUDED` - PRESERVE_NEEDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-NEEDED` - - # remove folders that we do not want to roll into the tarball - rm -Rf ".pc/" - rm -Rf "debian/" - - mkdir -p .preserve/ - for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NEEDED_FILES}; do - if [ ! -d $path ]; then - path_dirname=$(dirname "$path") - else - path_dirname="$path" - fi - mkdir -vp ".preserve/$path_dirname" - cp -av "$path" ".preserve/$path" - done - - for path in ${UNUSED_FOLDERS} ${CLEANUP_FOLDERS} ${UNNEEDED_BACKUPS}; do - rm -R "$path" - done - - # re-create the to-be-preserved files - cp -a .preserve/* ./ - rm -Rf .preserve/ + #### stuff we do not needed + UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED` + CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL` + UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES` + PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` + PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-INCLUDED` + PRESERVE_NEEDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-NEEDED` + + # remove folders that we do not want to roll into the tarball + rm -Rf ".pc/" + rm -Rf "debian/" + + mkdir -p .preserve/ + for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NEEDED_FILES}; do + if [ ! -d $path ]; then + path_dirname=$(dirname "$path") + else + path_dirname="$path" + fi + mkdir -vp ".preserve/$path_dirname" + cp -av "$path" ".preserve/$path" + done + + for path in ${UNUSED_FOLDERS} ${CLEANUP_FOLDERS} ${UNNEEDED_BACKUPS}; do + rm -R "$path" + done + + # re-create the to-be-preserved files + cp -a .preserve/* ./ + rm -Rf .preserve/ fi # remove files, that we do not want in the tarballs (build cruft) -- Alioth's /srv/git/code.x2go.org/nx-libs.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 3.5.0.x in repository nx-libs. commit 06bdc27233782dbe41cee072728c6a38b93a740a Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Apr 26 23:49:06 2015 +0200 debian/roll-tarballs.sh: don't escape last newline of a multiline command. Worked out fine so far, because the next line was empty, but this can easily change... Cherry-picked from Arctica GH 3.6.x branch. --- debian/roll-tarballs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 21f1287..38627fa 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -193,6 +193,6 @@ tar c -C "$TEMP_DIR" \ --no-recursion \ --files-from "$MANIFEST" \ --gzip \ - > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz" \ + > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz" echo "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}-${RELEASE}${RELEASE_SUFFIX}.tar.gz is ready" -- Alioth's /srv/git/code.x2go.org/nx-libs.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 3.5.0.x in repository nx-libs. commit 4c90de7aa9b81b77d583e3226a05872529e2c149 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Apr 27 01:28:50 2015 +0200 debian/roll-tarballs.sh: next batch of quotes. --- debian/roll-tarballs.sh | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 4eb0d12..d091b90 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -87,11 +87,11 @@ if [ "x$MODE" = "xfull" ]; then cp -v "debian/patches/$file" "doc/applied-patches/" echo "${file##*/}" >> "doc/applied-patches/series" done - mkdir -p ./etc/ - cp -v debian/rgb ./etc/ - cp -v debian/nxagent.keyboard ./etc/ - cp -v debian/x2goagent.keyboard ./etc/ - cp -v debian/VERSION ./VERSION.x2goagent + mkdir -p "./etc/" + cp -v "debian/rgb" "./etc/" + cp -v "debian/nxagent.keyboard" "./etc/" + cp -v "debian/x2goagent.keyboard" "./etc/" + cp -v "debian/VERSION" "./VERSION.x2goagent" else rm -Rf "nxcompshad"* rm -Rf "nxcompext"* @@ -102,10 +102,10 @@ else echo "${file##*/}" >> "doc/applied-patches/series" done fi -cp -v debian/VERSION ./nxcomp/VERSION -cp -v debian/COPYING.full+lite COPYING -cp -v debian/nxagent.keyboard nxagent.keyboard -cp -v debian/x2goagent.keyboard x2goagent.keyboard +cp -v "debian/VERSION" "./nxcomp/VERSION" +cp -v "debian/COPYING.full+lite" "COPYING" +cp -v "debian/nxagent.keyboard" "nxagent.keyboard" +cp -v "debian/x2goagent.keyboard" "x2goagent.keyboard" # apply all patches shipped in debian/patches and create a copy of them that we ship with the tarball if [ -s "doc/applied-patches/series" ]; then @@ -122,41 +122,41 @@ done mkdir -p bin/ if [ "$MODE" = "lite" ]; then # copy wrapper script nxproxy only into tarball - cp -v debian/wrappers/nxproxy bin/ + cp -v "debian/wrappers/nxproxy" "bin/" else # copy wrapper scripts into tarball for w in $(ls debian/wrappers/* 2>/dev/null); do - cp -v $w bin/ + cp -v "$w" "bin/" done # provide a default keystrokes.cfg file - mkdir -p etc - test -f etc/keystrokes.cfg || test -f debian/keystrokes.cfg && cp -v debian/keystrokes.cfg etc/keystrokes.cfg + mkdir -p "etc" + test -f "etc/keystrokes.cfg" || test -f "debian/keystrokes.cfg" && cp -v "debian/keystrokes.cfg" "etc/keystrokes.cfg" fi -mv -v debian/changelog doc/changelog +mv -v "debian/changelog" "doc/changelog" # copy the top-level makefile if no quilt patch created it before -test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx-libs Makefile -test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefile.replace.sh replace.sh +test -f "Makefile" || test -f "debian/Makefile.nx-libs" && cp -v "debian/Makefile.nx-libs" "Makefile" +test -f "replace.sh" || test -f "debian/Makefile.replace.sh" && cp -v "debian/Makefile.replace.sh" "replace.sh" if [ "x$MODE" = "xfull" ]; then #### stuff we do not needed - UNUSED_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-UNUSED` - CLEANUP_FOLDERS=`cat debian/CODE-REDUCTION_CLEANUP-BRUTAL` - UNNEEDED_BACKUPS=`cat debian/CODE-REDUCTION_CLEANUP-BACKUPFILES` - PRESERVE_SYMLINKED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-SYMLINKED` - PRESERVE_INCLUDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-INCLUDED` - PRESERVE_NEEDED_FILES=`cat debian/CODE-REDUCTION_PRESERVE-NEEDED` + UNUSED_FOLDERS="$(cat "debian/CODE-REDUCTION_CLEANUP-UNUSED")" + CLEANUP_FOLDERS="$(cat "debian/CODE-REDUCTION_CLEANUP-BRUTAL")" + UNNEEDED_BACKUPS="$(cat "debian/CODE-REDUCTION_CLEANUP-BACKUPFILES")" + PRESERVE_SYMLINKED_FILES="$(cat "debian/CODE-REDUCTION_PRESERVE-SYMLINKED")" + PRESERVE_INCLUDED_FILES="$(cat "debian/CODE-REDUCTION_PRESERVE-INCLUDED")" + PRESERVE_NEEDED_FILES="$(cat "debian/CODE-REDUCTION_PRESERVE-NEEDED")" # remove folders that we do not want to roll into the tarball rm -Rf ".pc/" rm -Rf "debian/" - mkdir -p .preserve/ + mkdir -p ".preserve/" for path in ${PRESERVE_SYMLINKED_FILES} ${PRESERVE_INCLUDED_FILES} ${PRESERVE_NEEDED_FILES}; do - if [ ! -d $path ]; then - path_dirname=$(dirname "$path") + if [ ! -d "$path" ]; then + path_dirname="$(dirname "$path")" else path_dirname="$path" fi @@ -169,8 +169,8 @@ if [ "x$MODE" = "xfull" ]; then done # re-create the to-be-preserved files - cp -a .preserve/* ./ - rm -Rf .preserve/ + cp -a ".preserve/"* "./" + rm -Rf ".preserve/" fi # remove files, that we do not want in the tarballs (build cruft) -- Alioth's /srv/git/code.x2go.org/nx-libs.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 3.5.0.x in repository nx-libs. commit 45d9d2405eb7b2ab9e3fa67f1a7833843c400e1d Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Apr 27 02:33:47 2015 +0200 README.keystrokes: add documentation for branding behavior. Backported from Arctica GH 3.6.x branch. Affects: - 0320_nxagent_configurable-keystrokes.full.patch --- debian/changelog | 5 +++++ ...0320_nxagent_configurable-keystrokes.full.patch | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6b8794d..e012e2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -112,6 +112,8 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low - 1104-xkb-Check-strings-length-against-request-size.patch => 1104-xkb-Check-strings-length-against-request-size.full.patch * debian/rolltarball.sh: + Cherry-picked from Arctica GH 3.6.x branch. + - Use more quotes. Fixes potential bugs, including one triggered by an unquoted hash within the command line. BASH accepts this. Other shells do not (i.e., treat everything following the hash character as a @@ -127,6 +129,9 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low - Copy actions documentation from the wiki. Affects: + 0320_nxagent_configurable-keystrokes.full.patch + - Add documentation for branding behavior. + Affects: + + 0320_nxagent_configurable-keystrokes.full.patch [ Bernard Cafarelli ] * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. diff --git a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch index 3d08b3e..475b9d0 100644 --- a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch +++ b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch @@ -904,7 +904,7 @@ Description: Make nxagent-specific keyboard bindings configurable #endif /* __Keystroke_H__ */ --- /dev/null +++ b/README.keystrokes -@@ -0,0 +1,94 @@ +@@ -0,0 +1,102 @@ +Configurable keybindings in nxagent + +Keybindings in the redistributed x2go version of nxagent can now be configured @@ -913,13 +913,21 @@ Description: Make nxagent-specific keyboard bindings configurable +File location +------------- + -+nxagent searches for the configuration file in the following order: ++nxagent parses the first available configuration file and ignores all others. ++ ++If nxagent is called without branding, it searches: +- in the location given by the '-keystrokefile' command line parameter +- in the location given by the NXAGENT_KEYSTROKEFILE environment variable +- in ~/.nx/config/keystrokes.cfg +- in /etc/nxagent/keystrokes.cfg + -+If none of those files is accessible, the default configuration is used which ++If nxagent is called **with X2Go branding** (i.e., as x2goagent), it searches: ++- in the location given by the '-keystrokefile' command line parameter ++- in the location given by the NXAGENT_KEYSTROKEFILE environment variable ++- in ~/.x2go/config/keystrokes.cfg ++- in /etc/x2go/keystrokes.cfg ++ ++If none of these files are accessible, the default configuration is used which +is the same as the old, traditional nxagent keybindings. + +File format -- Alioth's /srv/git/code.x2go.org/nx-libs.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 3.5.0.x in repository nx-libs. commit 266d5affbc8339411090db497bfbafdc5e4944b2 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Apr 27 02:48:10 2015 +0200 README.keystrokes: remove accidentally copied Dokuwiki syntax. Backported from Arctica GH 3.6.x branch. Affects: - 0320_nxagent_configurable-keystrokes.full.patch --- debian/changelog | 1 + ...0320_nxagent_configurable-keystrokes.full.patch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b43247f..88936b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -130,6 +130,7 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low - Copy actions documentation from the wiki. - Add documentation for branding behavior. + - Remove accidentally copied Dokuwiki syntax. * debian/keystrokes.cfg: fix whitespace errors. Backported from Arctica GH 3.6.x branch. diff --git a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch index 475b9d0..495e007 100644 --- a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch +++ b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch @@ -921,7 +921,7 @@ Description: Make nxagent-specific keyboard bindings configurable +- in ~/.nx/config/keystrokes.cfg +- in /etc/nxagent/keystrokes.cfg + -+If nxagent is called **with X2Go branding** (i.e., as x2goagent), it searches: ++If nxagent is called with X2Go branding (i.e., as x2goagent), it searches: +- in the location given by the '-keystrokefile' command line parameter +- in the location given by the NXAGENT_KEYSTROKEFILE environment variable +- in ~/.x2go/config/keystrokes.cfg -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git