diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 146 | ||||
| -rw-r--r-- | debian/control | 100 | ||||
| -rw-r--r-- | debian/libnx-x11-6.symbols | 8 | ||||
| -rw-r--r-- | debian/libnx-xdamage-dev.install.in | 2 | ||||
| -rw-r--r-- | debian/libnx-xdamage1.install.in | 1 | ||||
| -rw-r--r-- | debian/libnx-xdamage1.symbols | 9 | ||||
| -rw-r--r-- | debian/libnx-xdmcp-dev.install.in | 2 | ||||
| -rw-r--r-- | debian/libnx-xdmcp6.install.in | 1 | ||||
| -rw-r--r-- | debian/libnx-xdmcp6.symbols | 46 | ||||
| -rwxr-xr-x | debian/libnx-xinerama1.postinst.in | 11 | ||||
| -rwxr-xr-x | debian/libnx-xinerama1.prerm | 53 | ||||
| -rw-r--r-- | debian/nx-x11proto-damage-dev.install.in | 2 | ||||
| -rwxr-xr-x | debian/roll-tarballs.sh | 56 | ||||
| -rwxr-xr-x | debian/rules | 8 |
14 files changed, 254 insertions, 191 deletions
diff --git a/debian/changelog b/debian/changelog index 4bbe4028f..e664e5b0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,152 @@ 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 + * 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 + comment.) + - Convert tabs to spaces for consistency. + - Use more curly braces. Prevents random characters as being treated as + part of a variable name. + - 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... + * README.keystrokes: + Backported from Arctica GH 3.6.x branch. + Affects: + + 0320_nxagent_configurable-keystrokes.full.patch + + - 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. + * debian/libnx-xinerama1.*: also create libXinerama symlink in + libnx-xinerama1.postinst.postinst (and remove in + libnx-xinerama1.postinst.prerm.) + Backported from Arctica GH 3.6.x branch. + * debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only + delete known files. Fixes RPM build failures. + Backported from Arctica GH 3.6.x branch. + * nx-libs.spec: actually create libXinerama.so.1 symlink during build phase. + Backported from Arctica GH 3.6.x branch. + * debian/control: workaround missing dependencies of nxagent on Ubuntu for + now. + * debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. + + [ Bernard Cafarelli ] + * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. + Fixes: #853. + v2: generally link to libdl in all of nx-X11. (Mike Gabriel) + 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 + * 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/control b/debian/control index 65a8f9433..0f575421f 100644 --- a/debian/control +++ b/debian/control @@ -12,12 +12,12 @@ Build-Depends: libjpeg-dev, zlib1g-dev, quilt (>= 0.46-7~), - libfontconfig1-dev, - libfontenc-dev, - libfreetype6-dev, libxmltok1-dev, libxml2-dev, libxpm-dev, + libxfont-dev, + libxdmcp-dev, + libxdamage-dev, autoconf, pkg-config, x11proto-core-dev, @@ -284,20 +284,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 damaged region extension library +Description: nx-X11 damaged region extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xdamage provides an X Window System client interface to the DAMAGE - extension to the X protocol. + This package removes the obsoleted libNX_Xdamage.so.1 library. With + recent versions of NX, the system-wide installed libXdamage gets used. . - The Damage extension provides for notification of when on-screen regions have - been 'damaged' (altered) + This package can be safely removed. Package: libnx-xdamage-dev Provides: libnx-xdamage1-dev @@ -305,23 +301,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xdamage1 (= ${binary:Version}), - nx-x11proto-damage-dev (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 damaged region extension library (development headers) +Description: nx-X11 damaged region extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xdamage provides an X Window System client interface to the DAMAGE - extension to the X protocol. - . - The Damage extension provides for notification of when on-screen regions have - been 'damaged' (altered) + This package removes the obsoleted headers for the libNX_Xdamage.so.1 + library. With recent versions of NX, the system-wide installed libXdamage + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: nx-x11proto-damage-dev Section: libdevel @@ -329,16 +319,16 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Damage extension wire protocol +Description: nx-X11 Damage extension wire protocol (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - This package provides development headers describing the wire protocol - for the Damage extension in nx-X11, used to notify clients of changes - made to particular areas. + This package removes the obsoleted wire protocol headers for the + libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide + installed libXdamage gets used. + . + This package can be safely removed. Package: libnx-xdamage1-dbg Architecture: any @@ -346,22 +336,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xdamage1 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 damaged region extension library (debug package) +Description: nx-X11 damaged region extension library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - libNX_Xdamage provides an X Window System client interface to the DAMAGE - extension to the X protocol. + This package removes the obsoleted debug symbols for the + libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide + installed libXdamage gets used. . - The Damage extension provides for notification of when on-screen regions have - been 'damaged' (altered) - . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xdmcp6 Architecture: any @@ -369,19 +355,16 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11 (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Display Manager Control Protocol library +Description: nx-X11 Display Manager Control Protocol library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - nx-X11 Display Manager Control Protocol library + This package removes the obsoleted libNX_Xdmcp.so.6 library. With + recent versions of NX, the system-wide installed libXdmcp gets used. . - This package provides the main interface to the nx-X11 display manager control - protocol library, which allows for remote logins to display managers. + This package can be safely removed. Package: libnx-xdmcp-dev Provides: libnx-xdmcp6-dev @@ -389,21 +372,17 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xdmcp6 (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Display Manager Control Protocol library (development headers) +Description: nx-X11 Display Manager Control Protocol library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - nx-X11 Display Manager Control Protocol library - . - This package provides the main interface to the nx-X11 display manager control - protocol library, which allows for remote logins to display managers. + This package removes the obsoleted headers for the libNX_Xdmcp.so.6 + library. With recent versions of NX, the system-wide installed libXdmcp + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: libnx-xdmcp6-dbg Architecture: any @@ -411,21 +390,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xdmcp6 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 Display Manager Control Protocol library (debug package) +Description: nx-X11 Display Manager Control Protocol library (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. . - nx-X11 Display Manager Control Protocol library - . - This package provides the main interface to the nx-X11 display manager control - protocol library, which allows for remote logins to display managers. + This package removes the obsoleted debug symbols for the libNX_Xdmcp.so.6 + library. With recent versions of NX, the system-wide installed libXdmcp + gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xext6 Architecture: any @@ -979,7 +955,7 @@ Architecture: any Depends: libnx-x11-dev (= ${binary:Version}), ${misc:Depends}, -Description: Library headers for nx-X11/Meas (dummy package) +Description: Library headers for nx-X11/Mesa (dummy package) NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when using X applications over a network, especially a slow one. diff --git a/debian/libnx-x11-6.symbols b/debian/libnx-x11-6.symbols index 4b7ceacbe..b9ab97120 100644 --- a/debian/libnx-x11-6.symbols +++ b/debian/libnx-x11-6.symbols @@ -547,7 +547,7 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# XcmsTekHVCWhiteShiftColors@Base 3.5.0.29 XcmsUNDEFINEDColorSpace@Base 3.5.0.29 XcmsVisualOfCCC@Base 3.5.0.29 - XdmcpWrap@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0~build1# XdmcpWrap@Base 3.5.0.29 XkbAddDeviceLedInfo@Base 3.5.0.29 XkbAddGeomColor@Base 3.5.0.29 XkbAddGeomDoodad@Base 3.5.0.29 @@ -956,9 +956,9 @@ libNX_X11.so.6 libnx-x11-6 #MINVER# _XcmsTekHVC_prefix@Base 3.5.0.29 _XcmsUnresolveColor@Base 3.5.0.29 _Xdebug@Base 3.5.0.29 - _XdmcpAuthDoIt@Base 3.5.0.29 - _XdmcpAuthSetup@Base 3.5.0.29 - _XdmcpWrapperToOddParity@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0~build1# _XdmcpAuthDoIt@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0~build1# _XdmcpAuthSetup@Base 3.5.0.29 +#MISSING: 2:3.5.99.0-0~build1# _XdmcpWrapperToOddParity@Base 3.5.0.29 _Xevent_to_mask@Base 3.5.0.29 _Xglobal_lock@Base 3.5.0.29 _Xi18n_lock@Base 3.5.0.29 diff --git a/debian/libnx-xdamage-dev.install.in b/debian/libnx-xdamage-dev.install.in deleted file mode 100644 index 068f3badd..000000000 --- a/debian/libnx-xdamage-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xdamage.so -usr/include/*/nx/X11/extensions/Xdamage.h diff --git a/debian/libnx-xdamage1.install.in b/debian/libnx-xdamage1.install.in deleted file mode 100644 index 42bd90874..000000000 --- a/debian/libnx-xdamage1.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xdamage.so.* diff --git a/debian/libnx-xdamage1.symbols b/debian/libnx-xdamage1.symbols deleted file mode 100644 index 09310e69a..000000000 --- a/debian/libnx-xdamage1.symbols +++ /dev/null @@ -1,9 +0,0 @@ -libNX_Xdamage.so.1 libnx-xdamage1 #MINVER# - XDamageCreate@Base 3.5.0.29 - XDamageDestroy@Base 3.5.0.29 - XDamageExtensionInfo@Base 3.5.0.29 - XDamageExtensionName@Base 3.5.0.29 - XDamageFindDisplay@Base 3.5.0.29 - XDamageQueryExtension@Base 3.5.0.29 - XDamageQueryVersion@Base 3.5.0.29 - XDamageSubtract@Base 3.5.0.29 diff --git a/debian/libnx-xdmcp-dev.install.in b/debian/libnx-xdmcp-dev.install.in deleted file mode 100644 index 2c2457b10..000000000 --- a/debian/libnx-xdmcp-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xdmcp.so -usr/include/*/nx/X11/Xdmcp.h diff --git a/debian/libnx-xdmcp6.install.in b/debian/libnx-xdmcp6.install.in deleted file mode 100644 index 69100139e..000000000 --- a/debian/libnx-xdmcp6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xdmcp.so.* diff --git a/debian/libnx-xdmcp6.symbols b/debian/libnx-xdmcp6.symbols deleted file mode 100644 index 49645d63a..000000000 --- a/debian/libnx-xdmcp6.symbols +++ /dev/null @@ -1,46 +0,0 @@ -libNX_Xdmcp.so.6 libnx-xdmcp6 #MINVER# - Xalloc@Base 3.5.0.29 - XdmcpARRAY8Equal@Base 3.5.0.29 - XdmcpAllocARRAY16@Base 3.5.0.29 - XdmcpAllocARRAY32@Base 3.5.0.29 - XdmcpAllocARRAY8@Base 3.5.0.29 - XdmcpAllocARRAYofARRAY8@Base 3.5.0.29 - XdmcpCompareKeys@Base 3.5.0.29 - XdmcpCopyARRAY8@Base 3.5.0.29 - XdmcpDecrementKey@Base 3.5.0.29 - XdmcpDisposeARRAY16@Base 3.5.0.29 - XdmcpDisposeARRAY32@Base 3.5.0.29 - XdmcpDisposeARRAY8@Base 3.5.0.29 - XdmcpDisposeARRAYofARRAY8@Base 3.5.0.29 - XdmcpFill@Base 3.5.0.29 - XdmcpFlush@Base 3.5.0.29 - XdmcpGenerateKey@Base 3.5.0.29 - XdmcpIncrementKey@Base 3.5.0.29 - XdmcpReadARRAY16@Base 3.5.0.29 - XdmcpReadARRAY32@Base 3.5.0.29 - XdmcpReadARRAY8@Base 3.5.0.29 - XdmcpReadARRAYofARRAY8@Base 3.5.0.29 - XdmcpReadCARD16@Base 3.5.0.29 - XdmcpReadCARD32@Base 3.5.0.29 - XdmcpReadCARD8@Base 3.5.0.29 - XdmcpReadHeader@Base 3.5.0.29 - XdmcpReadRemaining@Base 3.5.0.29 - XdmcpReallocARRAY16@Base 3.5.0.29 - XdmcpReallocARRAY32@Base 3.5.0.29 - XdmcpReallocARRAY8@Base 3.5.0.29 - XdmcpReallocARRAYofARRAY8@Base 3.5.0.29 - XdmcpUnwrap@Base 3.5.0.29 - XdmcpWrap@Base 3.5.0.29 - XdmcpWriteARRAY16@Base 3.5.0.29 - XdmcpWriteARRAY32@Base 3.5.0.29 - XdmcpWriteARRAY8@Base 3.5.0.29 - XdmcpWriteARRAYofARRAY8@Base 3.5.0.29 - XdmcpWriteCARD16@Base 3.5.0.29 - XdmcpWriteCARD32@Base 3.5.0.29 - XdmcpWriteCARD8@Base 3.5.0.29 - XdmcpWriteHeader@Base 3.5.0.29 - Xfree@Base 3.5.0.29 - Xrealloc@Base 3.5.0.29 - _XdmcpAuthDoIt@Base 3.5.0.29 - _XdmcpAuthSetup@Base 3.5.0.29 - _XdmcpWrapperToOddParity@Base 3.5.0.29 diff --git a/debian/libnx-xinerama1.postinst.in b/debian/libnx-xinerama1.postinst.in index c690be387..6d9ba36ef 100755 --- a/debian/libnx-xinerama1.postinst.in +++ b/debian/libnx-xinerama1.postinst.in @@ -26,14 +26,17 @@ case "$1" in libdir=/usr/lib/#DEB_BUILD_MULTIARCH# - rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 - if test -e $libdir/libX11.so.6; then + # Already existent files are not removed. + # Users will need to explicitly remove them and (re-) configure this package. + if ! test -e $libdir/libX11.so.6; then ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 fi - if test -e $libdir/libXext.so.6; then + if ! test -e $libdir/libXext.so.6; then ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 fi + if ! test -e $libdir/libNX_Xinerama.so.1; then + ln -s $libdir/libNX_Xinerama.so.1 /usr/lib/nx/X11/Xinerama/libXinerama.so.1 + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/libnx-xinerama1.prerm b/debian/libnx-xinerama1.prerm index 3fcd330e6..8cca06c85 100755 --- a/debian/libnx-xinerama1.prerm +++ b/debian/libnx-xinerama1.prerm @@ -1,37 +1,46 @@ #!/bin/sh -# postrm script for x2goserver-fmbindings +# prerm script for libnx-xinerama1 # # see: dh_installdeb(1) - -set -e - # summary of how this script can be called: -# * <postrm> `remove' -# * <postrm> `purge' -# * <old-postrm> `upgrade' <new-version> -# * <new-postrm> `failed-upgrade' <old-version> -# * <new-postrm> `abort-install' -# * <new-postrm> `abort-install' <old-version> -# * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <overwriter> -# <overwriter-version> +# * <prerm> `remove' +# * <old-prerm> `upgrade' <new-version> +# * <new-prerm> `failed-upgrade' <old-version> +# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> +# * <deconfigured's-prerm> `deconfigure' `in-favour' +# <package-being-installed> <version> `removing' +# <conflicting-package> <version> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package +set -e + + case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then - rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 - fi - if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then - rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + remove) + if test -d /usr/lib/nx/X11/Xinerama; then + if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + + if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + + + if test -e /usr/lib/nx/X11/Xinerama/libXinerama.so.1; then + rm -f /usr/lib/nx/X11/Xinerama/libXinerama.so.1 + fi fi - ;; + ;; + deconfigure|upgrade|failed-upgrade) + : + ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "prerm called with unknown argument \`$1'" >&2 exit 1 - ;; + ;; esac # dh_installdeb will replace this with shell code automatically diff --git a/debian/nx-x11proto-damage-dev.install.in b/debian/nx-x11proto-damage-dev.install.in deleted file mode 100644 index 949549f17..000000000 --- a/debian/nx-x11proto-damage-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx/X11/extensions/damageproto.h -usr/include/*/nx/X11/extensions/damagewire.h
\ No newline at end of file diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index c7cac5f08..954986b5f 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -33,33 +33,33 @@ usage() { PROJECT="nx-libs" NULL="" -test -d .git || usage +test -d ".git" || usage RELEASE="$1" test -n "${RELEASE}" || usage CHECKOUT="$2" test -n "$CHECKOUT" || usage -if [ "x$CHECKOUT" = "xserver" ] || [ "x$CHECKOUT" = "xfull" ]; then - MODE="full" - CHECKOUT="redist-server/${RELEASE}" - RELEASE_SUFFIX='-full' -elif [ "x$CHECKOUT" = "xclient" ] || [ "x$CHECKOUT" = "xlite" ]; then - MODE="lite" - CHECKOUT="redist-client/${RELEASE}" - RELEASE_SUFFIX='-lite' +if [ "x$CHECKOUT" = "xserver" ] || [ "x${CHECKOUT}" = "xfull" ]; then + MODE="full" + CHECKOUT="redist-server/${RELEASE}" + RELEASE_SUFFIX='-full' +elif [ "x$CHECKOUT" = "xclient" ] || [ "x${CHECKOUT}" = "xlite" ]; then + MODE="lite" + CHECKOUT="redist-client/${RELEASE}" + RELEASE_SUFFIX='-lite' else - usage + usage fi if [ x"$RELEASE" == "xHEAD" ]; then - CHECKOUT=HEAD + CHECKOUT="HEAD" fi if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then - echo " '${RELEASE}' is not a valid release number because there is no git tag named $CHECKOUT." + echo " '${RELEASE}' is not a valid release number because there is no git tag named ${CHECKOUT}." echo " Please specify one of the following releases:" echo "HEAD" - git tag -l | grep ^redist | cut -f2 -d/ | sort -u + git tag -l | grep "^redist" | cut -f2 -d"/" | sort -u exit 1 fi @@ -71,42 +71,42 @@ TEMP_DIR="$(mktemp -d)" trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 # create local copy of Git project at temp location -git archive --format=tar ${CHECKOUT} --prefix=${PROJECT}-${RELEASE}/ | ( cd $TEMP_DIR; tar xf - ) +git archive --format=tar "${CHECKOUT}" --prefix="${PROJECT}-${RELEASE}/" | ( cd "$TEMP_DIR"; tar xf - ) echo "Created tarball for $CHECKOUT" -cd "$TEMP_DIR/${PROJECT}-${RELEASE}/" +cd "${TEMP_DIR}/${PROJECT}-${RELEASE}/" -mkdir -p doc/applied-patches +mkdir -p "doc/applied-patches" # prepare patches for lite and full tarball if [ "x$MODE" = "xfull" ]; then - cat debian/patches/series | sort | grep -v ^# | egrep "([0-9]+_.*\.(full|full\+lite)\.patch)" | while read file + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+_.*\.(full|full\+lite)\.patch)" | while read file do - cp -v debian/patches/$file doc/applied-patches - echo ${file##*/} >> doc/applied-patches/series + cp -v "debian/patches/$file" "doc/applied-patches/" + echo "${file##*/}" >> "doc/applied-patches/series" done else rm -Rf "nxcompshad"* rm -Rf "nxcompext"* rm -Rf "nx-X11"* - cat debian/patches/series | sort | grep -v ^# | egrep "([0-9]+_.*\.full\+lite\.patch)" | while read file + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+_.*\.full\+lite\.patch)" | while read file do - cp -v debian/patches/$file doc/applied-patches - echo ${file##*/} >> doc/applied-patches/series + cp -v "debian/patches/$file" "doc/applied-patches/" + echo "${file##*/}" >> "doc/applied-patches/series" done fi # 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 - QUILT_PATCHES=doc/applied-patches quilt --quiltrc /dev/null push -a -q + QUILT_PATCHES="doc/applied-patches" quilt --quiltrc /dev/null push -a -q else echo "No patches applied at all. Very old release?" fi # very old release did not add any README for f in $(ls README* 2>/dev/null); do - mv -v $f doc/; + mv -v "$f" "doc/"; done # remove folders that we do not want to roll into the tarball @@ -116,15 +116,15 @@ rm -Rf "debian/" # remove files, that we do not want in the tarballs (build cruft) rm -Rf nx*/configure nx*/autom4te.cache* -cd $OLDPWD +cd "$OLDPWD" # create target location for tarball -mkdir -p "$TARGETDIR/_releases_/source/${PROJECT}/" +mkdir -p "${TARGETDIR}/_releases_/source/${PROJECT}/" # roll the ball... cd "$TEMP_DIR" find "${PROJECT}-${RELEASE}" -type f | sort > "$MANIFEST" -cd $OLDPWD +cd "$OLDPWD" tar c -C "$TEMP_DIR" \ --owner 0 \ @@ -133,6 +133,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" diff --git a/debian/rules b/debian/rules index 2375b46ac..16a09fb3f 100755 --- a/debian/rules +++ b/debian/rules @@ -43,12 +43,10 @@ override_dh_install: # remove extras, GL, and other unneeded headers rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/GL/ - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/bitmaps/ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XInput.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XK*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/*Xv*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xtrap*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/Print*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XRes*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/record*.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86vmode.h @@ -59,15 +57,12 @@ override_dh_install: rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1str.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86mscstr.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/dmxext.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/dmxproto.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/bigreqstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xcmiscstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XIproto.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86bigfont.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XI.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/fonts/ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/Xtrans/ dh_install --fail-missing @@ -86,12 +81,9 @@ override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg dh_strip -plibnx-xcomposite1 --dbg-package=libnx-xcomposite1-dbg - dh_strip -plibnx-xdamage1 --dbg-package=libnx-xdamage1-dbg - dh_strip -plibnx-xdmcp6 --dbg-package=libnx-xdmcp6-dbg dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg - dh_strip -plibnx-xpm4 --dbg-package=libnx-xpm4-dbg dh_strip -plibnx-xrandr2 --dbg-package=libnx-xrandr2-dbg dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg dh_strip -plibnx-xtst6 --dbg-package=libnx-xtst6-dbg |