From: Doug Goldstein <cardoe@gentoo.org>
Date: Wed, 27 Feb 2008 20:48:06 +0000 (+0000)
Subject: fix for CVE-2008-0595. potentially fixes bug #211076
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4f2083eb3d39309efb5b8e6a65fa6e04c521e25a;p=gentoo.git

fix for CVE-2008-0595. potentially fixes bug #211076
Package-Manager: portage-2.1.4.4
---

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 96f6dcca8b00..2f7bfef8e71d 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.209 2008/02/12 13:01:15 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.210 2008/02/27 20:48:06 cardoe Exp $
+
+*dbus-1.1.20 (27 Feb 2008)
+
+  27 Feb 2008; Doug Klima <cardoe@gentoo.org> +dbus-1.1.20.ebuild:
+  fix for CVE-2008-0595. potentially fixes bug #211076
 
   12 Feb 2008; Steev Klimaszewski <steev@gentoo.org> dbus-1.1.4.ebuild:
   Disable libaudit when not using SELinux.  Should close bug #209571.  
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 890af8126b7b..90d9a671e8c6 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,10 +1,22 @@
+-----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.4-xdisplay_null.patch 421 RMD160 4be7aee34fc20c6d871e803b57e21e281af5bee5 SHA1 39464d340e56cafeeab96aa14881ce44a05c8e98 SHA256 176c826865d6479b37fc45879075ac2c7e810750fd78c7f1dffbd9e0082903e3
 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
+DIST dbus-1.1.20.tar.gz 1401902 RMD160 da06f0fca2e83e9ea3af6fa14045a69b97435221 SHA1 fff5db438483e6b4a3c40d430b20baa49ad2d58a SHA256 6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e
 DIST dbus-1.1.4.tar.gz 1400585 RMD160 22d08a6c00ac3cd0bcf97d7733f39af36bcbfb0b SHA1 f246dfbc7dadb8a11a413f3376fdcd22e52eb1e4 SHA256 4f8ff9324a5d363833833333193a3e83c074a51ce82d8c66c2e304b0378c714d
 EBUILD dbus-1.0.2-r2.ebuild 3406 RMD160 2bc007e091ca12b57248ccb34677d001e7ca3a77 SHA1 bf45ae458276a3ae23551cb4531d8b3c3af81fc9 SHA256 627893aedf081dfef8562bdd48302e1eae7c532c508310cd887c0e197639bef7
+EBUILD dbus-1.1.20.ebuild 3429 RMD160 17a453e4388e9b6288eb1b38739a38e6c4b11e83 SHA1 3ee3fe1bbded769905eec2f4694d3cd91ccc7fcf SHA256 ddcecf058251fdd847a06b5e85418523788021b2ce40097b0b92da07143ff4b4
 EBUILD dbus-1.1.4.ebuild 3615 RMD160 e624bbf41d68ee262e979fdfe18ccefdcf0da17f SHA1 4de46e72c4dd2f56c6e448808969c5fb3f89e944 SHA256 cfeb8cf28565ec4a89e4382d8d1002fe97113ee545fcfd41c9adfdb0ba0e73db
-MISC ChangeLog 31675 RMD160 d2eb2cbc6e3ecd7533d16964dbcefcfe44c542de SHA1 d28ab39168d9b6d1109e146c0dee3ac57aa6ee70 SHA256 af032d5570da6983fcf18a13715ea8ba419d257a3eb3dbbef42e8e1574ae2347
+MISC ChangeLog 31827 RMD160 93a6647c5735d9d1bba9390d926a9ed45a06b68c SHA1 74700e8f40ae267c242c375d8526d88fb4070f9e SHA256 3469322281d77dea04cee614dae8d56ae32891dbebdae1774d747f952870b3b4
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHxcyPoeSe8B0zEfwRAryhAJ99mURd2xRZGyZ9rYDA/Gt/YzkWbQCfcy1q
+zkcRZqL3shwVzuez32NufoM=
+=z7sJ
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.1.20.ebuild b/sys-apps/dbus/dbus-1.1.20.ebuild
new file mode 100644
index 000000000000..da91ffe3f110
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.1.20.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.20.ebuild,v 1.1 2008/02/27 20:48:06 cardoe Exp $
+
+inherit eutils multilib autotools flag-o-matic
+
+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"
+
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+SLOT="0"
+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 )
+	selinux? ( sys-libs/libselinux
+				sec-policy/selinux-dbus )
+	>=dev-libs/expat-1.95.8
+	!<sys-apps/dbus-0.91"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (	app-doc/doxygen
+		app-text/xmlto )"
+
+src_compile() {
+	# so we can get backtraces from apps
+	append-flags -rdynamic
+
+	local myconf=""
+
+	hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
+	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+	# not on an SELinux profile.
+	econf \
+		$(use_with X x) \
+		$(use_enable kernel_linux inotify) \
+		$(use_enable kernel_FreeBSD kqueue) \
+		$(use_enable selinux) \
+		$(use_enable selinux libaudit)	\
+		$(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() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# initscript
+	newinitd "${FILESDIR}"/dbus.init-1.0 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
+	# needs to exist for dbus sessions to launch
+
+	keepdir /usr/lib/dbus-1.0/services
+	keepdir /usr/share/dbus-1/services
+	keepdir /etc/dbus-1/system.d/
+	keepdir /etc/dbus-1/session.d/
+
+	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
+	elog "Some applications require a session bus in addition to the system"
+	elog "bus. Please see \`man dbus-launch\` for more information."
+	elog
+	ewarn
+	ewarn "You MUST run 'revdep-rebuild' after emerging this package"
+	elog  "If you notice any issues, please rebuild sys-apps/hal"
+	ewarn
+	ewarn "If you are currently running X with the hal useflag enabled"
+	ewarn "restarting the dbus service WILL restart X as well"
+	ebeep 5
+	ewarn
+}