Fix jobserver unavailable QA notice, patch by Myckel Habets <myckel@sdf.lonestar.org> in bug #314873

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 25 insertions, 133 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index 68cae9552037..681120204345 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/nxserver-freenx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.71 2010/04/26 10:58:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.72 2010/05/09 19:24:17 voyageur Exp $
+
+  09 May 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxserver-freenx-0.7.3_p104-r3.ebuild,
+  nxserver-freenx-0.7.3_p104-r4.ebuild,
+  +files/nxserver-freenx-0.7.3_p104-jobserver_fix.patch:
+  Fix jobserver unavailable QA notice, patch by Myckel Habets
+  <myckel@sdf.lonestar.org> in bug #314873
 
   26 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
   nxserver-freenx-0.7.3_p104-r4.ebuild:
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 02ee34fd3642..b620280e64f5 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nxserver-freenx-0.7.2-cups.patch 1312 RMD160 c6f0a0675fe7902cc2e53123e708f17e36c44dcd SHA1 3bcd5c4a8bd5ed560f91a705c5f45d3f756c16e9 SHA256 50d0ae81b1bf86aecb0eec82920db481633ae0181dfe2894ac1b10faf5b8644d
 AUX nxserver-freenx-0.7.3_p102-cflags.patch 925 RMD160 d735fffcac7500ed1329e273a97d4b5da5a3d825 SHA1 a28ad4001ec8a28b33a4646e48a453bd2e89ba02 SHA256 ca99ad30acaf356ece570ebbc0ca4e52e40590533173bc028872dffc1055066b
 AUX nxserver-freenx-0.7.3_p102-nxloadconfig.patch 2007 RMD160 0bdbcb76de722284d1ba3f39786b31ae3e0cac0b SHA1 f5a8ad8912763a912270a9a83a52d74aefeb1842 SHA256 d241bde25650bd1613618c84aa05c6887f528e44a550fde165a16fb3b7c95396
+AUX nxserver-freenx-0.7.3_p104-jobserver_fix.patch 828 RMD160 9e81cc562f6df63d6659a13e8ecdfd7721603343 SHA1 29950069714449cd64b5f921b692d8a01fd992df SHA256 99e0840b1ce4f2c56cfdbf823166737b609e437fb8ca26212f521126d6326cdc
 AUX nxserver-freenx-0.7.3_p104-nxloadconfig.patch 2127 RMD160 42c749dc2b8c35f47693c1b0158fcb714b417e74 SHA1 1072496ae6bc91fae462225fbf583e11c688e8af SHA256 82bb31a23fff5b5a4333a0a8703d39c7375ffba7db0b261de2e44241e6de96bf
 AUX nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch 2709 RMD160 973befb2e3c3c92b844b585aca1624f4f506ce79 SHA1 534041c2a3f7a02552f75f021b0ba50cf94a5bbf SHA256 ccc3464e6ae44353f98dda81b2ab8cd6fec2d8994586f6991ec823f9ea5ed658
 AUX nxserver-freenx-0.7.3_p104-pam_ssh.patch 441 RMD160 f1adcb881d23cb7f950f67210f5842fc91a27b01 SHA1 bfac4b1cdf01ad3b3886dba631b733e8ec7ba2a8 SHA256 854d17b3656ac2382d84b32ed9de893b291217648f08f1f496e3d09a32b8d857
 AUX nxserver.init 568 RMD160 a48a0d4853fcd28c0ec6dd2e0366bc69ac1e4b28 SHA1 3980df2e35c594a806b18062e781fa5e52131ff9 SHA256 eda452183da56f6ef5730f1f9e7c968c462b2d3ad31c58ed6100d90c7533c4f2
 DIST freenx-server_0.7.3+teambzr104.orig.tar.gz 118242 RMD160 6dc846efa3953516110a212fe6030ba4936ad21d SHA1 47046b08b1f329a00feaccd3fff9129b1aee0b9e SHA256 0d8b8ea883d67551f40c6e1c3a4a280d5bd663f27147a054e879c58b31873c71
 EBUILD nxserver-freenx-0.7.3_p104-r2.ebuild 3716 RMD160 5ec2ed900033657f502552b35721a7f7ed5becbe SHA1 8c1c513a959e9a85d4c6c23e314c2f814405396d SHA256 8a9bbc1f8f74eb37b2d8ff2ba8635b008de7592063e77d2dfe27d8643ec0ec44
-EBUILD nxserver-freenx-0.7.3_p104-r3.ebuild 3682 RMD160 6a15b774d685d79bc848cffa25441fbe4169eef0 SHA1 1b7387d1441d1ba36de93ae7ce86df43ca2ee4a2 SHA256 3648bd1b60689c5cc69ffb931a0b472e0350e4f0e3d68568c86b3451df356d8d
-EBUILD nxserver-freenx-0.7.3_p104-r4.ebuild 3767 RMD160 71007c512a8866fda5065686dd510d7275438509 SHA1 517e8bbc97a91305ec960eb8950fd894fe06b7ae SHA256 5c8f7ec27aa1f9eb761ac79763aede27c0247b14a6bd69e41f4f09f0262f897e
-MISC ChangeLog 17023 RMD160 3495dd6d565d40a3f841ee299b30b7192d210e71 SHA1 70c37a263b039ac9608b5a4b8a13580d071166fd SHA256 ca44f5a31e3bf49b41ca94ec6f3b46113257bbbc7f10d0a72839c824de18d235
+EBUILD nxserver-freenx-0.7.3_p104-r4.ebuild 3817 RMD160 2cc1c3ab6d7a4f8319b98f153d9d528ce4be25c6 SHA1 4f4c1ef0aaacbe6d9d9fd6ded11491d8cf314029 SHA256 4ef6ff146c2b44cd77844ebdc3e963642b7dd66507d2e765207542c449725999
+MISC ChangeLog 17325 RMD160 705ff5afb0d7f89ce8586f0b099c55bcf94e7d7d SHA1 032d5d24a9b652f43c20c9e284793afa1f263b87 SHA256 2e196f8633155d2f1bc0e29489e133ae8804c7276a781fd53677a19e6d83526d
 MISC metadata.xml 525 RMD160 6b438e37f35775bbce33bbb1a04494049956aa04 SHA1 cf904293a398fd2acb8492d4c0a6c43045d71ea5 SHA256 50af7f059bc7dbf3a4040618c7c9bfa9a6f57ce7eeb2d135ed912a60bcc373bc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvVcc8ACgkQNQqtfCuFneN13wCfXoxanoIAvNJQReYyJNJurrxF
-CZ4AoJI3aV7Yv3m/rNjtxkBKT2OzIdGU
-=KfH0
------END PGP SIGNATURE-----
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-jobserver_fix.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-jobserver_fix.patch
new file mode 100644
index 000000000000..385f96a83ee9
--- /dev/null
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-jobserver_fix.patch
@@ -0,0 +1,12 @@
+diff -ru freenx-server_orig/Makefile freenx-server/Makefile
+--- freenx-server_orig/Makefile	2009-03-29 14:07:27.000000000 +0200
++++ freenx-server/Makefile	2010-05-09 09:18:36.000000000 +0200
+@@ -6,7 +6,7 @@
+ PROGRAMS=nxacl.sample nxcheckload.sample nxcups-gethost nxdesktop_helper nxdialog nxkeygen nxloadconfig nxnode nxnode-login nxprint nxserver nxserver-helper/nxserver-helper nxsetup nxviewer_helper nxviewer-passwd/nxpasswd/nxpasswd nx-session-launcher/nx-session-launcher nx-session-launcher/nx-session-launcher-suid nxserver-usermode nxserver-suid/nxserver-suid
+ 
+ all:
+-	cd nxviewer-passwd && xmkmf && make Makefiles && make depend
++	cd nxviewer-passwd && xmkmf && $(MAKE) Makefiles && $(MAKE) depend
+ 	source nxloadconfig &&\
+ 	export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\
+ 	for i in $(SUBDIRS) ; \
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild
deleted file mode 100644
index 637225eb3116..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r3.ebuild,v 1.2 2010/04/11 18:51:54 voyageur Exp $
-
-EAPI=2
-
-inherit multilib eutils toolchain-funcs versionator
-
-MAJOR_PV="$(get_version_component_range 1-3)"
-PATCH_VER="$(get_version_component_range 4)"
-MY_PN="freenx-server"
-
-DESCRIPTION="Free Software Implementation of the NX Server"
-HOMEPAGE="http://freenx.berlios.de/ https://launchpad.net/~freenx-team"
-SRC_URI="http://ppa.launchpad.net/freenx-team/ppa/ubuntu/pool/main/f/${MY_PN}/freenx-server_${MAJOR_PV}+teambzr${PATCH_VER/p}.orig.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+nxclient rdesktop vnc"
-
-DEPEND="x11-misc/gccmakedep
-	x11-misc/imake"
-RDEPEND="dev-tcltk/expect
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	net-analyzer/gnu-netcat
-	<net-misc/nx-3.4.0
-	sys-apps/gawk
-	virtual/ssh
-	x11-apps/xauth
-	x11-apps/xrdb
-	x11-apps/sessreg
-	nxclient? ( net-misc/nxclient )
-	!nxclient? ( !net-misc/nxclient
-				 || ( x11-misc/xdialog
-					  x11-apps/xmessage ) )
-	rdesktop? ( net-misc/rdesktop )
-	vnc? ( x11-misc/x11vnc
-		   || ( net-misc/tightvnc net-misc/vnc ) )"
-
-S=${WORKDIR}/${MY_PN}
-
-export NX_HOME_DIR=/var/lib/nxserver/home
-
-pkg_setup () {
-	enewuser nx -1 -1 ${NX_HOME_DIR}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pam_ssh.patch
-	epatch "${FILESDIR}"/${P}-nxnode_setup_samba.patch
-	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3_p102-cflags.patch
-	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
-
-	sed	-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \
-		-e "s#REAL_PATH_LIB#/usr/$(get_libdir)/NX/bin#" \
-		-i nxloadconfig || die "nxloadconfig sed failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" || die "compilation failed"
-}
-
-src_install() {
-	export NX_ETC_DIR=/etc/nxserver
-	export NX_SESS_DIR=/var/lib/nxserver/db
-
-	emake DESTDIR="${D}" install || die "install failed"
-
-	# This should be renamed to remove the blocker on net-misc/nxclient
-	use nxclient && rm "${D}"/usr/bin/nxprint
-
-	mv "${D}"/etc/nxserver/node.conf.sample "${D}"/etc/nxserver/node.conf ||
-		die "cannot find default configuration file"
-
-	dodir ${NX_ETC_DIR}
-	for x in passwords passwords.orig ; do
-		touch "${D}"${NX_ETC_DIR}/$x
-		chmod 600 "${D}"${NX_ETC_DIR}/$x
-	done
-
-	dodir ${NX_HOME_DIR}
-
-	for x in closed running failed ; do
-		keepdir ${NX_SESS_DIR}/$x
-		fperms 0700 ${NX_SESS_DIR}/$x
-	done
-
-	newinitd "${FILESDIR}"/nxserver.init nxserver
-}
-
-pkg_postinst () {
-	# Other NX servers ebuilds may have already created the nx account
-	# However they use different login shell/home directory paths
-	if [[ ${ROOT} == "/" ]]; then
-		usermod -s /usr/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-		usermod -d ${NX_HOME_DIR} nx || die "Unable to set home directory of nx user!!"
-		usermod -a -G utmp nx || die "Unable to add nx user to utmp group!!"
-	else
-		elog "If you had another NX server installed before, please make sure"
-		elog "the nx user account is correctly set to:"
-		elog " * login shell: /usr/bin/nxserver"
-		elog " * home directory: ${NX_HOME_DIR}"
-		elog " * supplementary groups: utmp"
-	fi
-
-	elog "To complete the installation, run:"
-	elog " nxsetup --install --setup-nomachine-key"
-	elog "This will use the default Nomachine SSH key"
-	elog "If you had older NX servers installed, you may need to add \"--clean --purge\" to the nxsetup command"
-
-	if ! built_with_use net-misc/openssh pam; then
-		elog ""
-		elog "net-misc/openssh was not built with PAM support"
-		elog "You will need to unlock the nx account by setting a password for it"
-	fi
-}
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild
index c537b8a55551..a032a743c50b 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild,v 1.2 2010/04/26 10:58:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r4.ebuild,v 1.3 2010/05/09 19:24:17 voyageur Exp $
 
 EAPI=2
 
@@ -52,6 +52,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
 	epatch "${FILESDIR}"/${PN}-0.7.3_p102-cflags.patch
 	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
+	epatch "${FILESDIR}"/${P}-jobserver_fix.patch
 
 	# Path to net-misc/nx files, support for nx 3.4.0
 	sed	-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \