diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 67 | ||||
| -rw-r--r-- | debian/control | 57 | ||||
| -rw-r--r-- | debian/libnx-xrandr-dev.install.in | 2 | ||||
| -rw-r--r-- | debian/libnx-xrandr2.install.in | 1 | ||||
| -rw-r--r-- | debian/libnx-xrandr2.symbols | 23 | ||||
| -rw-r--r-- | debian/nx-x11proto-randr-dev.install.in | 2 | ||||
| -rwxr-xr-x | debian/rules | 1 |
7 files changed, 88 insertions, 65 deletions
diff --git a/debian/changelog b/debian/changelog index e664e5b0f..0d56a4b96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -157,6 +157,48 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low * debian/control: workaround missing dependencies of nxagent on Ubuntu for now. * debian/libnx-xinerama1.*: fix faulty logic when creating symlinks. + Backported from Arctica GH 3.6.x branch. + * Security fixes: + - X.Org CVE-2014-8100: + v3: port to NXrender.c rather than render.c (Mike DePaulo) + v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1027-render-check-request-size-before-reading-it-CVE.full.patch + * Security fixes: + - X.Org CVE-2014-8100: + v3: port to NXrender.c rather than render.c (Mike DePaulo) + v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1028-render-unvalidated-lengths-in-Render-extn.-swap.full.patch + * nxcomp/Misc.cpp: fix build failure introduced in + a27a8aae3ca7a3f70e05152ac3d347942e11159d. + Backported from Arctica GH 3.6.x branch. + Affects: + - 9900-dxpc-license-history.full+lite.patch + * Security fixes: + - X.Org CVE-2013-4396: + v2: Apply to NXdixfonts.c rather than dixfonts.c (Mike DePaulo) + v3: backport v2 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageT.full.patch + * Security fixes: + - X.Org CVE-2014-8092: + v3: port to NXdispatch.c rather than dispatch.c (Mike DePaulo) + v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8.full.patch + * Security fixes: + - X.Org CVE-2015-3418: + v3: port to NXdispatch.c rather than dispatch.c (Mike DePaulo) + v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch + * Security fixes: + - X.Org CVE-2014-8099: + v3: port to NXxvdisp.c rather than xvdisp.c (Mike DePaulo) + v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan) + Changes: + + 1026-Xv-unvalidated-lengths-in-XVideo-extension-swap.full.patch [ Bernard Cafarelli ] * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. @@ -175,6 +217,31 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low * nxcompshad: Prevent underlinking by linking to libNX_Xext. Adds: - 0650_nxcompshad_link-to-NX_Xext.full.patch + * Security fixes: + - X.Org CVE-2015-3418: + 1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch + * debian/roll-tarball.sh: + + Make sure *.keyboard, debian/**, nx-libs.spec, .pc/** don't end up + in tarball (special focus on the nx-libs-lite tarball). + + Allow patch files names having a dash next to the four digits (i.e., + 1234-<patchname>.<suffix>). + + Support tarring up the HEAD of the current branch. + * debian/COPYING.full+lite: + + Replace content with GPL-2 license text, because that is the overall + (i.e., strictest) license we have to deal with in nx-libs. + * Add 9900-dxpc-license-history.full+lite.patch. Document license history of + DXPC (where nxcomp got forked from). + Backported from Arctica GH 3.6.x branch. + * nxcomp/README.on-retroactive-DXPC-license: Some layout and + interpunctuation fixes. + Backported from Arctica GH 3.6.x branch. + Affects: + - 9900-dxpc-license-history.full+lite.patch + + [ Nito Martinez ] + * nxcomp: fix DEBUG, TEST, DUMP, FLUSH, TOKEN, PING, MIXED et al builds. + Adds: + - 0992_fix-DEBUG-TEST-DUMP-FLUSH-TOKEN-PING-et-al-builds.full+lite.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 0f575421f..485c6fe0e 100644 --- a/debian/control +++ b/debian/control @@ -18,12 +18,12 @@ Build-Depends: libxfont-dev, libxdmcp-dev, libxdamage-dev, + libxrandr-dev, autoconf, pkg-config, x11proto-core-dev, expat, Build-Conflicts: - x11proto-randr-dev, x11proto-record-dev, x11proto-xinerama-dev, Standards-Version: 3.9.6 @@ -714,20 +714,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 RandR extension library +Description: nx-X11 RandR 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_Xrandr provides an X Window System client interface to the RandR - extension to the X protocol. + This package removes the obsoleted libNX_Xrandr.so.2 library. With + recent versions of NX, the system-wide installed libXrandr gets used. . - The RandR extension allows for run-time configuration of display attributes - such as resolution, rotation, and reflection. + This package can be safely removed. Package: libnx-xrandr-dev Provides: libnx-xrandr2-dev @@ -735,41 +731,34 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xrandr2 (= ${binary:Version}), - nx-x11proto-randr-dev (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 RandR extension library (development headers) +Description: nx-X11 RandR 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_Xrandr provides an X Window System client interface to the RandR - extension to the X protocol. - . - The RandR extension allows for run-time configuration of display attributes - such as resolution, rotation, and reflection. + This package removes the obsoleted headers for the libNX_Xrandr.so.2 + library. With recent versions of NX, the system-wide installed libXrandr + gets used. . - This package contains the development headers for this library. + This package can be safely removed. Package: nx-x11proto-randr-dev Section: libdevel Architecture: any Multi-Arch: same Depends: - libnx-xrandr2 (= ${binary:Version}), ${misc:Depends}, -Breaks: nxlibs (<= 3.5.1), - libnx-x11-dev (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 RandR extension wire protocol +Description: nx-X11 RandR 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 RandR extension, used to change display properties such as - resolution, rotation, reflection, et al, on the fly. + This package removes the obsoleted headers for the libNX_Xrandr.so.2 + library. With recent versions of NX, the system-wide installed libXrandr + gets used. + . + This package can be safely removed. Package: libnx-xrandr2-dbg Architecture: any @@ -777,22 +766,18 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, Depends: - libnx-xrandr2 (= ${binary:Version}), ${misc:Depends}, Section: debug -Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), -Description: nx-X11 RandR extension library (debug package) +Description: nx-X11 RandR 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_Xrandr provides an X Window System client interface to the RandR - extension to the X protocol. - . - The RandR extension allows for run-time configuration of display attributes - such as resolution, rotation, and reflection. + This package removes the obsoleted debug symbols for the libNX_Xrandr.so.2 + library. With recent versions of NX, the system-wide installed libXrandr + gets used. . - This package contains debug symbols for this library. + This package can be safely removed. Package: libnx-xrender1 Architecture: any diff --git a/debian/libnx-xrandr-dev.install.in b/debian/libnx-xrandr-dev.install.in deleted file mode 100644 index 4711b6a18..000000000 --- a/debian/libnx-xrandr-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/libNX_Xrandr.so -usr/include/*/nx/X11/extensions/Xrandr.h
\ No newline at end of file diff --git a/debian/libnx-xrandr2.install.in b/debian/libnx-xrandr2.install.in deleted file mode 100644 index f4d1b039f..000000000 --- a/debian/libnx-xrandr2.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libNX_Xrandr.so.* diff --git a/debian/libnx-xrandr2.symbols b/debian/libnx-xrandr2.symbols deleted file mode 100644 index 7dc2fd1b9..000000000 --- a/debian/libnx-xrandr2.symbols +++ /dev/null @@ -1,23 +0,0 @@ -libNX_Xrandr.so.2 libnx-xrandr2 #MINVER# - XRRConfigCurrentConfiguration@Base 3.5.0.29 - XRRConfigCurrentRate@Base 3.5.0.29 - XRRConfigRates@Base 3.5.0.29 - XRRConfigRotations@Base 3.5.0.29 - XRRConfigSizes@Base 3.5.0.29 - XRRConfigTimes@Base 3.5.0.29 - XRRExtensionInfo@Base 3.5.0.29 - XRRExtensionName@Base 3.5.0.29 - XRRFindDisplay@Base 3.5.0.29 - XRRFreeScreenConfigInfo@Base 3.5.0.29 - XRRGetScreenInfo@Base 3.5.0.29 - XRRQueryExtension@Base 3.5.0.29 - XRRQueryVersion@Base 3.5.0.29 - XRRRates@Base 3.5.0.29 - XRRRootToScreen@Base 3.5.0.29 - XRRRotations@Base 3.5.0.29 - XRRSelectInput@Base 3.5.0.29 - XRRSetScreenConfig@Base 3.5.0.29 - XRRSetScreenConfigAndRate@Base 3.5.0.29 - XRRSizes@Base 3.5.0.29 - XRRTimes@Base 3.5.0.29 - XRRUpdateConfiguration@Base 3.5.0.29 diff --git a/debian/nx-x11proto-randr-dev.install.in b/debian/nx-x11proto-randr-dev.install.in deleted file mode 100644 index d92801663..000000000 --- a/debian/nx-x11proto-randr-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/include/*/nx/X11/extensions/randr.h -usr/include/*/nx/X11/extensions/randrproto.h diff --git a/debian/rules b/debian/rules index 16a09fb3f..682c5dab8 100755 --- a/debian/rules +++ b/debian/rules @@ -84,7 +84,6 @@ override_dh_strip: 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-xrandr2 --dbg-package=libnx-xrandr2-dbg dh_strip -plibnx-xrender1 --dbg-package=libnx-xrender1-dbg dh_strip -plibnx-xtst6 --dbg-package=libnx-xtst6-dbg dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg |