Security bump for #539482. Proxy commit for ssuominen.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xFED5002857C1ABFA!

3 files changed, 272 insertions, 9 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 583cee64bb70..76253fc783a7 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.463 2014/12/13 14:19:19 zlogene Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.464 2015/02/10 21:52:09 k_f Exp $
+
+*dbus-1.8.16 (10 Feb 2015)
+
+  10 Feb 2015; Kristian Fiskerstrand <k_f@gentoo.org> +dbus-1.8.16.ebuild:
+  Security bump for #539482. Proxy commit for ssuominen.
 
   13 Dec 2014; Mikle Kolyada <zlogene@gentoo.org> -dbus-1.8.8.ebuild:
   Security cleanup
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index b525eee96a7d..ce5b4ad34d88 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,16 +5,19 @@ AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca
 AUX dbus.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f
 DIST dbus-1.8.10.tar.gz 1864902 SHA256 10bf87fdb68815edd01d53885101dbcdd80dacad7198912cca61a4fa22dfaf8e SHA512 e6c3ad81a6f6eb966a39ee5612513809fb74b411e001ea0987ab91e3f6492d506527dca39263d2dfced726a7341a284a189ca588ee1525894ac751eee68878aa WHIRLPOOL 6b50b3296cfe3db9195541d35a7bdf88e74d1b65aa846e63e1885396b1515ac1f93e1ee6ac579db762033538f002a3a2bf12491af0b9810f20f0560beb49cb13
 DIST dbus-1.8.12.tar.gz 1864609 SHA256 c91428f28d2925ba32d34ffc824bfcf4d40d5e1e67befc4bcf2202f0a862501e SHA512 360168df98476eb42830350195520f09d44ec50f5f7cf4727cc92b8a98189ae25047fdc409c7a7f13b4384d82b103957301e17e143f094fb3ca9c5a5ed2ef48b WHIRLPOOL 907f18325b019fb8fb2cdee6f580a9c2b5d5ba2da2a2548e1aac5853c515051a585bf5c2590e5a943c97860a9020acdfa6fb820b53d8fadd89f991518ad66d71
+DIST dbus-1.8.16.tar.gz 1866436 SHA256 7f795268efd343ff0498786acb35097564390d40b1b6158daf1b4f742b522b07 SHA512 79e0fb21912fe5644e1babf96fc2a64595edef6524ef50d54f6beb8cd0f1224b8484a52a7815494b40bd00bf048176002ab35443c0bb6bd04abdc3c60599f1d5 WHIRLPOOL 5e992caf51c0fb24885099b957ce01205a249118c5db27c5161e6d45ae85a889d7f26d32dfa03a207025e87e233f74c6cffd09a5ccc44d4e598d3d535b8d4247
 EBUILD dbus-1.8.10.ebuild 7186 SHA256 993f3c088c84fa4f74056fcc3fd5053b40ca5d093664dc41430a9358fade6ac8 SHA512 ca7d89c1bbcc7488a239fe4598a301315b800f7b6a0e2942d43f621bfe9774944850f93f0f074ed14f22c8d001a0f97d7f6fa6787a1ec873f1771dbd290122d4 WHIRLPOOL d422610ef684dfc7b8835499a30910fb10816c18e7fa140de1481c27eb34f02aa8af80775fd7f9cf6fb30f451d4bc8938835ebcf120421c7a5265661866cb440
 EBUILD dbus-1.8.12.ebuild 7199 SHA256 060af66a2c2093d01f8e123c9b322e199ec11315b58173071ce2ed5059f47b2a SHA512 b6e8a0bb3ebac676dc08a63b9678e277c204ba0a58682e57a4e0a119f9f389db877d6f77545c82553205f91f28f564218e6012a4452e008ed5091be964c37707 WHIRLPOOL 198d1a75374364cd2465e849ed875fda03523372aea2c41f4206e3ebc8ff3a5f0b3b115c943ba794dc28dd129f9b965644d95d74358feb7f808abe5772464f0d
-MISC ChangeLog 66013 SHA256 6d055ab902b6b4eba0000307fcacf9e4c4440e5f5e4017756e96776e08f300a5 SHA512 a08ea346487b269cb8d0dfcb874a6169da190d27fa9d4f8c88f5a617764e01ea2247d764527181e7054ae2dce39001252fbc61d66195daeb03c6ecd033717c1f WHIRLPOOL 82a43105244a73f5bede8ac74d813e9187a00207dddb5d24ffdf7d12b377455bdd8d8d9cde278d68c1cd738e5bea079e4c9bfd7a393f38da577a1167a2bfaf1c
+EBUILD dbus-1.8.16.ebuild 7194 SHA256 0bdd7917b015395ba8396eeb21ff40ca4b050f23064d62b5a053c7bfbef0572e SHA512 0baa36c606be18a01bca5ba479780c1eed6b53743a1cb5750bc814ff9d6df42702862e8c8bfd68b29a18ae3ba4c21f72587b7f2074963dc405ebff768aaac5b5 WHIRLPOOL 4048729f8815b6ed1d512676010e24613642152003f385782996c919265d5d243f7d415367b0f90fb118ce4c6166e9a29eb2e35c19b03e8c351692337f39603e
+MISC ChangeLog 66170 SHA256 68dadd6eb54c3460580678b56c0803f7d0fcb590fb08687542ca60e7dfcabffe SHA512 35ad9717adebb990ea4b0be4c077f4879f0c428d1cea4cf9c77828096b6ab77c3749e154c3540cf4fa0ef4ecff074d9c37e33be444e82fd5efde7fa25f668002 WHIRLPOOL f4efc34425824ebec9a7e1a7f101e1fccf629488ce5964a92f28dae9ea4f08648830ea94e33f4448c3909d36a64065c80b13a8595974bd84e108de7116af2a77
 MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iJwEAQEIAAYFAlSMSo0ACgkQG9wOWsQutdY3CgP/ZO7zCuNnuOk0t7P+P0Jxfqsq
-0CtLbmZGeF4xAyvTZE08sndI8yBkA47KH5IHTQbnCjS+vz4yIKP+SkC4wK9THIy9
-coHIh+Tnt5l09rb4MhwajU0Lkuia0pbGQc32sjQf5vKUWpTVCdFgP1e87IKOz4ND
-wmRti5CGxQMs1gO796k=
-=KA+V
+iQEcBAEBCAAGBQJU2n2KAAoJEP7VAChXwav66ZQH/jaenB/ZmV85d41HjNc3h4Bb
+D6ws5GoXux7igNY7B3E0nqfPm5FuMIV8+MxqAN3f14wGmOpr4/8o/mRm/3e+hEip
+y19JWcYdbXUjTFBMCNXLdECBEl2sDNEnNCYyzLUtc+FZTR+Ce/8ZxQ6Q+6LPocdV
+F7m5rY3QZOm+iYdDUi4HIhlXrIdtu5NLBWmGTEvn/KPDkPnBN4a2BTkywzwmiFqw
+gl34O29BqfnS5GZcsWWClw0VIzqNTJzazlTerL5+m+QzMHVy8bORU+dXvJ69a/HM
+8Vz134/JLYu/L+dA8nzNoZQTujHS2h/GUvbSJ+zGgbNBGkZeCaHXCyOIYatiqrU=
+=Tb38
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.8.16.ebuild b/sys-apps/dbus/dbus-1.8.16.ebuild
new file mode 100644
index 000000000000..9a3b23f38457
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.8.16.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.16.ebuild,v 1.1 2015/02/10 21:52:09 k_f Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils linux-info flag-o-matic multilib-minimal python-any-r1 systemd virtualx user
+
+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="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug doc selinux static-libs systemd test X"
+
+CDEPEND=">=dev-libs/expat-2
+	selinux? (
+		sys-libs/libselinux
+		)
+	systemd? ( sys-apps/systemd:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+		)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${CDEPEND}
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.4
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		>=dev-libs/glib-2.24
+		${PYTHON_DEPS}
+		)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-dbus )
+"
+
+# out of sources build dir for make check
+TBD=${WORKDIR}/${P}-tests-build
+
+pkg_setup() {
+	enewgroup messagebus
+	enewuser messagebus -1 -1 -1 messagebus
+
+	use test && python-any-r1_pkg_setup
+
+	if use kernel_linux; then
+		CONFIG_CHECK="~EPOLL"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Tests were restricted because of this
+	sed -i \
+		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
+		-e '/"dispatch"/d' \
+		bus/test-main.c || die
+
+	epatch_user
+
+	# required for asneeded patch but also for bug 263909, cross-compile so
+	# don't remove eautoreconf
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local docconf myconf
+
+	# so we can get backtraces from apps
+	case ${CHOST} in
+		*-mingw*)
+			# error: unrecognized command line option '-rdynamic' wrt #488036
+			;;
+		*)
+			append-flags -rdynamic
+			;;
+	esac
+
+	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+	# not on an SELinux profile.
+	myconf=(
+		--localstatedir="${EPREFIX}/var"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		$(use_enable static-libs static)
+		$(use_enable debug verbose-mode)
+		--disable-asserts
+		--disable-checks
+		$(use_enable selinux)
+		$(use_enable selinux libaudit)
+		$(use_enable kernel_linux inotify)
+		$(use_enable kernel_FreeBSD kqueue)
+		$(use_enable systemd)
+		--disable-embedded-tests
+		--disable-modular-tests
+		$(use_enable debug stats)
+		--with-session-socket-dir="${EPREFIX}"/tmp
+		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
+		--with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
+		--with-dbus-user=messagebus
+		$(use_with X x)
+		"$(systemd_with_unitdir)"
+		)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=(
+			--enable-launchd
+			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+		)
+	fi
+
+	if multilib_is_native_abi; then
+		docconf=(
+			--enable-xml-docs
+			$(use_enable doc doxygen-docs)
+		)
+	else
+		docconf=(
+			--disable-xml-docs
+			--disable-doxygen-docs
+		)
+		myconf+=(
+			--disable-selinux
+			--disable-libaudit
+			--disable-systemd
+			--without-x
+
+			# expat is used for the daemon only
+			# fake the check for multilib library build
+			ac_cv_lib_expat_XML_ParserCreate_MM=yes
+		)
+	fi
+
+	einfo "Running configure in ${BUILD_DIR}"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+	if multilib_is_native_abi && use test; then
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
+			$(use_enable test asserts) \
+			$(use_enable test checks) \
+			$(use_enable test embedded-tests) \
+			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		# after the compile, it uses a selinuxfs interface to
+		# check if the SELinux policy has the right support
+		use selinux && addwrite /selinux/access
+
+		einfo "Running make in ${BUILD_DIR}"
+		emake
+
+		if use test; then
+			einfo "Running make in ${TBD}"
+			emake -C "${TBD}"
+		fi
+	else
+		emake -C dbus libdbus-1.la
+	fi
+}
+
+src_test() {
+	DBUS_VERBOSE=1 Xemake -j1 -C "${TBD}" check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C dbus \
+			install-libLTLIBRARIES install-dbusincludeHEADERS \
+			install-nodist_dbusarchincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	newinitd "${FILESDIR}"/dbus.initd dbus
+
+	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
+	fi
+
+	# needs to exist for dbus sessions to launch
+	keepdir /usr/share/dbus-1/services
+	keepdir /etc/dbus-1/{session,system}.d
+	# machine-id symlink from pkg_postinst()
+	keepdir /var/lib/dbus
+	# let the init script create the /var/run/dbus directory
+	rm -rf "${ED}"/var/run
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if [ "$(rc-config list default | grep dbus)" = "" ] ; then
+		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
+	fi
+
+	elog "Some applications require a session bus in addition to the system"
+	elog "bus. Please see \`man dbus-launch\` for more information."
+	elog
+
+	if [ "$(rc-status | grep dbus | grep started)" ] ; then
+		elog "You can restart D-Bus \`/etc/init.d/dbus restart\` to run"
+		elog "the new version of the daemon."
+	fi
+
+	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
+	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+	# dependencies with hardcoded paths (although the known ones got fixed already)
+	dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
+	ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		local plist="org.freedesktop.dbus-session.plist"
+		elog
+		elog
+		elog "For MacOS/Darwin we now ship launchd support for dbus."
+		elog "This enables autolaunch of dbus at session login and makes"
+		elog "dbus usable under MacOS/Darwin."
+		elog
+		elog "The launchd plist file ${plist} has been"
+		elog "installed in ${EPREFIX}/Library/LaunchAgents."
+		elog "For it to be used, you will have to do all of the following:"
+		elog " + cd ~/Library/LaunchAgents"
+		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+		elog " + logout and log back in"
+		elog
+		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+		elog "specified and refused to start otherwise, then export the"
+		elog "the following to your environment:"
+		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+	fi
+}