From 7152bb900fe4f30c0e866abf44d08a0f6ed19f80 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 11 Nov 2014 23:38:11 +0000 Subject: [PATCH] Version bump wrt security #528900 by Agostino Sarubbo Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D --- sys-apps/dbus/ChangeLog | 7 +- sys-apps/dbus/Manifest | 26 ++-- sys-apps/dbus/dbus-1.8.10.ebuild | 253 +++++++++++++++++++++++++++++++ 3 files changed, 270 insertions(+), 16 deletions(-) create mode 100644 sys-apps/dbus/dbus-1.8.10.ebuild diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index f317ed549ee4..a1f7c2a3212f 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.450 2014/11/02 09:43:36 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.451 2014/11/11 23:38:00 ssuominen Exp $ + +*dbus-1.8.10 (11 Nov 2014) + + 11 Nov 2014; Samuli Suominen +dbus-1.8.10.ebuild: + Version bump wrt security #528900 by Agostino Sarubbo 02 Nov 2014; Sven Vermeulen dbus-1.8.8.ebuild: Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index a95472acdba7..b931f437bb18 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -3,24 +3,20 @@ Hash: SHA256 AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89 WHIRLPOOL 74e9e79b86fc4802f34737bb47c3a71919f35fb2375119cdcd7fd6dae2de201e006fb4e6a978addd2300f7075180d4b088a69fa60d2ce4d689b6239b4a1307b1 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.8.tar.gz 1864881 SHA256 dfab263649a979d0fff64a30cac374891a8e9940350e41f3bbd7679af32bd1fd SHA512 99e7e05347666e95f3ccaf3f19500b59a5e509cdb9489c11f47ed4f139d3bc8e21adcf48cbb5c4f0de1661e831d60634eb7b6b76cc080d32091b63c732ebe391 WHIRLPOOL 3905352dfc2f922b599dfe7bd650258b16b489802b1c39b0be03bcfbe56c6d89b39f51f1b6d2d851dd23705aa068f40ade856001fadcca885bd3e81cf6e51199 +EBUILD dbus-1.8.10.ebuild 7086 SHA256 d0adbe9a248a4663da4992ed42da9ebec6a9624c5b63a73e59c0e2887331a331 SHA512 c9318e80f467a89f2e8576c5d66f6028e08f728a360f4238032bde32f8db4a5780d378e74ecb96d84010a3cba0dc34bfe7209896163f3e5d0318068ca858c680 WHIRLPOOL 70ac5743d8c1a9dbe6dd49ed7817a9eb95849108df95ebc6878264aa89288361879c53eee3de646645ebf037a3c1acb5cf8b661f3fa8b70844097fb46610ccea EBUILD dbus-1.8.8.ebuild 7073 SHA256 1f090e4f6c4eba4fb7ab6fb0d6b5b5afafae66799682ff41bff21d53c6d48d6b SHA512 d0cf98e3f40b8b5720d6968a2c9ab93cf195600e1a07291a712c973bb637334cea01a219474e7afdd0863c251f0e09e3ce6922fa192e43683635d91ec0211907 WHIRLPOOL ce9a152d1f24b46ac24320d758bac34e621a71953de58ebf2a9f221d46266eaeb309b99d5cbb633dab5f75dc9a848877ee53de148242cb30f00b5eafc105d439 -MISC ChangeLog 64546 SHA256 7ddedc61c4b3c1711e914c50e55fb03d13817b988de6ee0b1f5d7f8ab5a8b355 SHA512 65df2de6677fa39e36066e78c9a36b083989e6ed0532c96c6de8feb47ff167f1ff8aff873417e16e216466b6bf5d5478cc116e47b62a2688fe7d4a7dacdad5a7 WHIRLPOOL 8517c5e5f5f3832d322a829172748403c503f2ba0654f643851d1ac44ec52b73f87a0544e3cd6a8bff569d5e4e2aa053f21cb6467f86be3e98c485ae62fec280 +MISC ChangeLog 64710 SHA256 ce2d326dd87d8c17f790d243e526b867c533fae5e62c88163ade3734bf388180 SHA512 e5e08b0e497f9577653290e7fd39f4068bee16bd83e4bca26e4195c01a6f201fe3018520bbbfe5f0f9e6061b89162520ec87a6c31dd3e831898eb1fb2360d582 WHIRLPOOL 165594342bcb7bb17be0f5245f2bf5902ea6e1cccd8a109eb3896afad6613aafb8cc380a1ec87ae2a1fa1d042cea3284a9e337405f5975ef7278b3240d1f5e87 MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQIcBAEBCAAGBQJUVfzOAAoJEC7dUkA7aK9H8vAP/2c+ucCAy+VL0k2VlDpHZaWA -ktXasEzf0YZoZuC/MVFiPXpI8WkgakujGfI9rf5rYdkuz5mCYsQN/IuE3XyFDunP -YDlzRLZRA0x1OtiAnW9X7Qn6hfb/bpXFAxfe1ArVm3TKtLO+2FXXjaP+Q61FmLHG -b6Bwxf+tyuV/o7f5PvKmgkrN4UMBOBS8RDkWphw07afLniFmCXYjohkOzG99BIIW -NSCYYgBHqnNNdPfnLHEOPzRUfJYEuZsmaybwu0suLMkGAPKe2CXUt+WxUMPjfgsk -QWYgKeUpEMYZAFNAR3sYxnWutg4iAL5scxcW1au4kY16FpLySOMluSsLeuwnFtjf -SeqWLYXSsv/2Sk8c05YpNAQmxaM5ZQPtQqGXvL+ImFrhOxFAtJfTTWPzTHSKbwsE -blOXsJE76Kn7YUua5JE6WPMHSvOx78xUCm6VmN/g/VSHthoXumXvUrK672IXBkFC -HxaOD/hFzvaQQraq2nwRF9jXSlO5f2Fjr0CHCCyMdMTF7FkYgExvAxSfe4D7sShq -Le481ytEY3aNjEcDIe84SnkFcnEIyz0glP4v//gQS4EtQWlycuVE+BUexBml28fU -NI2dtAD10N5OHAnDQgEk+xYBdd0IZ80bqBeroA/zvDlakr1AFJHl1Bbn61GQyg4F -Dv+2Z+0VD6GEZ19ywDkL -=Nxrl +iQEcBAEBCAAGBQJUYp14AAoJEEdUh39IaPFNydwH/A7RvPOHTJ4T1edUmqJIbqqO +8Bj1IDP78OUi9OGqYKPJMvVzI2LjNd57KUZrESRsVK5+OmgynSfhlOHuEna7N2aK +EL+OtMQ5wsPlC74ODtPtS/i4U77SXRGECekA5ZiChTTePKuj0Y+AhAam60kqS08s +cqyzaW6BNhKXAFyWM77Se8whhSw+BgDcMU0SRbYqw85qUH9QE9aUpTCYVj8gP5rW +5Ef/JfUQWWzn3RvAVzKW8ZNg1e3llE6n2gt01qDxdRoS8sKVjhSkWbseE8gGM3uY +Y4LxfEoY8kdUMLYIctHO483wgES/kw0THOrHVId8Px68c+1XOOGNBOz9ifdz5yg= +=7Szg -----END PGP SIGNATURE----- diff --git a/sys-apps/dbus/dbus-1.8.10.ebuild b/sys-apps/dbus/dbus-1.8.10.ebuild new file mode 100644 index 000000000000..739363896684 --- /dev/null +++ b/sys-apps/dbus/dbus-1.8.10.ebuild @@ -0,0 +1,253 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.10.ebuild,v 1.1 2014/11/11 23:38:00 ssuominen 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 + ) + fi + + einfo "Running configure in ${BUILD_DIR}" + ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}" + + if multilib_is_native_abi && use test; then + mkdir "${TBD}" + cd "${TBD}" + 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 multilib_is_native_abi && use test; then + cd "${TBD}" + einfo "Running make in ${TBD}" + emake + fi + else + emake -C dbus libdbus-1.la + fi +} + +src_test() { + cd "${TBD}" + DBUS_VERBOSE=1 Xemake -j1 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 +} -- 2.26.2