Add patch from upstream to fix check for cloexec (bug #280299). No revbump, but it didn't use cloexec there before.

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

4 files changed, 36 insertions, 8 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 63be0430207c..5f72540eee15 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.238 2009/08/08 19:25:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.239 2009/08/08 20:45:16 flameeyes Exp $
+
+  08 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org> dbus-1.3.0.ebuild,
+  +files/dbus-1.3.0-no-cloexec.patch:
+  Add patch from upstream to fix check for cloexec (bug #280299). No
+  revbump, but it didn't use cloexec there before.
 
   08 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org> dbus-1.3.0.ebuild:
   Remove ~x86-fbsd keyword as per bug #280299 for now.
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index cfc78939f8ed..f5d702d72a4d 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,19 +5,20 @@ AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db
 AUX dbus-1.2.3-bsd.patch 1638 RMD160 9a134c5e1ccc1215d0579a02568a5707ad39e484 SHA1 061787f8131f33ccf07f11e04e6a327372de1c69 SHA256 0428d70451344153c6bf44f12d04fb7732070abf44d0d162ad995de5a9a24f1e
 AUX dbus-1.2.3-panic-from-dbus_signature_validate.patch 1064 RMD160 a7a587fb604f94f8d064c21d0adfae080edc1a80 SHA1 309faf628e3a207985c79afd2789b8cce696eed6 SHA256 455e2834b71878b3ea1ff9f0b678c8890b2c25f0c309c96c4a8e5551e23bca68
 AUX dbus-1.3.0-asneeded.patch 3655 RMD160 31d3eef602d1d95adfe548285e00c25699f5d027 SHA1 52a3b43fbc2596b2b05fabdd146e5afea9318c24 SHA256 02731d3576eea22a8596267dd7b96bc59980e5f74fdd87c96317843b5936b2af
+AUX dbus-1.3.0-no-cloexec.patch 578 RMD160 74403299da1ab2224738cd9770462cf5e1d037ee SHA1 5ff5856e4fc1a10bcdd841e2c0650e417badade6 SHA256 aba67f8431dd66619c0f6105b99fc887d0b0da90f86765ef56eb1919d822249e
 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
 DIST dbus-1.2.12.tar.gz 1574756 RMD160 779d76320f1343dae7447c82a683e372e6c11729 SHA1 13de8dc28c9edae7b9d2928ff691549bb2bef21a SHA256 b2ec81e7d9fa5e24f67baccfd9af2755a7797a65cb4c3cad10d023867f2bd220
 DIST dbus-1.2.3.tar.gz 1564475 RMD160 d1a207b2a4c744f27c9c01388e80cebdb61f43f0 SHA1 ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81 SHA256 16ffaa4a8758f115cf02c78962b0849ed4d802872420fd460c433a9cd580ed1a
 DIST dbus-1.3.0.tar.gz 1517408 RMD160 ed823727c11a437e9a0d548b9c3d92a8fd4d386b SHA1 ebd23c65ebf5448efc6367da1414de212db38055 SHA256 fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae
 EBUILD dbus-1.2.12.ebuild 3858 RMD160 e690a95d18c1b003f0555cd2ef59ae98aad7b16d SHA1 3aa70b1e08b7ac672fcf407755b4ab45e988f9d7 SHA256 507833339197a3b9fef81ef513be658f616a3d38e5a9b924cc24e332daa0121e
 EBUILD dbus-1.2.3-r1.ebuild 3752 RMD160 dc66d0b29adcde506e40b3240f4e19144f3ed159 SHA1 fc9c2db2f73605fbcc2807ee0bd886e86f8bb93d SHA256 09c62bdce60af40e79f88f6bc7110867f6f6d051b08aa5ed585a10570beeb2fc
-EBUILD dbus-1.3.0.ebuild 4014 RMD160 4982844c4ffb9b1a25885237db4a943ba4ff4e66 SHA1 76cff096a14266c1e87374d891cbce3ff7076f87 SHA256 f0d007c616649467f0a6132347ac0ec4b8984b717081f73f9b4097208789284c
-MISC ChangeLog 35801 RMD160 f9c27e1fa1f7e41572edef78c9a9c4883657971e SHA1 265e30990ef8cbc902ab326d407375406c0d6546 SHA256 ec3511f6b0a8cd60d3426b4b882dd0fec170b2773a7b28745e867c84f2a03894
+EBUILD dbus-1.3.0.ebuild 4068 RMD160 89a06c41e86334f57a2256a0667e7f24083c2561 SHA1 b0a9eb87b19d9998f1732880e8e2626ad0d57f5b SHA256 38a01cdf9aa19e527e9cfc0917f60b38d2a3b6615e16c25b5d15755cc4b99e94
+MISC ChangeLog 36035 RMD160 ca37f4ce7969ef2caaea0023dafae63110e54de2 SHA1 1b9726573d2c66d6fb60215394af95a3882efb95 SHA256 5b06acb7d3b63055c1d38ee874b2c6654553bd07db9253df6ae5bb99742f92ab
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkp90SwACgkQAiZjviIA2Xi3gwCfVZ+1+9spIELfajtY+Oatotjs
-uisAoKO24KLU1NVnYc+nxXQGP8DVoxww
-=lCL9
+iEYEARECAAYFAkp94+MACgkQAiZjviIA2XifQACfcv2bjs/yIJzsec0z7DwJfy2v
+bVsAn2INoP7LA+povD5EPWE9ViGJAXI5
+=LfIb
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.3.0.ebuild b/sys-apps/dbus/dbus-1.3.0.ebuild
index 3639502be17e..a42ea3ad8d44 100644
--- a/sys-apps/dbus/dbus-1.3.0.ebuild
+++ b/sys-apps/dbus/dbus-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.3.0.ebuild,v 1.4 2009/08/08 19:25:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.3.0.ebuild,v 1.5 2009/08/08 20:45:16 flameeyes Exp $
 
 inherit autotools eutils multilib flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc selinux test X"
 
 RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
@@ -31,6 +31,7 @@ src_unpack() {
 	sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
 		-e '/"dispatch"/d' -i "${S}/bus/test-main.c"
 	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-no-cloexec.patch
 	# required for asneeded patch but also for bug 263909, cross-compile so
 	# don't remove eautoreconf
 	eautoreconf
diff --git a/sys-apps/dbus/files/dbus-1.3.0-no-cloexec.patch b/sys-apps/dbus/files/dbus-1.3.0-no-cloexec.patch
new file mode 100644
index 000000000000..ba76eec00ec4
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-1.3.0-no-cloexec.patch
@@ -0,0 +1,21 @@
+commit a8cf509a06cdc42568e446dea8a54a398e1c003b
+Author: Benjamin Reed <rangerrick@befunk.com>
+Date:   Wed Jul 22 08:47:51 2009 -0400
+
+    Fix compilation on non-Linux: the F_DUPFD_CLOEXEC check was reversed
+    
+    Signed-off-by: Thiago Macieira <thiago@kde.org>
+
+diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
+index f0f1e70..e60e614 100644
+--- a/dbus/dbus-sysdeps-unix.c
++++ b/dbus/dbus-sysdeps-unix.c
+@@ -3043,7 +3043,7 @@ _dbus_dup(int        fd,
+     return -1;
+   }
+ 
+-#ifndef F_DUPFD_CLOEXEC
++#ifdef F_DUPFD_CLOEXEC
+   if (!cloexec_done)
+ #endif
+     {