Security update, bug #210317
authorBernard Cafarelli <voyageur@gentoo.org>
Sun, 17 Feb 2008 23:11:20 +0000 (23:11 +0000)
committerBernard Cafarelli <voyageur@gentoo.org>
Sun, 17 Feb 2008 23:11:20 +0000 (23:11 +0000)
Package-Manager: portage-2.1.4.4

net-misc/nx/ChangeLog
net-misc/nx/nx-3.1.0-r1.ebuild [new file with mode: 0644]
net-misc/nxnode/ChangeLog
net-misc/nxnode/nxnode-3.1.0-r2.ebuild [new file with mode: 0644]

index a2c4f67a93b0f254e939570dda6dbc9c07a96875..75a57d6c4cf0f49795ddfb5c4772074e2c219a53 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.14 2008/01/14 19:40:18 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.15 2008/02/17 23:11:20 voyageur Exp $
+
+*nx-3.1.0-r1 (17 Feb 2008)
+
+  17 Feb 2008; Bernard Cafarelli <voyageur@gentoo.org> +nx-3.1.0-r1.ebuild:
+  Security bump, bug #210317
 
   14 Jan 2008; Bernard Cafarelli <voyageur@gentoo.org> nx-3.0.0.ebuild,
   nx-3.0.0-r1.ebuild, nx-3.1.0.ebuild:
diff --git a/net-misc/nx/nx-3.1.0-r1.ebuild b/net-misc/nx/nx-3.1.0-r1.ebuild
new file mode 100644 (file)
index 0000000..37b7164
--- /dev/null
@@ -0,0 +1,114 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.1.0-r1.ebuild,v 1.1 2008/02/17 23:11:20 voyageur 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-4.tar.gz"
+SRC_NXAGENT="nxagent-$PV-7.tar.gz"
+SRC_NXAUTH="nxauth-$PV-1.tar.gz"
+SRC_NXCOMP="nxcomp-$PV-6.tar.gz"
+SRC_NXCOMPEXT="nxcompext-$PV-2.tar.gz"
+SRC_NXCOMPSHAD="nxcompshad-$PV-2.tar.gz"
+SRC_NXPROXY="nxproxy-$PV-2.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_NXCOMPSHAD $URI_BASE/$SRC_NXCOMP"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rdesktop vnc"
+
+RDEPEND="x11-libs/libXau
+       x11-libs/libXcomposite
+       x11-libs/libXdamage
+       x11-libs/libXdmcp
+       x11-libs/libXpm
+       x11-libs/libXrandr
+       x11-libs/libXtst
+       >=media-libs/jpeg-6b-r4
+       >=media-libs/libpng-1.2.8
+       >=sys-libs/zlib-1.2.3
+       rdesktop? ( net-misc/rdesktop )
+       vnc? ( || ( net-misc/vnc net-misc/tightvnc ) )"
+
+DEPEND="${RDEPEND}
+               x11-misc/gccmakedep
+               x11-misc/imake
+               x11-proto/inputproto"
+
+S=${WORKDIR}/${PN}-X11
+
+pkg_setup() {
+       if use vnc; then
+               if has_version net-misc/vnc && ! built_with_use net-misc/vnc server;
+               then
+                       die "net-misc/vnc needs to be built with USE=\"server\" for VNC support"
+               fi
+
+               if has_version net-misc/tightvnc && ! built_with_use net-misc/tightvnc server;
+               then
+                       die "net-misc/tightvnc needs to be built with USE=\"server\" for VNC support"
+               fi
+       fi
+}
+
+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
+
+       cd "${WORKDIR}"/nxcomp
+       epatch "${FILESDIR}"/${PN}-2.1.0-deprecated-headers.patch
+       epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch
+       eautoreconf
+}
+
+src_compile() {
+       cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
+       econf || die "nxcomp econf failed"
+       emake || die "nxcomp emake failed"
+
+       cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
+
+       econf || die "nxcompshad econf failed"
+       emake || die "nxcompshad emake failed"
+
+       cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
+       econf || die "nxproxy econf failed"
+       emake || die "nxproxy emake failed"
+
+       cd "${S}" || die "No nx-X11 directory found"
+       emake World || die "nx-X11 emake failed"
+
+       cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found"
+       econf || die "nxcompext econf failed"
+       emake || die "nxcompext emake failed"
+}
+
+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 " $x wrapper creation failed"
+       done
+
+       into ${NX_ROOT}
+       dobin "${S}"/programs/Xserver/nxagent
+       dobin "${S}"/programs/nxauth/nxauth
+       dobin "${WORKDIR}"/nxproxy/nxproxy
+
+       dolib.so "${S}"/lib/X11/libX11.so*
+       dolib.so "${S}"/lib/Xext/libXext.so*
+       dolib.so "${S}"/lib/Xrender/libXrender.so*
+       dolib.so "${WORKDIR}"/nxcomp/libXcomp.so*
+       dolib.so "${WORKDIR}"/nxcompext/libXcompext.so*
+       dolib.so "${WORKDIR}"/nxcompshad/libXcompshad.so*
+}
index b4b92fa3fc3db10579dce8576efb9eeff970d695..38ae23da84a0738c12a7731a38aa0ed657c6521f 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/nxnode
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.20 2008/01/24 14:30:10 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.21 2008/02/17 23:10:34 voyageur Exp $
+
+*nxnode-3.1.0-r2 (17 Feb 2008)
+
+  17 Feb 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +nxnode-3.1.0-r2.ebuild:
+  Security update, bug #210317
+  Shorten DESCRIPTION
 
 *nxnode-3.1.0-r1 (24 Jan 2008)
 
diff --git a/net-misc/nxnode/nxnode-3.1.0-r2.ebuild b/net-misc/nxnode/nxnode-3.1.0-r2.ebuild
new file mode 100644 (file)
index 0000000..16749d6
--- /dev/null
@@ -0,0 +1,111 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.1.0-r2.ebuild,v 1.1 2008/02/17 23:10:34 voyageur Exp $
+
+inherit eutils
+
+MY_PV="${PV}-6"
+DESCRIPTION="shared components between the different editions of NoMachine's NX
+Servers"
+HOMEPAGE="http://www.nomachine.com/"
+SRC_URI="amd64? ( http://64.34.161.181/download/${PV}/Linux/nxnode-${MY_PV}.x86_64.tar.gz )
+       x86? ( http://64.34.161.181/download/${PV}/Linux/nxnode-${MY_PV}.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rdesktop vnc"
+RESTRICT="strip"
+
+DEPEND="!net-misc/nxserver-freenx
+       !<net-misc/nxserver-freeedition-3.0.0"
+
+RDEPEND="=net-misc/nxclient-3.1*
+       x11-libs/libICE
+       x11-libs/libXmu
+       x11-libs/libSM
+       x11-libs/libXt
+       x11-libs/libXaw
+       x11-libs/libXpm
+       x11-apps/xrdb
+       rdesktop? ( net-misc/rdesktop )
+       vnc? ( || ( net-misc/vnc net-misc/tightvnc ) )"
+
+S=${WORKDIR}/NX
+
+pkg_setup() {
+       if use vnc; then
+               if has_version net-misc/vnc && ! built_with_use net-misc/vnc server;
+               then
+                       die "net-misc/vnc needs to be built with USE=\"server\" for VNC support"
+               fi
+
+               if has_version net-misc/tightvnc && ! built_with_use net-misc/tightvnc server;
+               then
+                       die "net-misc/tightvnc needs to be built with USE=\"server\" for VNC support"
+               fi
+       fi
+}
+
+src_unpack()
+{
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/nxnode-3.0.0-setup.patch
+}
+
+src_install()
+{
+       # we install nxnode into /usr/NX, to make sure it doesn't clash
+       # with libraries installed for FreeNX
+
+       into /usr/NX
+       for x in nxagent nxnode nxsensor nxspool nxuexec ; do
+               dobin bin/$x
+       done
+
+       dodir /usr/NX/etc
+       cp etc/node-debian.cfg.sample "${D}"/usr/NX/etc/node-gentoo.cfg.sample || die
+       sed -e 's|COMMAND_FUSER = .*|COMMAND_FUSER = "/usr/bin/fuser"|;' -i "${D}"/usr/NX/etc/node-gentoo.cfg.sample || die
+       cp etc/node.lic.sample "${D}"/usr/NX/etc/node.lic.sample || die
+
+       dodir /usr/NX/lib
+       cp -R lib "${D}"/usr/NX || die
+
+       dodir /usr/NX/scripts
+       cp -R scripts "${D}"/usr/NX || die
+
+       dodir /usr/NX/share
+       cp -R share "${D}"/usr/NX || die
+
+       dodir /usr/NX/var
+       cp -R var "${D}"/usr/NX || die
+
+       dodir /etc/init.d
+       newinitd "${FILESDIR}"/nxnode-3.0.0-init nxsensor
+}
+
+pkg_postinst()
+{
+       # Only install license file if none is found
+       if [ ! -f /usr/NX/etc/node.lic ]; then
+               cp "${ROOT}"/usr/NX/etc/node.lic.sample "${ROOT}"/usr/NX/etc/node.lic || die
+               chmod 0400 "${ROOT}"/usr/NX/etc/node.lic
+               chown nx:root "${ROOT}"/usr/NX/etc/node.lic
+       fi
+
+       # only run install on the first time
+       if [ -f /usr/NX/etc/node.cfg ]; then
+               einfo "Running NoMachine's update script"
+               "${ROOT}"/usr/NX/scripts/setup/nxnode --update
+       else
+               einfo "Running NoMachine's setup script"
+               "${ROOT}"/usr/NX/scripts/setup/nxnode --install
+       fi
+
+       elog "If you want server statistics, please add nxsensor to your default runlevel"
+       elog
+       elog "  rc-update add nxsensor default"
+       elog
+       elog "You will also need to change EnableSensor to 1 in /usr/NX/etc/node.cfg"
+}