Add patch for nxproxy to read from stdin, allows nxcl to use standard ssh instead of nxssh

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 195 insertions, 2 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index c0292231e4a5..5bd3b54e1696 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.31 2008/08/26 08:50:56 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.32 2008/09/15 14:58:29 voyageur Exp $
+
+*nx-3.2.0-r5 (15 Sep 2008)
+
+  15 Sep 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nx-3.2.0-nxproxy_read_from_stdin.patch, +nx-3.2.0-r5.ebuild:
+  Add patch for nxproxy to read from stdin, allows nxcl to use standard ssh
+  instead of nxssh
 
 *nx-3.2.0-r4 (26 Aug 2008)
 
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 49ebd2442df0..e5355c0689b3 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -3,6 +3,7 @@ AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 RMD160 2016856cb86605ca7ccb6b2c17a1c096c8e8
 AUX nx-2.1.0-deprecated-headers.patch 3095 RMD160 1814ed18966606dcdb962c024cc9bc02ca3dd09a SHA1 fc41d3539af12dd3d5a1dafc63b0ca40893fbf1b SHA256 bf00914ec72786701ae5d8e56e18388cbe62eb7280ab11799f840680082cb973
 AUX nx-2.1.0-invalid-options.patch 978 RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 SHA1 453dbdaa4682d2051f67a17d586983b659ebb628 SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01
 AUX nx-3.1.0-gcc-4.3.patch 373 RMD160 3a8585a19fae38b7814e85c68a475df18765fbc6 SHA1 ba38ca0ee36b2c48ee09d855c4b32027e10c0fcc SHA256 696c7545ebbb14c0bc7c6d88d3ab8b9b7bf0758c4b636c8c3a85b408b5d0c05d
+AUX nx-3.2.0-nxproxy_read_from_stdin.patch 1382 RMD160 1d71a4b9b1e1499b032bf8e32523881554eb278e SHA1 5e5417d4a2fd5f0e3d5c447876f3c8e912c78a34 SHA256 7674e887e1be1134110e2219a96b413efa2b32d9be50de77d15b9dcbad8a4d76
 DIST nx-X11-3.1.0-4.tar.gz 20193596 RMD160 c242d8455f89920379b3c63c588ddc7480794780 SHA1 83bdcae4a97ab3f33646f3f3155c2ff7e04c4ee4 SHA256 111b58893bfcdf309b585a46758347c141ba12751f47cdc19d4cdc9bdd0d7f48
 DIST nx-X11-3.2.0-1.tar.gz 20212752 RMD160 749fbc97a75c789888d1fab5e0489b644e801613 SHA1 5e20ffe5c270160ec2415389087dacce644d45b9 SHA256 8621dce228b6f892e4ba74154c46c10f86b77dee14776721bbbf2b4f66252b10
 DIST nx-X11-3.2.0-2.tar.gz 20215674 RMD160 33bb389ffc3a7ec5a8e7ccc6e8451c0860924dcc SHA1 aa49a8fc86491cd8c9d8cb363bd7944463740738 SHA256 d0058597b9d9693dc20498ed4c61d7887c21c29a978d9c8bc59a5fc120ab9af0
@@ -27,6 +28,7 @@ EBUILD nx-3.1.0-r1.ebuild 3298 RMD160 4d1926629260425299607e63f08e648d618b34e4 S
 EBUILD nx-3.2.0-r2.ebuild 3195 RMD160 b06a17f08d6407a0d66e4f083a67430a829e600f SHA1 abf34e4d9b3e3236d16f33540fb2ee5270b6bf7e SHA256 7bbd4dbd85665b84c72c296f2fd8ea350ce506f245c47b7a7bd85ef04bd6854b
 EBUILD nx-3.2.0-r3.ebuild 3199 RMD160 6f2eb27bbc74d4a0c3bb2d74d6c5b01df3680c7d SHA1 1e0e05b4c760a9eb64eabb5637d909c93fa7f508 SHA256 f54406449524793155206fc538cd29bba17b3da840f74ed1355b111420e0fe04
 EBUILD nx-3.2.0-r4.ebuild 3200 RMD160 0ad4ca29b9f3367a3e5e705742aa1ff4a51a23ab SHA1 2164a0f09b8b3d8895b45d320ea92842397923e4 SHA256 4fe24c01502fdc70f93ef1a98846377bd2118bfbf991020137f98eb4614c3b15
+EBUILD nx-3.2.0-r5.ebuild 3283 RMD160 3273e849fead4db44a7404c348229e46cb81722b SHA1 114f04b216cebde43164bdd26f6de8ea408efdf5 SHA256 b8e33c2a3ffc3d843dee2a8782ead224dbfc1d51d89c941e19fb713239a44ccf
 EBUILD nx-3.2.0.ebuild 3296 RMD160 f9a50ce2a184f4146eb6ab22e30221d265ec385e SHA1 c80abf8a7bd6ad45232e06aff3556edce1be31c2 SHA256 e91d85b25852d99c463b2054a23147e4e429530692c659c856d08157dcdee0ad
-MISC ChangeLog 4352 RMD160 60a5951283e4b02fa8b6c5d7951c579acb0673da SHA1 1f1913335e758b530f111878762b9e8c74812c32 SHA256 aa387f7d4cb277a20c7a91990f9644c0e6241a0d444f6cb6ff1a1e6e93440934
+MISC ChangeLog 4601 RMD160 270c36273d3d66e3144907805dd061532e40f79c SHA1 30efd0223d30544340995b734d2e6e0a16d476cf SHA256 ebe2c87f5c774e570041f92f8d143bc243816071d651c8e3f28d281143f8160b
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
diff --git a/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch b/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch
new file mode 100644
index 000000000000..bce692d10a7a
--- /dev/null
+++ b/net-misc/nx/files/nx-3.2.0-nxproxy_read_from_stdin.patch
@@ -0,0 +1,68 @@
+--- Main.c.old	2007-07-18 17:39:13.000000000 +0200
++++ Main.c	2008-03-12 04:40:30.000000000 +0100
+@@ -36,28 +36,48 @@
+   int result = -1;
+ 
+   char *options = NULL;
+-
++  
++  char *nx_commfd_str = NULL;
++  
+   options = getenv("NX_DISPLAY");
+-
+-  if (NXTransParseCommandLine(argc, argv) < 0)
++  
++  if ((nx_commfd_str = getenv("NX_COMMFD")) != NULL)
+   {
+-    NXTransCleanup();
+-  }
++  	int nx_commfd = atoi(nx_commfd_str);
+ 
+-  if (NXTransParseEnvironment(options, 0) < 0)
+-  {
+-    NXTransCleanup();
++	if (result)
++		result = NXTransCreate(nx_commfd, NX_MODE_SERVER, options);
++ 
++	// go into endless loop
++
++	if (result)
++	{
++		while (NXTransRunning(NX_FD_ANY))
++			result = NXTransContinue(NULL);
++	}
+   }
++  else
++  {
++    if (NXTransParseCommandLine(argc, argv) < 0)
++    {
++      NXTransCleanup();
++    }
++
++    if (NXTransParseEnvironment(options, 0) < 0)
++    {
++      NXTransCleanup();
++    }
++
++   /*
++    * This should not return...
++    */
++
++    #ifdef TEST
++    fprintf(stderr, "Main: Yielding control to NX entry point.\n");
++    #endif
+ 
+-  /*
+-   * This should not return...
+-   */
+-
+-  #ifdef TEST
+-  fprintf(stderr, "Main: Yielding control to NX entry point.\n");
+-  #endif
+-
+-  result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
++    result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
++  }
+ 
+   /*
+    * ...So these should not be called.
diff --git a/net-misc/nx/nx-3.2.0-r5.ebuild b/net-misc/nx/nx-3.2.0-r5.ebuild
new file mode 100644
index 000000000000..205f9ac5c7ee
--- /dev/null
+++ b/net-misc/nx/nx-3.2.0-r5.ebuild
@@ -0,0 +1,116 @@
+# 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.2.0-r5.ebuild,v 1.1 2008/09/15 14:58:29 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-2.tar.gz"
+SRC_NXAGENT="nxagent-$PV-10.tar.gz"
+SRC_NXAUTH="nxauth-$PV-1.tar.gz"
+SRC_NXCOMP="nxcomp-$PV-7.tar.gz"
+SRC_NXCOMPEXT="nxcompext-$PV-1.tar.gz"
+SRC_NXCOMPSHAD="nxcompshad-$PV-3.tar.gz"
+SRC_NXPROXY="nxproxy-$PV-1.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}"/nxproxy
+	epatch "${FILESDIR}"/${P}-nxproxy_read_from_stdin.patch
+
+	cd "${WORKDIR}"/nxcomp
+	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*
+}