Backport an upstream patch to fix runtime error on FreeBSD, bug #236779 and rekeyword it for x86-fbsd

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

4 files changed, 75 insertions, 6 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index a50440cbba46..cb9ad15a76f2 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.230 2009/01/15 22:37:33 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.231 2009/02/05 19:03:24 aballier Exp $
+
+  05 Feb 2009; Alexis Ballier <aballier@gentoo.org>
+  +files/dbus-1.2.3-bsd.patch, dbus-1.2.3-r1.ebuild:
+  Backport an upstream patch to fix runtime error on FreeBSD, bug #236779
+  and rekeyword it for x86-fbsd
 
   15 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> metadata.xml:
   Compnerd retired.
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index f2dc95b6d329..1e46bd47f551 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db9c7e372603ce916e17a41edd01d36 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d
 AUX dbus-1.0.1-fixfilecreation.patch 474 RMD160 63e1a6737519773dc85b64098577a97bae7ef6cc SHA1 a4748d3db24f425bd8ed2409bf225d01ced11640 SHA256 183ec284a385b3ef724abbcebd10e42765d81212d23e269c473fb3772f9ab2a3
 AUX dbus-1.1.20-fix-build.patch 392 RMD160 4a5f6d9ce7a4f8a8c3103c38dccfbf27a8383f2c SHA1 fdb4e94f7e0d58adea87412735ad1e955c780888 SHA256 78e3b41665daa172ff0f946db8d2c55d3c8dcad762733a2fba4ed6d7fcd29768
 AUX dbus-1.1.4-xdisplay_null.patch 421 RMD160 4be7aee34fc20c6d871e803b57e21e281af5bee5 SHA1 39464d340e56cafeeab96aa14881ce44a05c8e98 SHA256 176c826865d6479b37fc45879075ac2c7e810750fd78c7f1dffbd9e0082903e3
+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.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
 DIST dbus-1.0.2.tar.gz 1400278 RMD160 d5eddfb058c4c026d4a9f091ad90abcc6e54861a SHA1 2870efd6ea0b5b0d14e52195f560238a74bb1e0e SHA256 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
@@ -13,7 +17,14 @@ EBUILD dbus-1.0.2-r2.ebuild 3315 RMD160 897430a26b2941864b9c147e7985ae0409ba7a9f
 EBUILD dbus-1.1.20.ebuild 3554 RMD160 6bcace0ca9b1bf5d4e1ff29d052757bc16205d1a SHA1 d25cd168bf6900e613a6c689708ae5d00fb23f78 SHA256 2ac1868bc5351b93c4159380b11ace2c34d6dac1ec23238839c337d6fddfcc97
 EBUILD dbus-1.1.4.ebuild 3524 RMD160 c1fd3577e80662406576e15e2e855844ed31ac9d SHA1 1f5f6a102163366660a0de6b5c34dda72470c8fc SHA256 f33d61b23351f541248d96a226d129ab32a30c563906e16c831495d070c10ba1
 EBUILD dbus-1.2.1.ebuild 3435 RMD160 8e1e26000f4756ceeca42c6122404072cfa1dffb SHA1 1c69fb0086b47831a9a76574781f1b3345570283 SHA256 b3c727a597ee5aa3d34b0317bfe07f197e884b0e21295d31c0627f6a349d5232
-EBUILD dbus-1.2.3-r1.ebuild 3610 RMD160 082840c643a585b3a3c3da54cd6a5cc6f4bba464 SHA1 d6d143af90f01e4c0ee20d0ca325bdf81ccc6356 SHA256 0abeee96f7c55fa3c5bc29d0a3d2fbcade3061aaa70f1dc5360ae988a4c2f9e1
+EBUILD dbus-1.2.3-r1.ebuild 3752 RMD160 dc66d0b29adcde506e40b3240f4e19144f3ed159 SHA1 fc9c2db2f73605fbcc2807ee0bd886e86f8bb93d SHA256 09c62bdce60af40e79f88f6bc7110867f6f6d051b08aa5ed585a10570beeb2fc
 EBUILD dbus-1.2.3.ebuild 3433 RMD160 b1df4ee5dd0a0d158219d5b14e6149ea5e93660c SHA1 4436f736daf11501ffcf1d2a3ce77e890fe6f73c SHA256 77aa47cc1c15755f0f599da490157313aff699ea8e63e044c1dff6f048261395
-MISC ChangeLog 34319 RMD160 aeae78695afaa851b369d65621b596bbd98d39fe SHA1 605d0a9757b730c51ee2680401d081d2a0bd1b65 SHA256 d5a2ecc51251012a2700a92f6656a8393d5a9b2178b8796df571c1b7bea1f621
+MISC ChangeLog 34531 RMD160 97146f15309479322c02c7ba1fa61c3edf8c34a1 SHA1 f72cd281d558d27d7ea3ba802e4fda21b2c1ee2a SHA256 08e21c6bb3cfbee20582592cf454809ffb2239d903a2977c91d103ac3076c155
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmLN/0ACgkQvFcC4BYPU0rLOgCdFJEjU08X7nbBmB0rg+oYp0Mi
+NIAAniGBg5hOkFyIPbWlLNWnJSb5Ox4i
+=KXAY
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.2.3-r1.ebuild b/sys-apps/dbus/dbus-1.2.3-r1.ebuild
index a8849638c383..95a1c7163aba 100644
--- a/sys-apps/dbus/dbus-1.2.3-r1.ebuild
+++ b/sys-apps/dbus/dbus-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.2.3-r1.ebuild,v 1.9 2008/11/25 05:15:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.3-r1.ebuild,v 1.10 2009/02/05 19:03:24 aballier Exp $
 
 inherit 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 -x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="debug doc selinux X"
 
 RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
@@ -28,6 +28,9 @@ src_unpack() {
 	cd "${S}"
 	# Fix potential DoS issue. fdo bug #17803. Gentoo bug #240308
 	epatch "${FILESDIR}"/${PN}-1.2.3-panic-from-dbus_signature_validate.patch
+	# Fix runtime error on FreeBSD. Gentoo bug #236779, fdo bug #17061
+	# From upstream, drop at next bump
+	epatch "${FILESDIR}"/${P}-bsd.patch
 }
 
 src_compile() {
diff --git a/sys-apps/dbus/files/dbus-1.2.3-bsd.patch b/sys-apps/dbus/files/dbus-1.2.3-bsd.patch
new file mode 100644
index 000000000000..d85b93daa225
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-1.2.3-bsd.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/show_bug.cgi?id=236779
+
+
+commit 3564e5cbe4d9c0538d6eb519904ef0befab39d75
+Author: Joe Marcus Clarke <marcus@freedesktop.org>
+Date:   Thu Sep 4 22:13:30 2008 -0400
+
+    Bug 17061: Handle error return from sysconf correctly
+    
+    	* dbus/dbus-sysdeps-unix.c:
+    	* dbus/dbus-sysdeps-util-unix.c: Cast return
+    	from sysconf temporarily so we actually see
+    	-1.
+    
+    Signed-off-by: Colin Walters <walters@verbum.org>
+
+diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
+index 3f963bc..24a3774 100644
+--- a/dbus/dbus-sysdeps-unix.c
++++ b/dbus/dbus-sysdeps-unix.c
+@@ -1493,7 +1493,11 @@ fill_user_info (DBusUserInfo       *info,
+     /* retrieve maximum needed size for buf */
+     buflen = sysconf (_SC_GETPW_R_SIZE_MAX);
+ 
+-    if (buflen <= 0)
++    /* sysconf actually returns a long, but everything else expects size_t,
++     * so just recast here.
++     * https://bugs.freedesktop.org/show_bug.cgi?id=17061
++     */
++    if ((long) buflen <= 0)
+       buflen = 1024;
+ 
+     result = -1;
+diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
+index 55eb934..0343a90 100644
+--- a/dbus/dbus-sysdeps-util-unix.c
++++ b/dbus/dbus-sysdeps-util-unix.c
+@@ -836,7 +836,11 @@ fill_group_info (DBusGroupInfo    *info,
+     /* retrieve maximum needed size for buf */
+     buflen = sysconf (_SC_GETGR_R_SIZE_MAX);
+ 
+-    if (buflen <= 0)
++    /* sysconf actually returns a long, but everything else expects size_t,
++     * so just recast here.
++     * https://bugs.freedesktop.org/show_bug.cgi?id=17061
++     */
++    if ((long) buflen <= 0)
+       buflen = 1024;
+ 
+     result = -1;