Fix running tests with userpriv, using upstream patch, bug #254192.

(Portage version: 2.2.0_alpha17/cvs/Linux x86_64)

3 files changed, 61 insertions, 4 deletions

diff --git a/dev-libs/dbus-glib/ChangeLog b/dev-libs/dbus-glib/ChangeLog
index 6cfe25247069..fe107ffade45 100644
--- a/dev-libs/dbus-glib/ChangeLog
+++ b/dev-libs/dbus-glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/dbus-glib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.77 2011/01/11 11:37:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.78 2011/01/19 20:20:59 eva Exp $
+
+  19 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> dbus-glib-0.92.ebuild,
+  +files/dbus-glib-0.92-userpriv-fix.patch:
+  Fix running tests with userpriv, using upstream patch, bug #254192.
 
   11 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> dbus-glib-0.88.ebuild:
   ppc stable wrt #348766
diff --git a/dev-libs/dbus-glib/dbus-glib-0.92.ebuild b/dev-libs/dbus-glib/dbus-glib-0.92.ebuild
index d624ca53cc00..c0bc228bdf5c 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.92.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.92.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.92.ebuild,v 1.4 2010/12/29 21:11:30 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.92.ebuild,v 1.5 2011/01/19 20:20:59 eva Exp $
 
 EAPI=2
-inherit bash-completion
+
+inherit eutils bash-completion
 
 DESCRIPTION="D-Bus bindings for glib"
 HOMEPAGE="http://dbus.freedesktop.org/"
@@ -32,6 +33,11 @@ TBD=${WORKDIR}/${P}-tests-build
 
 BASHCOMPLETION_NAME="dbus"
 
+src_prepare() {
+	# Apply upstream patch to fix build with FEATURES="userpriv", bug #
+	epatch "${FILESDIR}/${P}-userpriv-fix.patch"
+}
+
 src_configure() {
 	local my_conf
 
diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.92-userpriv-fix.patch b/dev-libs/dbus-glib/files/dbus-glib-0.92-userpriv-fix.patch
new file mode 100644
index 000000000000..f240b8cf8987
--- /dev/null
+++ b/dev-libs/dbus-glib/files/dbus-glib-0.92-userpriv-fix.patch
@@ -0,0 +1,47 @@
+From 2d987890c3ba2fd8efc92f8b75da88904ce425f9 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: Tue, 04 Jan 2011 18:04:11 +0000
+Subject: Run run-with-tmp-session-bus.sh directly rather than via ${SHELL}
+
+It has a correct #!/bin/sh line and is executable, so just running it is
+fine. This avoids running it under a user's chosen interactive shell,
+which might be non-POSIX (zsh, csh). Gentoo Portage apparently sets
+SHELL to /bin/false, presumably to trap this sort of thing.
+
+(I've tested this on Debian unstable with /bin/sh -> /bin/dash, to check
+that weren't accidentally relying on $SHELL being bash or similar.)
+
+Based on a workaround from Myckel Habets on the Gentoo bug.
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27193
+Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=254192
+Reviewed-by: Colin Walters <walters@verbum.org>
+---
+diff --git a/test/core/run-test.sh b/test/core/run-test.sh
+index 0351472..216c2a3 100755
+--- a/test/core/run-test.sh
++++ b/test/core/run-test.sh
+@@ -18,7 +18,7 @@ export DBUS_TOP_SRCDIR
+ if test -z "$DBUS_TEST_GLIB_IN_RUN_TEST"; then
+   DBUS_TEST_GLIB_IN_RUN_TEST=1
+   export DBUS_TEST_GLIB_IN_RUN_TEST
+-  exec ${SHELL} $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
++  exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
+ fi  
+ 
+ if test x$MODE = xprofile ; then
+diff --git a/test/interfaces/run-test.sh b/test/interfaces/run-test.sh
+index 385efdc..5c57c80 100755
+--- a/test/interfaces/run-test.sh
++++ b/test/interfaces/run-test.sh
+@@ -12,7 +12,7 @@ export DBUS_TOP_SRCDIR
+ if test -z "$DBUS_TEST_GLIB_IN_RUN_TEST"; then
+   DBUS_TEST_GLIB_IN_RUN_TEST=1
+   export DBUS_TEST_GLIB_IN_RUN_TEST
+-  exec ${SHELL} $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
++  exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
+ fi  
+ 
+ echo "running test-client"
+--
+cgit v0.8.3-6-g21f6