Prevent bash failures when sourcing external bash scripts, thanks Bernd Feige <Bernd.Feige@gmx.net> in bug #524350

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

3 files changed, 121 insertions, 1 deletions

diff --git a/net-misc/x2goserver/ChangeLog b/net-misc/x2goserver/ChangeLog
index f2ccd6858e8e..eaf39ddb9b80 100644
--- a/net-misc/x2goserver/ChangeLog
+++ b/net-misc/x2goserver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/x2goserver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.49 2014/10/07 07:17:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/ChangeLog,v 1.50 2014/10/23 08:35:58 voyageur Exp $
+
+*x2goserver-4.0.1.18-r1 (23 Oct 2014)
+
+  23 Oct 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  +x2goserver-4.0.1.18-r1.ebuild,
+  +files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch:
+  Prevent bash failures when sourcing external bash scripts, thanks Bernd Feige
+  <Bernd.Feige@gmx.net> in bug #524350
 
 *x2goserver-4.0.1.18 (07 Oct 2014)
 
diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch
new file mode 100644
index 000000000000..868c52a0564e
--- /dev/null
+++ b/net-misc/x2goserver/files/x2goserver-4.0.1.18-prevent_bash_failures_xsession.patch
@@ -0,0 +1,27 @@
+diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
+index b9ef15e..94692db 100755
+--- a/x2goserver-xsession/etc/Xsession
++++ b/x2goserver-xsession/etc/Xsession
+@@ -139,7 +139,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then
+ 
+ 	# Set up i18n environment
+ 	if [ -r /etc/profile.d/lang.sh ]; then
++		set +e
+ 		. /etc/profile.d/lang.sh
++		set -e
+ 	fi
+ 
+ 	# merge in defaults
+@@ -177,7 +179,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then
+ 
+ 	# run all system xinitrc shell scripts.
+ 	for file in /etc/x2go/xinitrc.d/* ; do
++		set +e
+ 		[ -r "$file" ] && . $file
++		set -e
+ 	done
+ 
+ 	# Prefix launch of session with ssh-agent if available and not already running.
+-- 
+1.7.9.5
+
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.18-r1.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.18-r1.ebuild
new file mode 100644
index 000000000000..6c22a6b4e75f
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.1.18-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goserver/x2goserver-4.0.1.18-r1.ebuild,v 1.1 2014/10/23 08:35:58 voyageur Exp $
+
+EAPI=4
+inherit eutils multilib systemd toolchain-funcs user
+
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-perl/Capture-Tiny
+	dev-perl/Config-Simple
+	dev-perl/File-BaseDir
+	dev-perl/File-ReadBackwards
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc
+	>=net-misc/nx-3.5.0.25
+	net-misc/openssh
+	x11-apps/xauth
+	x11-apps/xhost
+	x11-apps/xwininfo
+	fuse? ( sys-fs/sshfs-fuse )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+pkg_setup() {
+	# Force the group creation, #479650
+	enewgroup x2gouser
+	enewgroup x2goprint
+	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
+	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
+}
+
+src_prepare() {
+	# Bug #524350
+	epatch "${FILESDIR}"/${P}-prevent_bash_failures_xsession.patch
+
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	# Skip man2html build
+	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
+	# Use nxagent directly
+	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	fowners root:x2goprint /usr/bin/x2goprint
+	fperms 2755 /usr/bin/x2goprint
+	fperms 0750 /etc/sudoers.d
+	fperms 0440 /etc/sudoers.d/x2goserver
+	dosym /usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
+}
+
+pkg_postinst() {
+	if use sqlite ; then
+		elog "To use sqlite and create the initial database, run:"
+		elog " # x2godbadmin --createdb"
+	fi
+	if use postgres ; then
+		elog "To use a PostgreSQL databse, more information is availabe here:"
+		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
+	fi
+
+	elog "For password authentication, you need to enable PasswordAuthentication"
+	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
+	elog "An init script was installed for x2gocleansessions"
+}