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

Package-Manager: portage-2.2.0_alpha17/cvs/Linux x86_64

4 files changed, 74 insertions, 6 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/Manifest b/dev-libs/dbus-glib/Manifest
index 57987baa246f..fadd026874f6 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX dbus-glib-0.92-userpriv-fix.patch 1938 RMD160 ac5c70dbf5eddf0258ce3876bdabfb229267c7f8 SHA1 2d60ee81257b4c47b98eb21ab5b008f39a7624fd SHA256 d542a633fb81584bea4e015f7f528eb4f58fd904bbbfd2905b41cf02b70b5b2b
 DIST dbus-glib-0.88.tar.gz 688611 RMD160 43a25a7e449beda46498f02178d186a011783be3 SHA1 5e1d4a38acb38441a4708127522aa5223bf17842 SHA256 57939e2b567940beb23a52b5f3075743bd25ab203428e1c86f8c773330565737
 DIST dbus-glib-0.92.tar.gz 687138 RMD160 63ad9e0a673f4df7d1b24f752502b697b9f54ab3 SHA1 69aa860251a2c916907ac7b34d5a40196cf073ff SHA256 5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e
 EBUILD dbus-glib-0.88.ebuild 2324 RMD160 9afb88eef518956d6389985cb928aefbeae6079d SHA1 105da1d55ab4121aba1dd58cba5bcfa4f9d2044c SHA256 1bac37ba7a7059e32e905124c5ff62d0868f61a9ff069983b6d1242bf0aeb013
-EBUILD dbus-glib-0.92.ebuild 2232 RMD160 8ad53e3ba4268a54d4bcbe33da1d45bf2a843c2a SHA1 37c03c9bd409b5a8b89603de9eefb5abf244fffd SHA256 3df7983a4e72f0a0190403067a5f70210e7bb99357cd228b972139cd5d436429
-MISC ChangeLog 10358 RMD160 a124afb693e4d14f5c5a6faed2c6a24b6bbc3e7a SHA1 4f683b9536b8ccce6e947a59d80092bc945c778b SHA256 977098e1386b13cfa014bf5c88935615519944ac23d69575e9074eb5520def76
+EBUILD dbus-glib-0.92.ebuild 2368 RMD160 bc67ff349f8bdc2ea41af604110d16b878b80214 SHA1 c78eeaedb1dceb38c47c8121ff1a51f33aca28b5 SHA256 a9c295183e11ae742d7f1ba86809e2fab59e6cdf79dafd8238d8da92c393427b
+MISC ChangeLog 10543 RMD160 065cd2d8e800ec6fd359d1acf827236013db07c7 SHA1 29d5ec8de9718905096d3097b0e22130e1765c5a SHA256 5e018f56d467e78d1a031492c913ce2b196e469cbca67a43a5b11c9397e73864
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk03R7QACgkQ1fmVwcYIWAZICgCglLFdZZXVcYYYNzLyPG4GIhCF
+rPkAn1+tmWUq7/gtau2VaThpnbD2pBiP
+=nztk
+-----END PGP SIGNATURE-----
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