From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- sys-apps/dbus/Manifest | 12 ++ sys-apps/dbus/dbus-1.10.18.ebuild | 274 ++++++++++++++++++++++++++ sys-apps/dbus/dbus-1.10.22.ebuild | 270 +++++++++++++++++++++++++ sys-apps/dbus/dbus-1.10.24.ebuild | 272 +++++++++++++++++++++++++ sys-apps/dbus/files/80-dbus | 13 ++ sys-apps/dbus/files/dbus-enable-elogind.patch | 73 +++++++ sys-apps/dbus/files/dbus.initd-r1 | 36 ++++ sys-apps/dbus/metadata.xml | 15 ++ 8 files changed, 965 insertions(+) create mode 100644 sys-apps/dbus/Manifest create mode 100644 sys-apps/dbus/dbus-1.10.18.ebuild create mode 100644 sys-apps/dbus/dbus-1.10.22.ebuild create mode 100644 sys-apps/dbus/dbus-1.10.24.ebuild create mode 100644 sys-apps/dbus/files/80-dbus create mode 100644 sys-apps/dbus/files/dbus-enable-elogind.patch create mode 100644 sys-apps/dbus/files/dbus.initd-r1 create mode 100644 sys-apps/dbus/metadata.xml (limited to 'sys-apps/dbus') diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest new file mode 100644 index 000000000000..4f0a0e5ceed2 --- /dev/null +++ b/sys-apps/dbus/Manifest @@ -0,0 +1,12 @@ +AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89 WHIRLPOOL 74e9e79b86fc4802f34737bb47c3a71919f35fb2375119cdcd7fd6dae2de201e006fb4e6a978addd2300f7075180d4b088a69fa60d2ce4d689b6239b4a1307b1 +AUX dbus-enable-elogind.patch 2801 SHA256 faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0 SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a WHIRLPOOL 728386f60ca307cfaad68096358f619936e0b73d9bf368d7473d154178b5ede5fc0c56581a63e21d253a44ed3e4aa6503d5e16a838931f8ba7944486aa85ee15 +AUX dbus.initd-r1 852 SHA256 00a1a8f254d4f40b6f98a2777809b9c45ad81c4aeb4c0592793dd839777990bd SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9 WHIRLPOOL 80e47f97e3d7811725115cc259f04308ac8aae3a6f7dc3c7205e03fa68a84a32ebe12f46d19991d40b4cc4b5a65d999391a7db2bcb8b9209239c515872dc0e4f +DIST dbus-1.10.18.tar.gz 1986589 SHA256 6049ddd5f3f3e2618f615f1faeda0a115104423a7996b7aa73e2f36e38cc514a SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed WHIRLPOOL ee164e1f6de80595fbfbcbad65d78dab4b91b5ec4e1ce88e1c4015f1c1b531f09796d54db163b2c2eceb3b92261f8a57852d2e0b29f71d9c65f9b91684433d9e +DIST dbus-1.10.22.tar.gz 1989350 SHA256 e2b1401e3eedc7b5c9a2034d31254c886e1fcbc7858006e0a1c59158fe4b7b97 SHA512 c5c0040717ecef66b788c5bcda94463c079502b5004639b3c1e93bb92b4de5d9be8b3fe43e18843f1d9e50411f742ba8a869375b57d479882f8aee46b613c545 WHIRLPOOL efc4a6efc78ac5ce3ba34b512ef4d74fb5f3cda563b4dcead1baf4f2d77d578fb54e8f9e69c1aa6ddf5f776bc050be69f1086428f293c0032f47acbaf66669eb +DIST dbus-1.10.24.tar.gz 1991358 SHA256 71184eb27638e224579ffa998e88f01d0f1fef17a7811406e53350735eaecd1b SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c WHIRLPOOL a155789d60ee4d92defbf0952310d92f8ed5b51fc9c41d1c0df4e6fbebed363d8a6c526bd9c4a136a4e1c1d2eb3cd00fdfd7bfdceb8defe4b589f4cd9d90489d +EBUILD dbus-1.10.18.ebuild 7511 SHA256 a91cb39f5704feb7497545c4d770e612c968ceb78936a97aef580c8d600c6778 SHA512 1623a683105edaf9f495b18ca770ff788e528302a50235fe584b9eab2b91cd655a5ed0eb3b3e60ca810382a7637a7bdfa736b8b1129a86e56e4040bb16a4d81b WHIRLPOOL b6380ab4f4f40e53fd53818b65a811c1741f4067e266703a544cee116ad1c188134739974f0856ec0ebd80bb6204a19e003525de8be19b8070368a52df86a0fc +EBUILD dbus-1.10.22.ebuild 7399 SHA256 fb0ed8f765e4ac9838db61efd5a4e1dec90f6db5abf19675988eac796628e40f SHA512 47928864e7bad3b9fecd146ff1f876d21d3f18b34d2667c40153160906633a915c54a8a20f0d3c12c18f432f6dd0764e2cb61f4433a7bbace908ffd8d0955bb1 WHIRLPOOL 533a927597fc777912a1fe37f4287d626263c555b9f34e068bc0289eeb672fefdd743719555c4adf28bef884b1f3de5f77b522110e60f339e339249bb233b8b0 +EBUILD dbus-1.10.24.ebuild 7400 SHA256 5f87bf90da7ab2d808cee299ab05c11c1e8fe5294235bf2de71ce1d2e612e3c0 SHA512 4bede00f1cee6da6680303d989331773838530783921d0ffa8a7d2b1876a4856d2b6db13fbf38dbd66ab8f40375cc7e10648ee6d1ef0948781ed9d04793485ba WHIRLPOOL a3e2897ac8fd90c8282cb92b6ac3e662a5228e8a8e4cc6e3fccc8df9cacc44b83d9937679039e7ca328b42c8414991a8df28c33d2af38fe7dc6752e4a762978b +MISC ChangeLog 9352 SHA256 8e03346e0ae584eb88d682c055d933a48e391f6c9c727ea63532bf36d48879a9 SHA512 d430313fcde1019c4d7fb17c8cc2c963b09724735c1a8749d0f4589be5938a9c4c782eb81f8c02e2fa5cb7f0b78a43cd72bcb39c794d01073f36f272c56b72fb WHIRLPOOL 4ce3bc545c5c97af2add27f6fa052aa5d2c6869f8785cbfcd61f6e98dfe6b1708c93a95ae3056dc2d54d3b142c015f15bbab365f57e3635901194c9321e8148c +MISC ChangeLog-2015 67682 SHA256 486a3ac56b453a793052b5aa08f3b744c3fce8a9dfa4c4f6b346d7d5941ddb51 SHA512 78be573f852f7a79cc5a13457b1bf22fb4310808a886618614e570ffbf40589a8c68b49478c8662577c2188bbb17a20c8d003c8804173334338f92e6d16c2051 WHIRLPOOL 379bc4232b10c300020793f142b83264bcc7376585eb7359dcdcf71d48253dc5d5f3aeb175a5eb311246ffad9e247e25971a33237ed5c7d372a4ce5d66d81913 +MISC metadata.xml 595 SHA256 6d305cf7793900dc499713dac0ed55f3214a75ad77fb1810c5818edeb3cbbe67 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738 WHIRLPOOL 89fc7303a15a510e2ec4bf90f05e7525de34f8d88f2f5125573cc4a735b5299836007dde76ba75307a4ea1fc84042c37396e6cc3daf4f23197422fce05058403 diff --git a/sys-apps/dbus/dbus-1.10.18.ebuild b/sys-apps/dbus/dbus-1.10.18.ebuild new file mode 100644 index 000000000000..3bd2f2d691d0 --- /dev/null +++ b/sys-apps/dbus/dbus-1.10.18.ebuild @@ -0,0 +1,274 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eutils linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal + +DESCRIPTION="A message bus system, a simple way for applications to talk to each other" +HOMEPAGE="https://dbus.freedesktop.org/" +SRC_URI="https://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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="debug doc elogind selinux static-libs systemd test user-session X" + +RESTRICT="test" + +REQUIRED_USE="?? ( elogind systemd )" + +CDEPEND=" + >=dev-libs/expat-2 + selinux? ( + sys-libs/libselinux + ) + elogind? ( sys-auth/elogind ) + 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.36:2 + ${PYTHON_DEPS} + ) +" +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 + +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 + + eapply "${FILESDIR}/${PN}-enable-elogind.patch" + + eapply_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) + --disable-apparmor + $(use_enable kernel_linux inotify) + $(use_enable kernel_FreeBSD kqueue) + $(use_enable elogind) + $(use_enable systemd) + $(use_enable user-session) + --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-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-dbus-user=messagebus + $(use_with X x) + ) + + 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-elogind + --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-r1 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 + readme.gentoo_create_doc + + prune_libtool_files --all +} + +pkg_postinst() { + readme.gentoo_print_elog + + # 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 "${EPREFIX}"/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 + + if use user-session; then + ewarn "You have enabled user-session. Please note this can cause" + ewarn "bogus behaviors in several dbus consumers that are not prepared" + ewarn "for this dbus activation method yet." + ewarn + ewarn "See the following link for background on this change:" + ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html" + ewarn + ewarn "Known issues are tracked here:" + ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028" + fi +} diff --git a/sys-apps/dbus/dbus-1.10.22.ebuild b/sys-apps/dbus/dbus-1.10.22.ebuild new file mode 100644 index 000000000000..cbd855261fc8 --- /dev/null +++ b/sys-apps/dbus/dbus-1.10.22.ebuild @@ -0,0 +1,270 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) + +inherit autotools ltprune linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal + +DESCRIPTION="A message bus system, a simple way for applications to talk to each other" +HOMEPAGE="https://dbus.freedesktop.org/" +SRC_URI="https://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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="debug doc elogind selinux static-libs systemd test user-session X" + +#RESTRICT="test" + +REQUIRED_USE=" + ?? ( elogind systemd ) + test? ( debug ) +" + +CDEPEND=" + >=dev-libs/expat-2 + selinux? ( sys-libs/libselinux ) + elogind? ( sys-auth/elogind ) + systemd? ( sys-apps/systemd:0= ) + X? ( + x11-libs/libX11 + x11-libs/libXt + ) +" +DEPEND="${CDEPEND} + app-text/xmlto + app-text/docbook-xml-dtd:4.4 + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( + >=dev-libs/glib-2.36:2 + ${PYTHON_DEPS} + ) +" +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" + +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 + + eapply "${FILESDIR}/${PN}-enable-elogind.patch" + + eapply_user + + # required 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) + --disable-apparmor + $(use_enable kernel_linux inotify) + $(use_enable kernel_FreeBSD kqueue) + $(use_enable elogind) + $(use_enable systemd) + $(use_enable user-session) + --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-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-dbus-user=messagebus + $(use_with X x) + ) + + 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-elogind + --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 virtx emake -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-r1 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 + readme.gentoo_create_doc + + prune_libtool_files --all +} + +pkg_postinst() { + readme.gentoo_print_elog + + # 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 "${EPREFIX%/}"/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 + + if use user-session; then + ewarn "You have enabled user-session. Please note this can cause" + ewarn "bogus behaviors in several dbus consumers that are not prepared" + ewarn "for this dbus activation method yet." + ewarn + ewarn "See the following link for background on this change:" + ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html" + ewarn + ewarn "Known issues are tracked here:" + ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028" + fi +} diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild new file mode 100644 index 000000000000..4a700ffad463 --- /dev/null +++ b/sys-apps/dbus/dbus-1.10.24.ebuild @@ -0,0 +1,272 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) + +inherit autotools ltprune linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal + +DESCRIPTION="A message bus system, a simple way for applications to talk to each other" +HOMEPAGE="https://dbus.freedesktop.org/" +SRC_URI="https://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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="debug doc elogind selinux static-libs systemd test user-session X" + +#RESTRICT="test" + +REQUIRED_USE=" + ?? ( elogind systemd ) + test? ( debug ) +" + +CDEPEND=" + >=dev-libs/expat-2 + selinux? ( sys-libs/libselinux ) + elogind? ( sys-auth/elogind ) + systemd? ( sys-apps/systemd:0= ) + X? ( + x11-libs/libX11 + x11-libs/libXt + ) +" +DEPEND="${CDEPEND} + app-text/xmlto + app-text/docbook-xml-dtd:4.4 + virtual/pkgconfig + doc? ( app-doc/doxygen ) + test? ( + >=dev-libs/glib-2.36:2 + ${PYTHON_DEPS} + ) +" +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" + +PATCHES=( + "${FILESDIR}/${PN}-enable-elogind.patch" +) + +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 + + default + + # required 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) + --disable-apparmor + $(use_enable kernel_linux inotify) + $(use_enable kernel_FreeBSD kqueue) + $(use_enable elogind) + $(use_enable systemd) + $(use_enable user-session) + --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-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-dbus-user=messagebus + $(use_with X x) + ) + + 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-elogind + --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 virtx emake -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-r1 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 + readme.gentoo_create_doc + + prune_libtool_files --all +} + +pkg_postinst() { + readme.gentoo_print_elog + + # 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 "${EPREFIX%/}"/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 + + if use user-session; then + ewarn "You have enabled user-session. Please note this can cause" + ewarn "bogus behaviors in several dbus consumers that are not prepared" + ewarn "for this dbus activation method yet." + ewarn + ewarn "See the following link for background on this change:" + ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html" + ewarn + ewarn "Known issues are tracked here:" + ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028" + fi +} diff --git a/sys-apps/dbus/files/80-dbus b/sys-apps/dbus/files/80-dbus new file mode 100644 index 000000000000..5593e2cd7390 --- /dev/null +++ b/sys-apps/dbus/files/80-dbus @@ -0,0 +1,13 @@ +#!/bin/bash + +# launches a session dbus instance + +dbuslaunch="`which dbus-launch 2>/dev/null`" +if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + if [ -n "$command" ]; then + command="$dbuslaunch --exit-with-session $command" + else + eval `$dbuslaunch --sh-syntax --exit-with-session` + fi +fi + diff --git a/sys-apps/dbus/files/dbus-enable-elogind.patch b/sys-apps/dbus/files/dbus-enable-elogind.patch new file mode 100644 index 000000000000..5cb5d649cd91 --- /dev/null +++ b/sys-apps/dbus/files/dbus-enable-elogind.patch @@ -0,0 +1,73 @@ +--- a/dbus/dbus-userdb-util.c 2015-09-30 16:48:40.000000000 +0200 ++++ b/dbus/dbus-userdb-util.c 2016-11-03 11:09:42.550520587 +0100 +@@ -32,6 +32,9 @@ + #if HAVE_SYSTEMD + #include + #endif ++#if HAVE_ELOGIND ++#include ++#endif + + /** + * @addtogroup DBusInternalsUtils +@@ -54,7 +57,7 @@ + const DBusUserInfo *info; + dbus_bool_t result = FALSE; + +-#ifdef HAVE_SYSTEMD ++#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND) + /* check if we have logind */ + if (access ("/run/systemd/seats/", F_OK) >= 0) + { +--- a/configure.ac 2016-11-03 11:13:58.286528265 +0100 ++++ b/configure.ac 2016-11-03 11:22:11.210543063 +0100 +@@ -185,6 +185,7 @@ + AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto) + AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto) + AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto) ++AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto) + AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto) + + AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install])) +@@ -1184,6 +1185,24 @@ + + AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes) + ++dnl elogind detection ++if test x$enable_elogind = xno ; then ++ have_elogind=no; ++else ++ PKG_CHECK_MODULES([ELOGIND], ++ [libelogind >= 209], ++ [have_elogind=yes], ++ [have_elogind=no]) ++fi ++ ++if test x$have_elogind = xyes; then ++ AC_DEFINE(HAVE_ELOGIND,1,[Have elogind]) ++fi ++ ++if test x$enable_elogind = xyes -a x$have_elogind != xyes ; then ++ AC_MSG_ERROR([Explicitly requested elogind support, but libelogind not found]) ++fi ++ + dnl systemd detection + if test x$enable_systemd = xno ; then + have_systemd=no; +@@ -1290,7 +1309,7 @@ + fi + + #### Set up final flags +-LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS" ++LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS $ELOGIND_LIBS" + AC_SUBST([LIBDBUS_LIBS]) + + ### X11 detection +@@ -1949,6 +1968,7 @@ + Building AppArmor support: ${have_apparmor} + Building inotify support: ${have_inotify} + Building kqueue support: ${have_kqueue} ++ Building elogind support: ${have_elogind} + Building systemd support: ${have_systemd} + Building X11 code: ${have_x11} + Building Doxygen docs: ${enable_doxygen_docs} diff --git a/sys-apps/dbus/files/dbus.initd-r1 b/sys-apps/dbus/files/dbus.initd-r1 new file mode 100644 index 000000000000..bd3542381a7a --- /dev/null +++ b/sys-apps/dbus/files/dbus.initd-r1 @@ -0,0 +1,36 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +extra_started_commands="reload" + +description="An IPC message bus daemon" +pidfile="/var/run/dbus.pid" +command="/usr/bin/dbus-daemon" +command_args="--system" + +dbus_socket="/var/run/dbus/system_bus_socket" + +depend() { + need localmount + after bootmisc +} + +start_pre() { + /usr/bin/dbus-uuidgen --ensure=/etc/machine-id + + # We need to test if /var/run/dbus exists, since script will fail if it does not + checkpath -q -d /var/run/dbus +} + +stop_post() { + [ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}" +} + +reload() { + ebegin "Reloading D-BUS messagebus config" + /usr/bin/dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + eend $? +} diff --git a/sys-apps/dbus/metadata.xml b/sys-apps/dbus/metadata.xml new file mode 100644 index 000000000000..a8736a778169 --- /dev/null +++ b/sys-apps/dbus/metadata.xml @@ -0,0 +1,15 @@ + + + + + freedesktop-bugs@gentoo.org + + + Use sys-auth/elogind for session tracking. + Build with sys-apps/systemd at_console support + Enable user-session semantics for session bus under systemd + + + cpe:/a:freedesktop:dbus + + -- cgit v1.2.3