Add libXcomposite depend, remove vulnerable NX 2.1 versions bug #192712

(Portage version: 2.1.3.9)

5 files changed, 9 insertions, 274 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 9444401f544b..d11e486b7203 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.10 2007/09/20 12:24:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.11 2007/09/20 23:13:27 voyageur Exp $
+
+  20 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/nx-2.1.0-nxagent-mem-leaks.patch, -nx-2.1.0.ebuild,
+  nx-3.0.0.ebuild:
+  Add libXcomposite depend, bug #193216
+  Remove vulnerable NX 2.1 versions, security bug #192712
 
   20 Sep 2007; Christian Faulhammer <opfer@gentoo.org> nx-3.0.0.ebuild:
   stable x86, security bug 192712
diff --git a/net-misc/nx/files/digest-nx-2.1.0 b/net-misc/nx/files/digest-nx-2.1.0
deleted file mode 100644
index a1eed4aead7b..000000000000
--- a/net-misc/nx/files/digest-nx-2.1.0
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 9c6e9e4c35c4ec3a7664fcdd397eb7f0 nx-X11-2.1.0-3.tar.gz 32532518
-RMD160 69c4b24f8279d9c92bb3ef22a4399806b5fb8050 nx-X11-2.1.0-3.tar.gz 32532518
-SHA256 dabec82696c23d0c9da0d1a66fee12fd6ffe232e7aecf10f0929e968fe0703f4 nx-X11-2.1.0-3.tar.gz 32532518
-MD5 cae6005f50bab78aa7abba448fca4ed9 nxagent-2.1.0-18.tar.gz 950859
-RMD160 b9d5e50ba2a3b385ee9adc463bb02481ce32db51 nxagent-2.1.0-18.tar.gz 950859
-SHA256 fc9836702039690ca94e44cefb5ec0edce1f968f55666b8afc66ec15456eae33 nxagent-2.1.0-18.tar.gz 950859
-MD5 74811bc9ef86f2d97b3b2ba2ba53f9d3 nxauth-2.1.0-2.tar.gz 30296
-RMD160 e20dbac668d98e59d42359d71a1be4947a64d492 nxauth-2.1.0-2.tar.gz 30296
-SHA256 a3231b42daf1e5add3aaa876f5f99dae0dcf196c2122ad0db11c317851e75799 nxauth-2.1.0-2.tar.gz 30296
-MD5 7e35e48adb66786ad720ff9fbfa950a3 nxcomp-2.1.0-8.tar.gz 556291
-RMD160 b8960b616eb48521404e9ee39cf7e6f64e060394 nxcomp-2.1.0-8.tar.gz 556291
-SHA256 74ad4bf63602c3e50622d74420c3840f2e7f0d690b2176c0331ad2011756e776 nxcomp-2.1.0-8.tar.gz 556291
-MD5 d3347382860670cfd4471d228fb1b730 nxcompext-2.1.0-5.tar.gz 102588
-RMD160 f9c7ea4ca0013063406d18b2e3e928ebfa600169 nxcompext-2.1.0-5.tar.gz 102588
-SHA256 acd81ab9f0ab74317a9d34902d77f5978432d3488664c501a42378577b81f06c nxcompext-2.1.0-5.tar.gz 102588
-MD5 bbbb9b91b8bc6759d42524c3f3f5be42 nxdesktop-2.1.0-9.tar.gz 823225
-RMD160 5b42c2e55856d5cd3873b18dfbb6fb128497d5f6 nxdesktop-2.1.0-9.tar.gz 823225
-SHA256 35cd77ea63d7381bad5745224bd93635a53bfe4b3e545085f09bf512075c08db nxdesktop-2.1.0-9.tar.gz 823225
-MD5 29b0e8be069a8258f5b8774362fc7464 nxproxy-2.1.0-3.tar.gz 82753
-RMD160 71c9a069cb9b8ede2505753656cd5b83fff80f8e nxproxy-2.1.0-3.tar.gz 82753
-SHA256 3c2db68cb0fa931db1b2ef74c76c848357d332ada8397c511719215bd8eeabac nxproxy-2.1.0-3.tar.gz 82753
-MD5 e9f5b692278025856b09bd71d0966100 nxviewer-2.1.0-12.tar.gz 228158
-RMD160 0462706c5ea0f49700e4ccdfc2adba1278b0e3ec nxviewer-2.1.0-12.tar.gz 228158
-SHA256 dc41c4f3cc6f6e4e7985a37d5b3cddf9c9571b8e9752fbb056a4d6e4c9b59178 nxviewer-2.1.0-12.tar.gz 228158
diff --git a/net-misc/nx/files/nx-2.1.0-nxagent-mem-leaks.patch b/net-misc/nx/files/nx-2.1.0-nxagent-mem-leaks.patch
deleted file mode 100644
index eb9d7cf317d6..000000000000
--- a/net-misc/nx/files/nx-2.1.0-nxagent-mem-leaks.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -uBbr new/nx-X11/programs/Xserver/hw/nxagent/Atoms.c nx-X11/programs/Xserver/hw/nxagent/Atoms.c
---- new/nx-X11/programs/Xserver/hw/nxagent/Atoms.c	2006-04-18 11:40:18.000000000 -0355
-+++ nx-X11/programs/Xserver/hw/nxagent/Atoms.c	2007-02-19 12:54:51.000000000 -0455
-@@ -785,6 +785,8 @@
- 
-     nxagentWriteAtom(local, remote, string, True);
- 
-+    XFree(string);
-+
-     return local;
-   }
- 
-diff -uBbr new/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
---- new/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c	2006-11-09 12:22:35.000000000 -0455
-+++ nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c	2007-02-21 13:23:59.000000000 -0455
-@@ -2521,7 +2521,7 @@
- 		err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases)
- 		    ((pointer) c->client, fpe, c->current.pattern,
- 		     c->current.patlen, c->current.max_names - c->names->nnames,
--		     &c->current.private);
-+		     &c->current.private); /* FIXME: returned mem c->current.private (needed by list_next_font_or_alias) may never be freed */
- 		if (err == Suspended) {
- 		    if (!c->slept) {
- 			ClientSleep(client,
-diff -uBbr new/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
---- new/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c	2006-11-09 12:18:00.000000000 -0455
-+++ nx-X11/programs/Xserver/hw/nxagent/Pixmap.c	2007-02-21 13:28:54.000000000 -0455
-@@ -1115,6 +1115,7 @@
-     {
-       FatalError("XGetImage: Failed.\n");
- 
-+      free(data);
-       return False;
-     }
- 
-@@ -1600,6 +1601,7 @@
-         fprintf(stderr, "nxagentSynchronizeDrawableData: WARNING! Failed to create the temporary GC.\n");
-         #endif
- 
-+        xfree(data);
-         return 0;
-       }
- 
-@@ -1661,6 +1663,7 @@
-           fprintf(stderr, "nxagentSynchronizeDrawableData: WARNING! Failed to create the temporary GC.\n");
-           #endif
- 
-+          xfree(data);
-           return 0;
-         }
- 
-@@ -1772,6 +1775,7 @@
-   int useExtents;
-   int imageLength, corruptedLength;
-   int corruptedWidth, corruptedHeight;
-+  int ret = 0; /* Used by error handling. 0 is error(?, based on previous code) */
- 
-   #ifdef TEST
-   static int totalLength;
-@@ -1812,7 +1816,7 @@
-                             (void *) pDrawable);
-     #endif
- 
--    return 0;
-+    goto SR_FREE_CLIP;
-   }
- 
-   /*
-@@ -1836,7 +1840,7 @@
-                               (void *) pDrawable);
-       #endif
- 
--      return 0;
-+      goto SR_FREE_CLIP;
-     }
-   }
- 
-@@ -1861,7 +1865,7 @@
-     fprintf(stderr, "nxagentSynchronizeRegion: WARNING! Failed to allocate memory for the operation.\n");
-     #endif
- 
--    return 0;
-+    goto SR_FREE_CLIP;
-   }
- 
-   pSrcDrawable = (pDrawable -> type == DRAWABLE_PIXMAP ?
-@@ -1876,7 +1880,7 @@
-     fprintf(stderr, "nxagentSynchronizeRegion: WARNING! Failed to create the temporary GC.\n");
-     #endif
- 
--    return 0;
-+    goto SR_FREE_XALLOC;
-   }
- 
-   ValidateGC(pDrawable, pGC);
-@@ -1935,7 +1939,7 @@
- 
-     #endif
- 
--    return 1;
-+    goto SR_FREE_GC;
-   }
- 
-   /*
-@@ -2029,13 +2033,17 @@
- 
-   nxagentGCTrap = saveTrap;
- 
--  nxagentFreeRegion(pDrawable, clipRegion);
-+SR_FREE_GC:
-+  ret = 1;
-+  FreeScratchGC(pGC);
- 
-+SR_FREE_XALLOC:
-   xfree(data);
- 
--  FreeScratchGC(pGC);
-+SR_FREE_CLIP:
-+  nxagentFreeRegion(pDrawable, clipRegion);
- 
--  return 1;
-+  return ret;
- }
- 
- void nxagentSynchronizeBox(DrawablePtr pDrawable, BoxPtr pBox)
diff --git a/net-misc/nx/nx-2.1.0.ebuild b/net-misc/nx/nx-2.1.0.ebuild
deleted file mode 100644
index c97e33cb8524..000000000000
--- a/net-misc/nx/nx-2.1.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-2.1.0.ebuild,v 1.3 2007/07/03 11:10:53 opfer Exp $
-
-inherit autotools eutils multilib
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.nomachine.com/developers.php"
-
-URI_BASE="http://web04.nomachine.com/download/${PV}/sources"
-SRC_NX_X11="nx-X11-$PV-3.tar.gz"
-SRC_NXAGENT="nxagent-$PV-18.tar.gz"
-SRC_NXAUTH="nxauth-$PV-2.tar.gz"
-SRC_NXCOMP="nxcomp-$PV-8.tar.gz"
-SRC_NXCOMPEXT="nxcompext-$PV-5.tar.gz"
-SRC_NXDESKTOP="nxdesktop-$PV-9.tar.gz"
-SRC_NXVIEWER="nxviewer-$PV-12.tar.gz"
-SRC_NXPROXY="nxproxy-$PV-3.tar.gz"
-
-SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY
-	$URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXCOMP
-	rdesktop? ( $URI_BASE/$SRC_NXDESKTOP )
-	vnc? ( $URI_BASE/$SRC_NXVIEWER )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="rdesktop vnc"
-
-RDEPEND="x86? ( x11-libs/libXau
-		   		x11-libs/libXdmcp
-				x11-libs/libXpm
-				>=media-libs/jpeg-6b-r4
-				>=media-libs/libpng-1.2.8
-				>=sys-libs/zlib-1.2.3 )
-		 amd64? ( >=app-emulation/emul-linux-x86-xlibs-10.0 )"
-
-DEPEND="${RDEPEND}
-		x11-misc/gccmakedep
-		x11-misc/imake"
-
-S=${WORKDIR}/${PN}-X11
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${WORKDIR}
-	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-tmp-exec.patch
-	epatch ${FILESDIR}/1.5.0/nxcomp-1.5.0-pic.patch
-	epatch ${FILESDIR}/${P}-nxagent-mem-leaks.patch
-
-	cd ${WORKDIR}/nxcomp
-	epatch ${FILESDIR}/${P}-deprecated-headers.patch
-	epatch ${FILESDIR}/${P}-invalid-options.patch
-	eautoreconf
-}
-
-src_compile() {
-	# nx-X11 will only compile in 32-bit
-	use amd64 && multilib_toolchain_setup x86
-
-	cd ${WORKDIR}/nxcomp || die
-	econf || die
-	emake || die
-
-	cd ${WORKDIR}/nxproxy || die
-	econf || die
-	emake || die
-
-	cd ${WORKDIR}/nx-X11 || die
-	emake World || die
-
-	cd ${WORKDIR}/nxcompext || die
-	econf || die
-	emake || die
-
-	if use vnc ; then
-		cd ${WORKDIR}/nxviewer || die
-		xmkmf -a || die
-		emake World || die
-	fi
-
-	if use rdesktop ; then
-		cd ${WORKDIR}/nxdesktop || die
-		CC=(tc-getCC) ./configure || die
-		emake || die
-	fi
-}
-
-src_install() {
-	NX_ROOT=/usr/$(get_libdir)/NX
-
-	for x in nxagent nxauth nxproxy; do
-		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
-	done
-	if use vnc ; then
-		make_wrapper nxviewer ./nxviewer ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
-		make_wrapper nxpasswd ./nxpasswd ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
-	fi
-	if use rdesktop ; then
-		make_wrapper nxdesktop ./nxdesktop ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
-	fi
-
-	into ${NX_ROOT}
-	dobin ${WORKDIR}/nx-X11/programs/Xserver/nxagent
-	dobin ${WORKDIR}/nx-X11/programs/nxauth/nxauth
-	dobin ${WORKDIR}/nxproxy/nxproxy
-
-	if use vnc ; then
-		dobin ${WORKDIR}/nxviewer/nxviewer/nxviewer
-		dobin ${WORKDIR}/nxviewer/nxpasswd/nxpasswd
-	fi
-
-	if use rdesktop ; then
-		dobin ${WORKDIR}/nxdesktop/nxdesktop
-	fi
-
-	dolib.so ${WORKDIR}/nx-X11/lib/X11/libX11.so*
-	dolib.so ${WORKDIR}/nx-X11/lib/Xext/libXext.so*
-	dolib.so ${WORKDIR}/nx-X11/lib/Xrender/libXrender.so*
-	dolib.so ${WORKDIR}/nxcomp/libXcomp.so*
-	dolib.so ${WORKDIR}/nxcompext/libXcompext.so*
-}
diff --git a/net-misc/nx/nx-3.0.0.ebuild b/net-misc/nx/nx-3.0.0.ebuild
index c68c2a740a4d..4b2392066f48 100644
--- a/net-misc/nx/nx-3.0.0.ebuild
+++ b/net-misc/nx/nx-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.0.0.ebuild,v 1.3 2007/09/20 12:24:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.0.0.ebuild,v 1.4 2007/09/20 23:13:27 voyageur Exp $
 
 inherit autotools eutils multilib
 
@@ -24,6 +24,7 @@ KEYWORDS="~amd64 x86"
 IUSE="rdesktop vnc"
 
 RDEPEND="x11-libs/libXau
+	x11-libs/libXcomposite
 	x11-libs/libXdamage
 	x11-libs/libXdmcp
 	x11-libs/libXpm