From: Doug Goldstein <cardoe@gentoo.org>
Date: Sun, 19 Nov 2006 17:32:51 +0000 (+0000)
Subject: pthreads assertion fix from upstream
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df48606a13abb43786e3c5841210b3e70cd71783;p=gentoo.git

pthreads assertion fix from upstream
Package-Manager: portage-2.1.2_rc2
---

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 9c1991a268fb..faaa3112fa29 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db9c7e372603ce916e17a41edd01d36 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 files/30-dbus 243
@@ -30,21 +33,20 @@ AUX dbus-0.61-qt-disabling.patch 501 RMD160 a7c1af95cc8dd455387eefad00fa90d86015
 MD5 1d1c73d8eea0a6f4ffe70c8091409ad0 files/dbus-0.61-qt-disabling.patch 501
 RMD160 a7c1af95cc8dd455387eefad00fa90d86015bbda files/dbus-0.61-qt-disabling.patch 501
 SHA256 acfd9f175223cb2679d37b941cae9d54adbd494be3c0f4f7be7e004c0bd02a20 files/dbus-0.61-qt-disabling.patch 501
-AUX dbus-0.95-pass-context.patch 359 RMD160 112d44b65ee7abe1a267957da72ed306ba8dbec6 SHA1 843c41e5c1a7adb2fd1aa5211d8cc0c0d2c7659a SHA256 3bb25a75a3dcba4f586087c09e3acbfc7b30e6f9a77573f5b0a1f0c4347ca4aa
-MD5 04a52ac49915ed26c6dadf615986c667 files/dbus-0.95-pass-context.patch 359
-RMD160 112d44b65ee7abe1a267957da72ed306ba8dbec6 files/dbus-0.95-pass-context.patch 359
-SHA256 3bb25a75a3dcba4f586087c09e3acbfc7b30e6f9a77573f5b0a1f0c4347ca4aa files/dbus-0.95-pass-context.patch 359
+AUX dbus-1.0.1-pthread-holder-fix.diff 1452 RMD160 857f36030a5c1c5a07574cd668b2768e9dc97a47 SHA1 0a360cf98af768c4266d62ef4aa238b0a0245094 SHA256 22b258be44f2e64c975824a777fd70469235f31700b3c71956451b94c24fa8a1
+MD5 fc972b7f0c89bbae82c534e898300c82 files/dbus-1.0.1-pthread-holder-fix.diff 1452
+RMD160 857f36030a5c1c5a07574cd668b2768e9dc97a47 files/dbus-1.0.1-pthread-holder-fix.diff 1452
+SHA256 22b258be44f2e64c975824a777fd70469235f31700b3c71956451b94c24fa8a1 files/dbus-1.0.1-pthread-holder-fix.diff 1452
 AUX dbus.init-0.61 1377 RMD160 a6287fbad2c0b4532c7527895684aef82df46566 SHA1 6b3aee70b21ecd3dcbfe7df15e579e82f3415953 SHA256 c1dd746e70ec6e1a0d04ae39308f6341833ae4db2a2d0fc65e156279ff5eb5d4
 MD5 791bda1b16e54eba80a07d873dc97763 files/dbus.init-0.61 1377
 RMD160 a6287fbad2c0b4532c7527895684aef82df46566 files/dbus.init-0.61 1377
 SHA256 c1dd746e70ec6e1a0d04ae39308f6341833ae4db2a2d0fc65e156279ff5eb5d4 files/dbus.init-0.61 1377
-AUX dbus.init-0.95 1142 RMD160 4877d12cc48a6d38db6ddde7229bc4b2fa66cdcb SHA1 fd34963459e199b05b9e17acef3225626e570e31 SHA256 c5aebfc327e25dd62ce26398c5c82d3108f71245eee77de57334d93901c4f562
-MD5 bd7a680ff387eeb49f43508390ed8cda files/dbus.init-0.95 1142
-RMD160 4877d12cc48a6d38db6ddde7229bc4b2fa66cdcb files/dbus.init-0.95 1142
-SHA256 c5aebfc327e25dd62ce26398c5c82d3108f71245eee77de57334d93901c4f562 files/dbus.init-0.95 1142
+AUX dbus.init-1.0 1141 RMD160 36d603e1d3d004ac64b04b3fde79d73a28216f07 SHA1 509618a610a2772ede854c61fa6fa8efe8e54d63 SHA256 d073c1f268a153f181ad80825aba65edb2a338d90f5aa1bd37d659e4250c0711
+MD5 511954893c57748b4e0e7ae0b690e44a files/dbus.init-1.0 1141
+RMD160 36d603e1d3d004ac64b04b3fde79d73a28216f07 files/dbus.init-1.0 1141
+SHA256 d073c1f268a153f181ad80825aba65edb2a338d90f5aa1bd37d659e4250c0711 files/dbus.init-1.0 1141
 DIST dbus-0.61.tar.gz 1735729 RMD160 67306e1a632c1986460e8ead311ae642447cdcc3 SHA1 fdddc695dad64974fb4138fcb04a77a66f1f47f8 SHA256 45a6b655c0fdfffdabc49857cb19d1ea0c9a8923f76e5c165e01e18ce98da0ec
 DIST dbus-0.62.tar.gz 1737361 RMD160 d653b25726ec96eb324761ebf9efb4a50d1590c0 SHA1 45acea9bd19902791c6dbd8620256caf9d74a667 SHA256 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707
-DIST dbus-0.95.tar.gz 1400507 RMD160 bbe7a1b573c40229c65c4e85174bfdd3dcabf64c SHA1 74e9ffdb857b01ebe6e7d2e69d4579091ece1805 SHA256 9bd989a5116320aa56531745904881f1a03a612d201f718374fbe223dfae7592
 DIST dbus-1.0.1.tar.gz 1406595 RMD160 2270f27d9314f0e7b99540f0aa1902b8d0d7343d SHA1 1c8a72bc71a10899cd0cef4400f291ceb16fd703 SHA256 6e0730a39485fb502d640841f0f328c1a0212743f17b3fa61c78e6e32925f061
 EBUILD dbus-0.61-r1.ebuild 4176 RMD160 6b872a427b30aa833a3b31094bb18ea784db4f70 SHA1 4e39c72b6bfb850f20181b7b4111159a5f002331 SHA256 765a76fddace527bb6daf6c44c932e64fa6e78deda6cdc3292b96ec5c4264c90
 MD5 cbb340c4f87dd24ff5eac66e37c9c3b1 dbus-0.61-r1.ebuild 4176
@@ -54,18 +56,18 @@ EBUILD dbus-0.62-r1.ebuild 4063 RMD160 885371247d8623dfb3327f9f2526260d697a4fdf
 MD5 76459f25705b9d028485e50c994990b2 dbus-0.62-r1.ebuild 4063
 RMD160 885371247d8623dfb3327f9f2526260d697a4fdf dbus-0.62-r1.ebuild 4063
 SHA256 1d52ed17aa9bfa2539cbeb965c9b133e61499ae8a7fbcd1fd59d59885bc3e41f dbus-0.62-r1.ebuild 4063
-EBUILD dbus-0.95.ebuild 3113 RMD160 c42b912f97a5c8f3d5c16d5fc7c932e73ff17d96 SHA1 2adb66435ae5651164a7a492d5542a3dca8b3a53 SHA256 ffcf771b680c1934c7b584511a91ed9b12a27eefcb8396e239fc86764b915dee
-MD5 2ed9c0d3efac41eec742e0a3969b73fb dbus-0.95.ebuild 3113
-RMD160 c42b912f97a5c8f3d5c16d5fc7c932e73ff17d96 dbus-0.95.ebuild 3113
-SHA256 ffcf771b680c1934c7b584511a91ed9b12a27eefcb8396e239fc86764b915dee dbus-0.95.ebuild 3113
-EBUILD dbus-1.0.1.ebuild 3102 RMD160 3bb7bd80ce4bb6dad17fc2e5afcdf4c79f384104 SHA1 d0594e29fca13207eebffd3b375e082d79bcde3e SHA256 259468a2d251da32cb459feb160499da6820ff2d2b81a7cac1dffb133c8a4a31
-MD5 2281739e7b14cc8585b76a8781555bcd dbus-1.0.1.ebuild 3102
-RMD160 3bb7bd80ce4bb6dad17fc2e5afcdf4c79f384104 dbus-1.0.1.ebuild 3102
-SHA256 259468a2d251da32cb459feb160499da6820ff2d2b81a7cac1dffb133c8a4a31 dbus-1.0.1.ebuild 3102
-MISC ChangeLog 22765 RMD160 37682d1c18bb61d6dda5d74a3100137eea9bc5ed SHA1 695020ba69593389afa174a8f14388ebd52af408 SHA256 33109d241e0fbd4803ecbc58f77a41444375cac0edc788f445f300bdfba903a4
-MD5 1a2b3930b4bc537df7ae30b96ca6b16d ChangeLog 22765
-RMD160 37682d1c18bb61d6dda5d74a3100137eea9bc5ed ChangeLog 22765
-SHA256 33109d241e0fbd4803ecbc58f77a41444375cac0edc788f445f300bdfba903a4 ChangeLog 22765
+EBUILD dbus-1.0.1-r1.ebuild 3247 RMD160 b6297079a3ac2dce6b72b364198c49a7420fdb40 SHA1 86c3e0baff5ff827812386b86a4c2bdce809c7db SHA256 b24159ab36c63695a31efa7f1bec038bfe6165e97544f452ea4870ff95a60b4c
+MD5 c15c430f57d16cf97ce528c2f39c30cf dbus-1.0.1-r1.ebuild 3247
+RMD160 b6297079a3ac2dce6b72b364198c49a7420fdb40 dbus-1.0.1-r1.ebuild 3247
+SHA256 b24159ab36c63695a31efa7f1bec038bfe6165e97544f452ea4870ff95a60b4c dbus-1.0.1-r1.ebuild 3247
+EBUILD dbus-1.0.1.ebuild 3102 RMD160 7f706fe4e5562632013d37451659571e961bd345 SHA1 e1a8875ba5d2daba1d238252928eaa79eca6f9db SHA256 3d2184db88b553da8133f35cff021e5be306308b7a03a0167bb9aa0c15393d96
+MD5 c2c615188b6f44d24e189801d52eabc7 dbus-1.0.1.ebuild 3102
+RMD160 7f706fe4e5562632013d37451659571e961bd345 dbus-1.0.1.ebuild 3102
+SHA256 3d2184db88b553da8133f35cff021e5be306308b7a03a0167bb9aa0c15393d96 dbus-1.0.1.ebuild 3102
+MISC ChangeLog 23078 RMD160 35b3f3ff9da97919a6dc6a31bfa46db2f38a0910 SHA1 8c2b538bb4e890fa0135457d889f28db47412c12 SHA256 723bec8bb4bf35ebe798b05a65962c96253d2a1576fdee63c8d285c3f13f70bd
+MD5 ecce6fa2d36bda7fb195274ff8dd39d8 ChangeLog 23078
+RMD160 35b3f3ff9da97919a6dc6a31bfa46db2f38a0910 ChangeLog 23078
+SHA256 723bec8bb4bf35ebe798b05a65962c96253d2a1576fdee63c8d285c3f13f70bd ChangeLog 23078
 MISC metadata.xml 222 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc SHA1 d2b55bed5d827913edafe6777b37d03c352d9adf SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf
 MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222
@@ -76,9 +78,16 @@ SHA256 8ee10bf68b294a8eef518926360a7b538fa9dda198e47b1d9f6367b6de0cdbcd files/di
 MD5 e00700223b4c2566d3c5b60371b524ff files/digest-dbus-0.62-r1 232
 RMD160 020d50c35dbd8578464f56119db955bfb811d61c files/digest-dbus-0.62-r1 232
 SHA256 b249fe2b3ac0467d861e39cc171543bac5f489ec77b22ccf68b9ef09a8c68bbe files/digest-dbus-0.62-r1 232
-MD5 f418913d22cc4c6633a44c4649f5d458 files/digest-dbus-0.95 232
-RMD160 7f7c4719b67b16cbb7d86603a0c261c852d16064 files/digest-dbus-0.95 232
-SHA256 a250cd964bf893bee5e7ef96605aa48578057245500e7c89165ca72ac4de3f1d files/digest-dbus-0.95 232
 MD5 bab4ebd671999e500c31bd05e32fc296 files/digest-dbus-1.0.1 235
 RMD160 3429f1e05c33fc85515246a181c9fa3680258fdc files/digest-dbus-1.0.1 235
 SHA256 4cbf0ae7597954ff8a66c880022b416c7bc114a5075a130cb9da8c6de139cf0b files/digest-dbus-1.0.1 235
+MD5 bab4ebd671999e500c31bd05e32fc296 files/digest-dbus-1.0.1-r1 235
+RMD160 3429f1e05c33fc85515246a181c9fa3680258fdc files/digest-dbus-1.0.1-r1 235
+SHA256 4cbf0ae7597954ff8a66c880022b416c7bc114a5075a130cb9da8c6de139cf0b files/digest-dbus-1.0.1-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFYJU7oeSe8B0zEfwRArblAJ4khpBN+GNwyHzADaSs5xiqyTu5KQCfSFGs
+NQhX1oeadNMl7n+0mqnSDDI=
+=TUcg
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.95.ebuild b/sys-apps/dbus/dbus-0.95.ebuild
deleted file mode 100644
index ff758ba2c940..000000000000
--- a/sys-apps/dbus/dbus-0.95.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.95.ebuild,v 1.3 2006/11/06 22:13:50 drizzt Exp $
-
-WANT_AUTOCONF=2.5
-inherit eutils multilib debug autotools
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="http://dbus.freedesktop.org/"
-SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc selinux X"
-
-RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
-	selinux? ( sys-libs/libselinux )
-	>=dev-libs/expat-1.95.8
-	!<sys-apps/dbus-0.91"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? (	app-doc/doxygen
-		app-text/xmlto )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	#Fix for FreeBSD
-	epatch "${FILESDIR}"/${P}-pass-context.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
-
-	econf \
-		$(use_with X x) \
-		$(use_enable kernel_linux dnotify) \
-		$(use_enable kernel_FreeBSD kqueue) \
-		$(use_enable selinux) \
-		$(use_enable debug verbose-mode) \
-		$(use_enable debug asserts) \
-		--with-xml=expat \
-		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/run/dbus/system_bus_socket \
-		--with-session-socket-dir=/tmp \
-		--with-dbus-user=messagebus \
-		--localstatedir=/var \
-		$(use_enable doc doxygen-docs) \
-		--disable-xml-docs \
-		${myconf} \
-		|| die "econf failed"
-
-	# after the compile, it uses a selinuxfs interface to
-	# check if the SELinux policy has the right support
-	use selinux && addwrite /selinux/access
-
-	emake || die "make failed"
-}
-
-src_test() {
-	DBUS_VERBOSE=1 make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# initscript
-	newinitd "${FILESDIR}"/dbus.init-0.95 dbus
-
-	# dbus X session script (#77504)
-	# turns out to only work for GDM. has been merged into other desktop
-	# (kdm and such scripts)
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/30-dbus
-
-	# needs to exist for the system socket
-	keepdir /var/run/dbus
-	# needs to exist for machine id
-	keepdir /var/lib/dbus
-
-	keepdir /usr/lib/dbus-1.0/services
-	keepdir /usr/share/dbus-1/services
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	if use doc; then
-		dohtml doc/*html
-	fi
-}
-
-pkg_preinst() {
-	enewgroup messagebus || die "Problem adding messagebus group"
-	enewuser messagebus -1 "-1" -1 messagebus || die "Problem adding messagebus user"
-}
-
-pkg_postinst() {
-	elog "To start the D-Bus system-wide messagebus by default"
-	elog "you should add it to the default runlevel :"
-	elog "\`rc-update add dbus default\`"
-	elog "Currently have it installed and running?"
-	elog "Run etc-update and then run the following:"
-	elog "\`/etc/init.d/dbus reload\`"
-	elog "This will cause it to reload it's configs but"
-	elog "not run the newest version you just installed."
-	elog "You must tell it to restart for that to happen,"
-	elog "however not all apps can handle a D-Bus restart."
-}
diff --git a/sys-apps/dbus/files/dbus-0.95-pass-context.patch b/sys-apps/dbus/files/dbus-0.95-pass-context.patch
deleted file mode 100644
index 1e5612198c19..000000000000
--- a/sys-apps/dbus/files/dbus-0.95-pass-context.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /home/drizzt/dbus-0.95/bus/bus.c.old	2006-11-04 20:41:44 +0000
-+++ /home/drizzt/dbus-0.95/bus/bus.c	2006-11-04 20:41:57 +0000
-@@ -517,7 +517,7 @@
-   /* Watch all conf directories */
-   _dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
- 		      (DBusForeachFunction) bus_watch_directory,
--		      NULL);
-+		      context);
- 
-   return TRUE;
- }
diff --git a/sys-apps/dbus/files/dbus.init-0.95 b/sys-apps/dbus/files/dbus.init-0.95
deleted file mode 100644
index c8ca38164e16..000000000000
--- a/sys-apps/dbus/files/dbus.init-0.95
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-0.95,v 1.1 2006/11/05 07:07:26 cardoe Exp $
-
-opts="reload"
-
-depend() {
-   after nscd dns
-}
-
-start() {
-	ebegin "Starting D-BUS system messagebus"
-
-	/usr/bin/dbus-uuidgen --ensure
-
-	# We need to test if /var/run/dbus exists, since script will fail if it does not
-	[[ ! -e /var/run/dbus ]] && mkdir /var/run/dbus 
-
-	start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
-	eend $?
-}
-
-stop() {
-	local retval
-
-	ebegin "Stopping D-BUS system messagebus"
-
-	start-stop-daemon --stop --pidfile /var/run/dbus.pid
-	retval=$?
-
-	eend ${retval}
-
-	[[ -S /var/run/dbus/system_bus_socket ]] && rm -f /var/run/dbus/system_bus_socket
-
-	return ${retval}
-}
-
-reload() {
-	local retval
-
-	ebegin "Reloading D-BUS messagebus config"
-	
-	/usr/bin/dbus-send --print-reply --system --type=method_call \
-			--dest=org.freedesktop.DBus \
-			/ org.freedesktop.DBus.ReloadConfig > /dev/null
-	retval=$?
-	eend ${retval}
-	return ${retval}
-}
diff --git a/sys-apps/dbus/files/digest-dbus-0.95 b/sys-apps/dbus/files/digest-dbus-0.95
deleted file mode 100644
index 94b316919d3d..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.95
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c660e2c6345cbe5edc5e2486570148af dbus-0.95.tar.gz 1400507
-RMD160 bbe7a1b573c40229c65c4e85174bfdd3dcabf64c dbus-0.95.tar.gz 1400507
-SHA256 9bd989a5116320aa56531745904881f1a03a612d201f718374fbe223dfae7592 dbus-0.95.tar.gz 1400507