From 414db59b934ad30173fd0a46ffb95ee599e12fa3 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 13 May 2015 14:54:44 -0700 Subject: [PATCH] bump(sys-apps/dbus): sync with upstream for arm64 Signed-off-by: Geoff Levand --- .../coreos-overlay/sys-apps/dbus/Manifest | 19 +- .../sys-apps/dbus/dbus-1.6.12-r4.ebuild | 1 - .../sys-apps/dbus/dbus-1.6.12.ebuild | 195 --------------- .../sys-apps/dbus/dbus-1.6.18-r1.ebuild | 232 ------------------ ...{dbus-1.8.10.ebuild => dbus-1.8.16.ebuild} | 44 ++-- ...pping-capabilities-only-include-AUDI.patch | 39 --- .../coreos-overlay/sys-apps/dbus/metadata.xml | 14 ++ 7 files changed, 47 insertions(+), 497 deletions(-) delete mode 120000 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12-r4.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.18-r1.ebuild rename sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/{dbus-1.8.10.ebuild => dbus-1.8.16.ebuild} (80%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest index 3c85b24b39..2e2240aba4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest @@ -1,3 +1,16 @@ -DIST dbus-1.6.12.tar.gz 1933805 SHA256 f67a7abfd6d045c1e9eba2bba4199d301836bc0c6e8a727c765913aba780ee92 SHA512 860f3c86268857662bc397cd6fd0c163dfe38c77c28525c47226e22d890ec3c2df724f887f55f65a60b729e8eb5dce91ce8ecd045391d88acb1884b8dbf33c71 WHIRLPOOL 248872ad9636f60d5b4e19b5876ec1b675db02e7c755f19f3a1966aedcdeb834a092d6e678fe1ea7e06a4b5e33d2ac31739c12093c6aee8dea8147fd0d22716a -DIST dbus-1.6.18.tar.gz 1916553 SHA256 7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd SHA512 6fe295eaf4865de447d8a68c5f226dd94bb53f39d69a5752440c9dc8f244d23803937449540f632aa0c017d5ce43c6f9bc1a36cfc95519aed9df8ea30165b664 WHIRLPOOL 75d404f73fe893d83fde725d1564fc95046fdbd5d502b57c0cefef4a16d5128653397b8d7578d3839b23b7f53cb8b70729354805b240b8d5b308bb168afe1688 -DIST dbus-1.8.10.tar.gz 1864902 SHA256 10bf87fdb68815edd01d53885101dbcdd80dacad7198912cca61a4fa22dfaf8e SHA512 e6c3ad81a6f6eb966a39ee5612513809fb74b411e001ea0987ab91e3f6492d506527dca39263d2dfced726a7341a284a189ca588ee1525894ac751eee68878aa WHIRLPOOL 6b50b3296cfe3db9195541d35a7bdf88e74d1b65aa846e63e1885396b1515ac1f93e1ee6ac579db762033538f002a3a2bf12491af0b9810f20f0560beb49cb13 +-----BEGIN PGP SIGNED MESSAGE----- +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.16.tar.gz 1866436 SHA256 7f795268efd343ff0498786acb35097564390d40b1b6158daf1b4f742b522b07 SHA512 79e0fb21912fe5644e1babf96fc2a64595edef6524ef50d54f6beb8cd0f1224b8484a52a7815494b40bd00bf048176002ab35443c0bb6bd04abdc3c60599f1d5 WHIRLPOOL 5e992caf51c0fb24885099b957ce01205a249118c5db27c5161e6d45ae85a889d7f26d32dfa03a207025e87e233f74c6cffd09a5ccc44d4e598d3d535b8d4247 +EBUILD dbus-1.8.16.ebuild 6853 SHA256 834ea7c2aace81409682b21b7bf6ca1a9c956f5cb8fea38b10b47d02ef252383 SHA512 54d9035e5b59d16e66b79d6480a1065fbff7d14fbfcac34eb950d3a7e0eaea47bf9c2f536c91da2fc4da8e8637449f6d2b4ad6fe42f03e04f13062cf06b008b1 WHIRLPOOL 42e8c4bf1e630c59cbf32f45daa12656ada74f05d35515803583d26debf71defb0689077caf5c7925dc4542bec98a3caed6f0e6d197676f5dc8cee284205e641 +MISC ChangeLog 67444 SHA256 844ac34f4e4fe4c04056abeec2ee0fbeb5d6b1040c44a298d0e4998d3e6672ba SHA512 9333da0ceb6435afaf685aa68e023e5799cd5792b6cd6ac66873c3cfdf45f572fbde79f154635f60a7cb2fac521463106ea074dd11e0f54ec95dbae2d5214ea2 WHIRLPOOL 3e7c49ab32db8cd63ab27e097a4347d17f428f3754d691d44361a6374d63de01741f37c27f11c3b6bc2df9f8950f658af035079dc84c7f71e487e2f993aeb380 +MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEAREIAAYFAlUyDmEACgkQCaWpQKGI+9SQDgCfRBrjOgV+vUOn4gYb21lle2dv +Ty4AnRj1h3e2w1ujTcpvqk+tlhYztY3N +=hOke +-----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12-r4.ebuild deleted file mode 120000 index d3ae0f1716..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12-r4.ebuild +++ /dev/null @@ -1 +0,0 @@ -dbus-1.6.12.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild deleted file mode 100644 index 349216c926..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.12.ebuild,v 1.12 2013/07/04 13:40:03 ago Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit autotools eutils linux-info flag-o-matic 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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="debug doc selinux static-libs systemd test X" - -RDEPEND=">=dev-libs/expat-2 - selinux? ( - sec-policy/selinux-dbus - sys-libs/libselinux - ) - systemd? ( sys-apps/systemd:= ) - X? ( - x11-libs/libX11 - x11-libs/libXt - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - app-doc/doxygen - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) - test? ( - >=dev-libs/glib-2.24 - ${PYTHON_DEPS} - )" - -# 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 - - use test && python-any-r1_pkg_setup - - if use kernel_linux; then - CONFIG_CHECK="~EPOLL" - linux-info_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch - epatch "${FILESDIR}"/${PN}-1.6.x-add-explicit-etc-path.patch - - # 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 - - # required for asneeded patch but also for bug 263909, cross-compile so - # don't remove eautoreconf - eautoreconf -} - -src_configure() { - local myconf - - # 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. - myconf=( - --sysconfdir=/usr/share - --disable-silent-rules - --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-xml=expat - --with-session-socket-dir=/tmp - --with-system-pid-file=/var/run/dbus.pid - --with-system-socket=/var/run/dbus/system_bus_socket - --with-dbus-user=messagebus - $(use_with X x) - "$(systemd_with_unitdir)" - ) - - mkdir "${BD}" - cd "${BD}" - einfo "Running configure in ${BD}" - ECONF_SOURCE="${S}" econf "${myconf[@]}" \ - $(use_enable doc xml-docs) \ - $(use_enable doc doxygen-docs) - - if 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 -} - -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 - - if use test; then - cd "${TBD}" - einfo "Running make in ${TBD}" - emake - fi -} - -src_test() { - cd "${TBD}" - DBUS_VERBOSE=1 Xemake -j1 check -} - -src_install() { - 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.d - keepdir /etc/dbus-1/system.d - # machine-id symlink from pkg_postinst() - keepdir /var/lib/dbus - - dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO - - cd "${BD}" - emake DESTDIR="${D}" install - - 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 - 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." - fi - - # Put a "known" machine id into /etc/machine-id so that when we boot, - # if it matches, then we can override it with a unique one. - echo "42000000000000000000000000000042" > "${EROOT}"/etc/machine-id - ln -sf ../../../etc/machine-id "${EROOT}"/var/lib/dbus/machine-id -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.18-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.18-r1.ebuild deleted file mode 100644 index 9e06656b31..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.18-r1.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# 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.6.18-r1.ebuild,v 1.11 2014/03/12 10:10:31 ago 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 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="debug doc selinux static-libs systemd test X" - -RDEPEND=">=dev-libs/expat-2 - selinux? ( - sec-policy/selinux-dbus - sys-libs/libselinux - ) - systemd? ( sys-apps/systemd:= ) - 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="${RDEPEND} - virtual/pkgconfig - doc? ( - app-doc/doxygen - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) - test? ( - >=dev-libs/glib-2.24 - ${PYTHON_DEPS} - )" - -# 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() { - epatch "${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch - epatch "${FILESDIR}"/${PN}-1.6.x-add-explicit-etc-path.patch - - # 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 - - # 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=( - --sysconfdir=/usr/share - --disable-silent-rules - --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-xml=expat - --with-session-socket-dir=/tmp - --with-system-pid-file=/var/run/dbus.pid - --with-system-socket=/var/run/dbus/system_bus_socket - --with-dbus-user=messagebus - $(use_with X x) - "$(systemd_with_unitdir)" - ) - - if multilib_build_binaries; then - docconf=( - $(use_enable doc xml-docs) \ - $(use_enable doc doxygen-docs) - ) - else - docconf=( - --disable-xml-docs - --disable-doxygen-docs - ) - myconf+=( - --disable-selinux - --disable-libaudit - --disable-systemd - --without-x - - # libxml is easier to fake since it uses pkg-config - --with-xml=libxml - LIBXML_CFLAGS=' ' - LIBXML_LIBS=' ' - ) - fi - - einfo "Running configure in ${BUILD_DIR}" - ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}" - - if multilib_build_binaries && 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_build_binaries; 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_build_binaries && 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_build_binaries; 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 - - 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 - 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." - fi - - # Put a "known" machine id into /etc/machine-id so that when we boot, - # if it matches, then we can override it with a unique one. - echo "42000000000000000000000000000042" > "${EROOT}"/etc/machine-id - ln -sf ../../../etc/machine-id "${EROOT}"/var/lib/dbus/machine-id -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.10.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.16.ebuild similarity index 80% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.10.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.16.ebuild index 240c3436d8..a7fcf5479b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.10.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.8.16.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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.10.ebuild,v 1.8 2014/11/20 15:47:59 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.16.ebuild,v 1.12 2015/04/18 07:57:20 pacho Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit autotools eutils linux-info flag-o-matic multilib-minimal python-any-r1 systemd virtualx user +inherit autotools eutils linux-info flag-o-matic python-any-r1 readme.gentoo systemd virtualx user multilib-minimal DESCRIPTION="A message bus system, a simple way for applications to talk to each other" HOMEPAGE="http://dbus.freedesktop.org/" @@ -12,7 +12,7 @@ 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" +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 @@ -41,6 +41,11 @@ RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-dbus ) " +DOC_CONTENTS=" + Some applications require a session bus in addition to the system + bus. Please see \`man dbus-launch\` for more information. +" + # out of sources build dir for make check TBD=${WORKDIR}/${P}-tests-build @@ -57,8 +62,6 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-1.6.x-add-explicit-etc-path.patch - # Tests were restricted because of this sed -i \ -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \ @@ -88,7 +91,6 @@ multilib_src_configure() { # libaudit is *only* used in DBus wrt SELinux support, so disable it, if # not on an SELinux profile. myconf=( - --sysconfdir=/usr/share --localstatedir="${EPREFIX}/var" --docdir="${EPREFIX}/usr/share/doc/${PF}" --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" @@ -209,31 +211,19 @@ multilib_src_install_all() { rm -rf "${ED}"/var/run dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO + readme.gentoo_create_doc + 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 + readme.gentoo_print_elog - 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 - - # Put a "known" machine id into /etc/machine-id so that when we boot, - # if it matches, then we can override it with a unique one. - # TODO(marineam): Remove this once we double check it is safe to do so. - echo "42000000000000000000000000000042" > "${EROOT}"/etc/machine-id - ln -sf ../../../etc/machine-id "${EROOT}"/var/lib/dbus/machine-id + # 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" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch deleted file mode 100644 index 45d610c5ef..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://bugs.gentoo.org/405975 - -From e1b83fb58eadfd02227673db9a7e2833d29b0c98 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Mon, 23 Apr 2012 00:32:43 +0200 -Subject: [PATCH] selinux: when dropping capabilities only include AUDIT caps - if we have them - -When we drop capabilities we shouldn't assume we can keep -CAP_AUDIT_WRITE unconditionally, since it will not be available when -running in containers. - -This patch only adds CAP_AUDIT_WRITE to the list of caps we keep if we -actually have it in the first place. - -This makes audit/selinux enabled D-Bus work in a Linux container. ---- - bus/selinux.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bus/selinux.c b/bus/selinux.c -index 36287e9..1bfc791 100644 ---- a/bus/selinux.c -+++ b/bus/selinux.c -@@ -1053,8 +1053,9 @@ _dbus_change_to_daemon_user (const char *user, - int rc; - - capng_clear (CAPNG_SELECT_BOTH); -- capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, -- CAP_AUDIT_WRITE); -+ if (capng_have_capability (CAPNG_PERMITTED, CAP_AUDIT_WRITE)) -+ capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, -+ CAP_AUDIT_WRITE); - rc = capng_change_id (uid, gid, CAPNG_DROP_SUPP_GRP); - if (rc) - { --- -1.7.10 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml new file mode 100644 index 0000000000..70f327cffe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml @@ -0,0 +1,14 @@ + + + + freedesktop + + freedesktop-bugs@gentoo.org + + + Build with sys-apps/systemd at_console support + + + cpe:/a:freedesktop:dbus + +