Remove vulnerable NX 2.1 versions, security bug #192712

(Portage version: 2.1.3.9)

7 files changed, 6 insertions, 324 deletions

diff --git a/net-misc/nxserver-freeedition/ChangeLog b/net-misc/nxserver-freeedition/ChangeLog
index 5b37be64434f..c53be8b6443c 100644
--- a/net-misc/nxserver-freeedition/ChangeLog
+++ b/net-misc/nxserver-freeedition/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nxserver-freeedition
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.17 2007/09/20 14:53:19 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.18 2007/09/20 23:19:27 voyageur Exp $
+
+  20 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/nxserver-2.1.0-setup.patch, -files/nxserver-3.0.0-setup.patch,
+  -nxserver-freeedition-2.1.0.ebuild, -nxserver-freeedition-3.0.0-r2.ebuild:
+  Remove vulnerable NX 2.1 versions, security bug #192712
 
   20 Sep 2007; Robert Buchholz <rbu@gentoo.org>
   nxserver-freeedition-3.0.0-r3.ebuild:
diff --git a/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-2.1.0 b/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-2.1.0
deleted file mode 100644
index 62c08391d9ad..000000000000
--- a/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-2.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9cbc23a14ffc379a3a5fe184a50719e4 nxserver-2.1.0-22.i386.tar.gz 5037224
-RMD160 fe2544b03c0d0ec5bdfe415fcc15327e7160379b nxserver-2.1.0-22.i386.tar.gz 5037224
-SHA256 a2c807db46249f6c708b5aa9bb4653b0f5f0add12f94d26609abe7f2de146397 nxserver-2.1.0-22.i386.tar.gz 5037224
diff --git a/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0-r2 b/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0-r2
deleted file mode 100644
index 0bf178e0db27..000000000000
--- a/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e6787194fce97a4fb01dad9b0be84b97 nxserver-3.0.0-63.i386.tar.gz 6657578
-RMD160 01d00029538865dd340bb729b03ec5acacdd6e03 nxserver-3.0.0-63.i386.tar.gz 6657578
-SHA256 705bb85ca9613adcf290eb7d8995e035bf241e97126d4afcf34acb1e23eb994d nxserver-3.0.0-63.i386.tar.gz 6657578
-MD5 edb4190ffb7290d3e085e7eda737425e nxserver-3.0.0-63.x86_64.tar.gz 7704684
-RMD160 94906c8dc5a93dbe2019ac52fe898f2b9f0420a4 nxserver-3.0.0-63.x86_64.tar.gz 7704684
-SHA256 190ce430835da766906e80c6791121f15733bbd1d6fd993afca677e7a691dfdc nxserver-3.0.0-63.x86_64.tar.gz 7704684
diff --git a/net-misc/nxserver-freeedition/files/nxserver-2.1.0-setup.patch b/net-misc/nxserver-freeedition/files/nxserver-2.1.0-setup.patch
deleted file mode 100644
index 7cb87125fcec..000000000000
--- a/net-misc/nxserver-freeedition/files/nxserver-2.1.0-setup.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- scripts/setup/nxserver.orig	2006-11-05 16:43:33.000000000 +0000
-+++ scripts/setup/nxserver	2006-11-05 17:29:42.000000000 +0000
-@@ -509,6 +509,10 @@
- 
- removeNXinit () {
- 
-+  if [ "$system" = "gentoo" ]; then
-+    return
-+  fi
-+
-   runCommand "$RMCOMMAND -f /etc/init.d/nxserver" "Unable to remove '/etc/init.d/nxserver'" "warn"
- 
-   if [ "$system" = "solaris" ];
-@@ -655,6 +659,10 @@
- 
- addNXinit () {
- 
-+ if [ "$system" = "gentoo" ]; then
-+   return
-+ fi
-+
-  runCommand "cat /usr/NX/scripts/init/nxserver > /etc/init.d/nxserver" "Unable to create: '/etc/init.d/nxserver'" "warn"
-  runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of '/etc/init.d/nxserver' file" "warn"
- 
-@@ -770,6 +778,11 @@
- 
- addNXUserLinux () {
- 
-+  # does the NX user already exist?
-+  if id nx > /dev/null 2>&1 ; then
-+    return
-+  fi
-+
-   if [ "x$system" = "xmandrake" -o "x$system" = "xfedora" ];
-   then
-     runCommand "useradd -p '*' -d '$NODE_ROOT/home/nx' -M nx" "Cannot add user: nx to the system" "error"
-@@ -1914,6 +1927,10 @@
-   system=fedora
- fi
- 
-+if [ -d /usr/portage ]; then
-+  system=gentoo
-+fi
-+
- if [ "x$system" = "x" -a -f /etc/release ];
- then
-   system=solaris
-@@ -1948,6 +1965,7 @@
-     "mandrake"           ) ;;
-     "fedora"             ) ;;
-     "debian"             ) ;;
-+    "gentoo"             ) ;;
-     "solaris"             ) ;;
-     ""                 ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;;
-     *                  ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;;
-@@ -2104,14 +2122,6 @@
-     return 0
-   fi
-   
--  result=`id nx 2>&1`
--  if [ $? = 0 ];
--  then
--    printMsg "Cannot add user: nx. User: nx already exists" "error"
--    printMsg "Please try to fix the problem by reinstalling the server" "error"
--    exit 1
--  fi
--
-   LOGFILE="$INSTALLOG"
-   createLogdirectory
-   startLog
diff --git a/net-misc/nxserver-freeedition/files/nxserver-3.0.0-setup.patch b/net-misc/nxserver-freeedition/files/nxserver-3.0.0-setup.patch
deleted file mode 100644
index ab4ce9b482f6..000000000000
--- a/net-misc/nxserver-freeedition/files/nxserver-3.0.0-setup.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- scripts/setup/nxserver.orig	2007-06-20 13:25:18.000000000 +0200
-+++ scripts/setup/nxserver	2007-06-21 12:29:49.477230627 +0200
-@@ -535,6 +535,10 @@
- 
- removeNXinit () {
- 
-+  if [ "$system" = "gentoo" ]; then
-+    return
-+  fi
-+
-   runCommand "$RMCOMMAND -f /etc/init.d/nxserver" "Unable to remove '/etc/init.d/nxserver'" "warn"
- 
-   if [ "$system" = "solaris" ];
-@@ -681,6 +685,10 @@
- 
- addNXinit () {
- 
-+ if [ "$system" = "gentoo" ]; then
-+   return
-+ fi
-+
-  runCommand "cat $NODE_ROOT/scripts/init/nxserver > /etc/init.d/nxserver" "Unable to create: '/etc/init.d/nxserver'" "warn"
-  runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of '/etc/init.d/nxserver' file" "warn"
- 
-@@ -796,6 +804,11 @@
- 
- addNXUserLinux () {
- 
-+  # does the NX user already exist?
-+  if id nx > /dev/null 2>&1 ; then
-+    return
-+  fi
-+
-   if [ "x$system" != "xdebian" ]
-   then
-     sysuser=`useradd --help 2>&1|grep "\-r"`;
-@@ -2434,6 +2447,10 @@
-   system=fedora
- fi
- 
-+if [ -d /usr/portage ]; then
-+  system=gentoo
-+fi
-+
- if [ "x$system" = "x" -a -f /etc/release ];
- then
-   system=solaris
-@@ -2468,6 +2485,7 @@
-     "mandrake"           ) ;;
-     "fedora"             ) ;;
-     "debian"             ) ;;
-+    "gentoo"             ) ;;
-     "solaris"             ) ;;
-     ""                 ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;;
-     *                  ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;;
-@@ -2614,14 +2632,6 @@
-     procedureUpdateServer
-     return 0
-   fi
--  
--  result=`id nx 2>&1`
--  if [ $? = 0 ];
--  then
--    printMsg "Cannot add user: nx. User: nx already exists" "error"
--    printMsg "Please try to fix the problem by reinstalling the server" "error"
--    exit 1
--  fi
- 
-   LOGFILE="$INSTALLOG"
-   createLogdirectory
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild
deleted file mode 100644
index 316625db4769..000000000000
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild
+++ /dev/null
@@ -1,87 +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/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild,v 1.6 2007/07/03 11:22:02 opfer Exp $
-
-inherit eutils
-
-DESCRIPTION="Free edition NX server from NoMachine"
-HOMEPAGE="http://www.nomachine.com/"
-SRC_URI="http://64.34.161.181/download/2.1.0/Linux/FE/nxserver-2.1.0-22.i386.tar.gz"
-
-LICENSE="nomachine"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="=net-misc/nxnode-2.1*
-		!net-misc/nxserver-freenx
-		!net-misc/nxserver-2xterminalserver"
-RDEPEND="${DEPEND}
-		 media-fonts/font-misc-misc
-		 media-fonts/font-cursor-misc
-		 x11-apps/xauth"
-QA_TEXTRELS="usr/NX/lib/perl/GD.so"
-
-S="${WORKDIR}/NX"
-
-pkg_preinst()
-{
-	enewuser nx -1 -1 /usr/NX/home/nx
-}
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/nxserver-2.1.0-setup.patch
-}
-
-src_install()
-{
-	# we install nxserver into /usr/NX, to make sure it doesn't clash
-	# with libraries installed for FreeNX
-
-	into /usr/NX
-	for x in nxserver ; do
-		dobin bin/$x
-	done
-
-	dodir /usr/NX/etc
-	insinto /usr/NX/etc
-	doins etc/administrators.db.sample
-	doins etc/guests.db.sample
-	doins etc/passwords.db.sample
-	doins etc/profiles.db.sample
-	doins etc/users.db.sample
-	doins etc/server.lic.sample
-
-	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample
-
-	cp -R etc/keys ${D}/usr/NX/etc || die
-
-	cp -R home ${D}/usr/NX || die
-	cp -R lib ${D}/usr/NX || die
-	cp -R scripts ${D}/usr/NX || die
-	cp -R share ${D}/usr/NX || die
-	cp -R var ${D}/usr/NX || die
-
-	newinitd ${FILESDIR}/nxserver-2.1.0-init nxserver
-}
-
-pkg_postinst ()
-{
-	usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-	usermod -d /usr/NX/home/nx nx || die "Unable to set home directory of nx user!!"
-
-	# only run install when no configuration file is found
-	if [ -f /usr/NX/etc/server.cfg ]; then
-		einfo "Running NoMachine's update script"
-		${ROOT}/usr/NX/scripts/setup/nxserver --update
-	else
-		einfo "Running NoMachine's setup script"
-		${ROOT}/usr/NX/scripts/setup/nxserver --install
-	fi
-
-	elog "Remember to add nxserver to your default runlevel"
-}
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r2.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r2.ebuild
deleted file mode 100644
index 00956e758343..000000000000
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,87 +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/nxserver-freeedition/nxserver-freeedition-3.0.0-r2.ebuild,v 1.1 2007/07/22 14:38:37 voyageur Exp $
-
-inherit eutils
-
-DESCRIPTION="Free edition NX server from NoMachine"
-HOMEPAGE="http://www.nomachine.com/"
-SRC_URI="amd64? ( http://64.34.161.181/download/3.0.0/Linux/FE/nxserver-${PV}-63.x86_64.tar.gz )
-	x86? ( http://64.34.161.181/download/3.0.0/Linux/FE/nxserver-${PV}-63.i386.tar.gz )"
-
-LICENSE="nomachine"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="=net-misc/nxnode-3.0*
-	!net-misc/nxserver-freenx
-	!net-misc/nxserver-2xterminalserver"
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-apps/xauth"
-
-S="${WORKDIR}"/NX
-
-pkg_preinst()
-{
-	enewuser nx -1 -1 /usr/NX/home/nx
-}
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/nxserver-3.0.0-setup.patch
-}
-
-src_install()
-{
-	# we install nxserver into /usr/NX, to make sure it doesn't clash
-	# with libraries installed for FreeNX
-
-	into /usr/NX
-	for x in nxserver ; do
-		dobin bin/$x
-	done
-
-	dodir /usr/NX/etc
-	insinto /usr/NX/etc
-	doins etc/administrators.db.sample
-	doins etc/guests.db.sample
-	doins etc/passwords.db.sample
-	doins etc/profiles.db.sample
-	doins etc/users.db.sample
-	doins etc/server.lic.sample
-
-	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample
-
-	cp -R etc/keys ${D}/usr/NX/etc || die
-
-	cp -R home ${D}/usr/NX || die
-	cp -R lib ${D}/usr/NX || die
-	cp -R scripts ${D}/usr/NX || die
-	cp -R share ${D}/usr/NX || die
-	cp -R var ${D}/usr/NX || die
-
-	newinitd ${FILESDIR}/nxserver-2.1.0-init nxserver
-}
-
-pkg_postinst ()
-{
-	usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-	usermod -d /usr/NX/home/nx nx || die "Unable to set home directory of nx user!!"
-
-	# only run install when no configuration file is found
-	if [ -f /usr/NX/etc/server.cfg ]; then
-		einfo "Running NoMachine's update script"
-		${ROOT}/usr/NX/scripts/setup/nxserver --update
-	else
-		einfo "Running NoMachine's setup script"
-		${ROOT}/usr/NX/scripts/setup/nxserver --install
-	fi
-
-	elog "Remember to add nxserver to your default runlevel"
-}