diff options
5 files changed, 8 insertions, 243 deletions
diff --git a/net-misc/nxnode/Manifest b/net-misc/nxnode/Manifest index a3a75d84130d..07374c6d2c6a 100644 --- a/net-misc/nxnode/Manifest +++ b/net-misc/nxnode/Manifest @@ -1,10 +1,7 @@ AUX nxnode-3.0.0-init 1344 RMD160 fc4c8ed911bf79634537f0567f374688791f482d SHA1 78a9e356c053e1ece469332dd016a0efe425595f SHA256 d0da14f4dac0b3c325086a5b4b1929456681822011b0996d48cee5265e10cce5 AUX nxnode-3.0.0-setup.patch 1353 RMD160 85c7938126000b10fa6e05aa5501e2affc6d0ec6 SHA1 4d12a2857db5a6d073ceab88bb2e58d0ee93a322 SHA256 04dccdc5eb73df861995e866c0875496b3b893ab43caaa8bdd854a69a74ae17a -DIST nxnode-3.0.0-83.i386.tar.gz 6241477 RMD160 777edf612ff1f0eeae8517f67f536fd9d032eae0 SHA1 99ed305dadaf2a5309348c4062c6a3ce1baeb5a5 SHA256 d8b5be5f1c56b7348299d46f6088d90198d8322a75cd590046683bb14c258704 -DIST nxnode-3.0.0-83.x86_64.tar.gz 6918754 RMD160 9a013438bc0bb2b088b734c59805b574cdff178e SHA1 2bf8933fa524e704df845028c3e03da7323617c3 SHA256 5f584127969128501358dcc43cca4360841db47b5503447d6de9a30638176fa9 DIST nxnode-3.1.0-6.i386.tar.gz 6285030 RMD160 8cfa4fab1cd59afa9c95f7469a85799bef18cbf5 SHA1 57cc7926ffa55d83c90cd56b27c79701ea11d272 SHA256 34ff2f036cd056bc5a490728b91de895bde46a68ccf4a3973eb15c90f6517fed DIST nxnode-3.1.0-6.x86_64.tar.gz 6966684 RMD160 b2f2d75946e9f22f1a84be8df3daddd516a9777a SHA1 0812c6282c1f587534cc5341a1729624e3f925dd SHA256 6c7773360285c8d7adbcdec03da666c4747f0620a934c0328473528b7adb2391 -EBUILD nxnode-3.0.0-r3.ebuild 3013 RMD160 ca57fd0fd3dadfdcae993dd125524629cabcef4c SHA1 6253aab4837ed68b4a8778d1291117fe07bb1fad SHA256 9879c616277497497747fc852bf3438fb971a5bde00e3b7375550e0f53576a3d EBUILD nxnode-3.1.0-r2.ebuild 3027 RMD160 1b914748b57b82f784bdb3955ac390b7d4c5cf75 SHA1 baced3bd2d98a1a1d4102b9dcdf3105635746515 SHA256 d3ed6f5b2135d7fa4731528beffa5843c7ca41addfb16b6b14d769658a8248a4 -MISC ChangeLog 3786 RMD160 cdf7253a178dbbe9ab1b8afdcae76d77b8aac64e SHA1 bfbd2ab44700dab7a9a8bb197ebb1dd560fef983 SHA256 ad52017d942ce8665057026815dc3153c30dee59df08da947112e143e6c5360f +MISC ChangeLog 3924 RMD160 8963654b79f4324e08a161e90cd1f455ef0783c4 SHA1 1b258365f6d6a6747f4bfd16fd60970fd407889d SHA256 7b01c747818c0e40a5cefbbf04b27fdb38b94a4237b8f6e79970a9289c499af5 MISC metadata.xml 264 RMD160 3b4f53808aa9f3ce8bf86bdc8e08bda3fc181219 SHA1 89e785afdbf6b2c6968649c91dc17910066728eb SHA256 3eaf6b268d16ec374617534bf70f0e96d2c6399ca1b0d4ffa3eeee619d775171 diff --git a/net-misc/nxserver-freeedition/ChangeLog b/net-misc/nxserver-freeedition/ChangeLog index e0a312de5fe0..eb8492b5266a 100644 --- a/net-misc/nxserver-freeedition/ChangeLog +++ b/net-misc/nxserver-freeedition/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/nxserver-freeedition # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.23 2008/03/19 11:12:56 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.24 2008/04/03 08:14:19 voyageur Exp $ + + 03 Apr 2008; Bernard Cafarelli <voyageur@gentoo.org> + -files/nxserver-3.0.0-r3-setup.patch, + -nxserver-freeedition-3.0.0-r3.ebuild, + -nxserver-freeedition-3.0.0-r4.ebuild: + Removing 3.0 versions, they depend on vulnerable net-misc/nxnode versions 19 Mar 2008; Peter Volkov <pva@gentoo.org> nxserver-freeedition-3.1.0-r1.ebuild: diff --git a/net-misc/nxserver-freeedition/files/nxserver-3.0.0-r3-setup.patch b/net-misc/nxserver-freeedition/files/nxserver-3.0.0-r3-setup.patch deleted file mode 100644 index d7ec648fdf47..000000000000 --- a/net-misc/nxserver-freeedition/files/nxserver-3.0.0-r3-setup.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- scripts/setup/nxserver.orig 2007-09-11 10:44:42.000000000 +0200 -+++ scripts/setup/nxserver 2007-09-18 17:24:46.162846844 +0200 -@@ -579,6 +579,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" ]; -@@ -725,6 +729,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" - -@@ -839,6 +847,12 @@ - } - - 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"`; -@@ -2488,6 +2502,10 @@ - system=fedora - fi - -+if [ -d /usr/portage ]; then -+ system=gentoo -+fi -+ - if [ "x$system" = "x" -a -f /etc/release ]; - then - system=solaris -@@ -2522,6 +2540,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'" ;; -@@ -2668,14 +2687,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-3.0.0-r3.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild deleted file mode 100644 index 05d9a21d0852..000000000000 --- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild +++ /dev/null @@ -1,83 +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-r3.ebuild,v 1.6 2007/12/03 21:49:48 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}-69.x86_64.tar.gz ) - x86? ( http://64.34.161.181/download/3.0.0/Linux/FE/nxserver-${PV}-69.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-r3-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 - dobin bin/nxserver - - dodir /usr/NX/etc/keys - 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 home "${D}"/usr/NX || die "Unable to install home folder" - cp -R lib "${D}"/usr/NX || die "Unable to install lib folder" - cp -R scripts "${D}"/usr/NX || die "Unable to install scripts folder" - cp -R share "${D}"/usr/NX || die "Unable to install share folder" - cp -R var "${D}"/usr/NX || die "Unable to install var folder" - - 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 || die "Update script failed" - else - einfo "Running NoMachine's setup script" - "${ROOT}"/usr/NX/scripts/setup/nxserver --install || die "Installation script failed" - fi - - elog "Remember to add nxserver to your default runlevel" -} diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r4.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r4.ebuild deleted file mode 100644 index 42e715060d68..000000000000 --- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r4.ebuild +++ /dev/null @@ -1,84 +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-r4.ebuild,v 1.1 2007/12/03 21:49:48 voyageur Exp $ - -inherit eutils - -MY_PV="${PV}-79" -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-${MY_PV}.x86_64.tar.gz ) - x86? ( http://64.34.161.181/download/3.0.0/Linux/FE/nxserver-${MY_PV}.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-r4-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 - dobin bin/nxserver - - dodir /usr/NX/etc/keys - 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 home "${D}"/usr/NX || die "Unable to install home folder" - cp -R lib "${D}"/usr/NX || die "Unable to install lib folder" - cp -R scripts "${D}"/usr/NX || die "Unable to install scripts folder" - cp -R share "${D}"/usr/NX || die "Unable to install share folder" - cp -R var "${D}"/usr/NX || die "Unable to install var folder" - - 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 || die "Update script failed" - else - einfo "Running NoMachine's setup script" - "${ROOT}"/usr/NX/scripts/setup/nxserver --install || die "Installation script failed" - fi - - elog "Remember to add nxserver to your default runlevel" -} |