amd64/ppc64 stable wrt security #348766. punt old.

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

4 files changed, 8 insertions, 198 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 5fa8627e0b51..5561a67a1683 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.268 2010/12/22 11:54:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.269 2010/12/22 13:34:11 ssuominen Exp $
+
+  22 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> dbus-1.4.1.ebuild:
+  amd64/ppc64 stable wrt security #348766
 
   22 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> dbus-1.4.1.ebuild:
   x86 stable wrt security bug #348766
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 9abbd923d645..915ef547657c 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,10 +3,8 @@ AUX 80-dbus 341 RMD160 3b7f55906289d91a1f0ed87edec7902ddac076c5 SHA1 df1f96934fb
 AUX dbus-1.4.0-asneeded.patch 4157 RMD160 f6fd613ff90d5570f4dabeca0738df4c3249ed49 SHA1 ceddf63bb4a3213f68117b36af415a7c69443e6a SHA256 c37d068b6923947f769682677cacbad13b267458b2de242e160b8ab261aa9b96
 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
 DIST dbus-1.2.24.tar.gz 1673774 RMD160 2f51def784056bc16fbec2ddc3be22c022a94fb5 SHA1 9593717348ea36ba228b46f165bb67c127c12be8 SHA256 f12c748f4a703655e3d4c3db94cdf5a752a0cd0b36958c715804373bd3595c48
-DIST dbus-1.4.0.tar.gz 1800347 RMD160 e3d44208f39d7c4a1bf916527dc121d3097a82d0 SHA1 4be3281005a9ef8f521f5547128c29a2632cb1d7 SHA256 c96d2f86d40e158e2bf405925a0a42cce0533a8466098e2f2238aa1614926652
 DIST dbus-1.4.1.tar.gz 1850139 RMD160 090740469872b31c24aafb4e4d40e690184b1580 SHA1 112279ff58305027294fe0eb5bee600f68cf0b50 SHA256 caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd
 EBUILD dbus-1.2.24.ebuild 3679 RMD160 5d4063a79bddee8c3963d68487862bf3638acf0d SHA1 26f2043c6a5d92a567fc92b8dfcba1e6eeee7d09 SHA256 897662b0d33783ef5876b3db04739964d2425f5d24d6242f8ad9ab1680b421bc
-EBUILD dbus-1.4.0.ebuild 5111 RMD160 03aa2d02e41a5173f5780815c038f09fec133015 SHA1 946470a558d5d4902987e8b43e88003c1334ed58 SHA256 93546a9afa1ac0e875c41342fa09a8f5a0d40d1f0085fbd6578fc258fcc3fe00
-EBUILD dbus-1.4.1.ebuild 5119 RMD160 7e1d48f8d6d9f0ffe252b9760bd76fdd40a589a3 SHA1 631cf2b031b773e9a46c050093ebe5d3d4b95c1a SHA256 06667c1bd4053b3998e3adaee35917815932b399ae8f39c4cbb18c4a82cdc925
-MISC ChangeLog 41102 RMD160 cae82803500f523068651c8a829bb4c23ac6fbe1 SHA1 c4363358c9fbf8db4fde97d699557efdeb79bb68 SHA256 ccda2894c0c5c2c18fe51326d909398de573b2d81b5fe272e6684a994f8e271d
+EBUILD dbus-1.4.1.ebuild 5116 RMD160 ff3b6ed611d1aa4b2aae4074e5943cd60bd07fb9 SHA1 5db1108363e4e6e0ec53e6678d84fd478cbb1af1 SHA256 0e08c34a50dd1ccc4fc3c0ff79a44625108081d9629a12032da93b3c65aa1896
+MISC ChangeLog 41217 RMD160 2825f0c23eee6c36273532cb4b2f3737b03dc731 SHA1 56d4693677cb71c726938256f122376b4146b8f7 SHA256 a045b595d434ecf3058fee2eafd434e313471546b44d8855e566cd5865425605
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
diff --git a/sys-apps/dbus/dbus-1.4.0.ebuild b/sys-apps/dbus/dbus-1.4.0.ebuild
deleted file mode 100644
index a2675bb15b33..000000000000
--- a/sys-apps/dbus/dbus-1.4.0.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.0.ebuild,v 1.8 2010/10/30 13:08:24 ssuominen Exp $
-
-EAPI="2"
-
-inherit autotools eutils multilib 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 static-libs test X"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	selinux? (
-		sys-libs/libselinux
-		sec-policy/selinux-dbus
-	)
-"
-RDEPEND="${CDEPEND}
-	!<sys-apps/dbus-0.91
-	>=dev-libs/expat-1.95.8
-"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	)
-"
-
-# out of sources build directory
-BD=${WORKDIR}/${P}-build
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
-
-src_prepare() {
-	# Delete pregenerated files from tarball wrt #337989 (testsuite fails)
-	find test/data -type f -name '*.service' -exec rm -f '{}' +
-	find test/data -type f -name 'debug-*.conf' -exec rm -f '{}' +
-
-	# Remove CFLAGS that is not supported by all gcc, bug #274456
-	sed 's/-Wno-pointer-sign//g' -i configure.in configure || die
-
-	# Tests were restricted because of this
-	sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' -i "${S}/bus/test-main.c" || die
-
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-src_configure() {
-	local my_conf
-
-	# so we can get backtraces from apps
-	append-flags -rdynamic
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	my_conf="$(use_with X x)
-		$(use_enable debug verbose-mode)
-		$(use_enable debug asserts)
-		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		$(use_enable static-libs static)
-		--enable-shared
-		--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"
-
-	mkdir "${BD}"
-	cd "${BD}"
-	einfo "Running configure in ${BD}"
-	ECONF_SOURCE="${S}" econf ${my_conf} \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable doc xml-docs)
-
-	if use test; then
-		mkdir "${TBD}"
-		cd "${TBD}"
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf \
-			${my_conf} \
-			$(use_enable test checks) \
-			$(use_enable test tests) \
-			$(use_enable test asserts)
-	fi
-}
-
-src_compile() {
-	# after the compile, it uses a selinuxfs interface to
-	# check if the SELinux policy has the right support
-	use selinux && addwrite /selinux/access
-
-	cd "${BD}"
-	einfo "Running make in ${BD}"
-	emake || die "make failed"
-
-	if use doc; then
-		einfo "Building API documentation..."
-		doxygen || die "doxygen failed"
-	fi
-
-	if use test; then
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake || die "make failed"
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 make check || die "make check failed"
-}
-
-src_install() {
-	# initscript
-	newinitd "${FILESDIR}"/dbus.init-1.0 dbus || die "newinitd failed"
-
-	if use X ; then
-		# dbus X session script (#77504)
-		# turns out to only work for GDM (and startx). has been merged into
-		# other desktop (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d/
-		doexe "${FILESDIR}"/80-dbus || die "doexe failed"
-	fi
-
-	# 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 || die "dodoc failed"
-
-	cd "${BD}"
-	# FIXME: split dtd's in dbus-dtd ebuild
-	emake DESTDIR="${D}" install || die "make install failed"
-	if use doc; then
-		dohtml -p api/ doc/api/html/* || die "dohtml api failed"
-		cd "${S}"
-		dohtml doc/*.html || die "dohtml failed"
-	fi
-
-	# Remove .la files
-	find "${D}" -type f -name '*.la' -exec rm -f '{}' +
-}
-
-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 "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
-	ewarn "the new version of the daemon."
-	ewarn "Don't do this while X is running because it will restart your X as well."
-
-	# Ensure unique id is generated
-	dbus-uuidgen --ensure="${ROOT}"/var/lib/dbus/machine-id
-}
diff --git a/sys-apps/dbus/dbus-1.4.1.ebuild b/sys-apps/dbus/dbus-1.4.1.ebuild
index cd6b24cb00d4..6d76567fd4cb 100644
--- a/sys-apps/dbus/dbus-1.4.1.ebuild
+++ b/sys-apps/dbus/dbus-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.1.ebuild,v 1.2 2010/12/22 11:54:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.1.ebuild,v 1.3 2010/12/22 13:34:11 ssuominen Exp $
 
 EAPI="2"
 
@@ -12,7 +12,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 static-libs test X"
 
 CDEPEND="