diff options
Diffstat (limited to 'sys-apps/dbus')
| -rw-r--r-- | sys-apps/dbus/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-1.12.12-r1.ebuild (renamed from sys-apps/dbus/dbus-1.12.12.ebuild) | 48 | ||||
| -rw-r--r-- | sys-apps/dbus/files/dbus-daemon-optional.patch | 75 |
3 files changed, 97 insertions, 29 deletions
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index 6b1c75732a23..001e00f758d8 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -1,4 +1,5 @@ AUX 80-dbus 341 BLAKE2B 20849eb7c526475d3ff96766ac7183608aa51e5c069f07cf282a2b4d884b2a8580aa88cff182d54ef75aaa747848f3dbcc0bd0bd5da124e4a259851878c73b00 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89 +AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a032c31ec1860c38c7a54910b3fe8da2a9bce175d01fab1c224008ba38e1981dfc161fde80f725096e644495740052e SHA512 6d07220d8c80c49057396dc76d808cad2c995cce259544e8435d0c8fe328f85ac3a7da5a88209f80a127a04b48591ac20fe661683665adca2af75fedd2563bf2 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9 DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7b1728e6a7658d606550923d2bd60a6a6916c0fcd88205ecdc4a25ab58309bdcabaeb32c2f6c5e4ef8686af02c SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed @@ -6,5 +7,5 @@ DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5 DIST dbus-1.12.12.tar.gz 2077301 BLAKE2B 6245559fc3419bfdca1bdb2da7f6f5a34e5377dc67e0c8ecb7a87914ea65d044a95be59b749d9cfef7008ad09854b549b86863ca987b8a3949cf0d58cc5a2cb6 SHA512 51af4e86ab7d36e1c9a861164e7cd7aa1605fdd82f90aed8728b34c45a87864a00671de9db00d88ea6f96be97459c7eb53d2517ea9d9687ae9ebf81c58c3a80f EBUILD dbus-1.10.18.ebuild 7366 BLAKE2B ec30593cceffe5a927529a64a895e4ab3913aacce6d9a6aeea54e613c38f4b557c81b7b3a7c968ce2f08e9d019f17d15c56dd4ab51b3014ed3f2d382328e14ce SHA512 1a8ee80dd263512afa76aeea6e0442b6c8fc58c69c6c3c04b760772d15964bbdc5ca4172af6bb5d5d1669514e56a4dedb73dc534f91e33609e2a85d3ec1167f5 EBUILD dbus-1.10.24.ebuild 7373 BLAKE2B 21ad1bff164e2e67786c1e9b7f74c5c9772316429763bf2dc597c2c85fe6b3706d6f87c20cbfe55c0f297dc99342bc58c6b2ab7e443dfefe1d1b4652c9de3bff SHA512 b820553d81073c0bfd754c56014a40639d26ccf6a42c967f97c74c7c4d71be96b5b534f616caded46774d5d29693985fffdecde10d401f30803b39da4400aca1 -EBUILD dbus-1.12.12.ebuild 7871 BLAKE2B 525ba456389035b775f0551c0f59a5ab58efa223764ad69285d50af489058dbd1ce24b1d85a5dda1b732e16359ade9d52fef3357f6944ff7c42b20e5da95666c SHA512 0e87e63a2ca596c959ed778acd2af9052476ff949a790e1a74bbc928c71d23f0780cd6de744e0c79a0959f1fe0504b65c0aada91d2c5f937841ce9e8e6b66323 +EBUILD dbus-1.12.12-r1.ebuild 7776 BLAKE2B 7cc3688e83c6f5b01f2e7879d7c996e5fef9d2e0ddf1c5f2f792fb5248c6b103672d6f3de9d9b99d5a5f0231186602bac39f59cba8b134fdbc756f2b4d68c1be SHA512 ae25929a3f1684fb3b2eaca3b74ddbd26133ed6fd740693a2a87cd4421d359448e1aadedbb351d1ecca05628f664976a135450835be42d98b5f8fa80ba88dca9 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738 diff --git a/sys-apps/dbus/dbus-1.12.12.ebuild b/sys-apps/dbus/dbus-1.12.12-r1.ebuild index ff2be5242806..05d5e0161a2f 100644 --- a/sys-apps/dbus/dbus-1.12.12.ebuild +++ b/sys-apps/dbus/dbus-1.12.12-r1.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) -inherit autotools linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal +PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +inherit autotools flag-o-matic linux-info 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/" @@ -12,47 +12,41 @@ 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc elogind selinux static-libs systemd test user-session X" -#RESTRICT="test" +REQUIRED_USE="?? ( elogind systemd )" -REQUIRED_USE=" - ?? ( elogind systemd ) +# autoconf-archive-2019.01.06 blocker added for bug #674830 +# Please check on bumps if the blocker is still necessary. +BDEPEND=" + app-text/xmlto + app-text/docbook-xml-dtd:4.4 + <sys-devel/autoconf-archive-2019.01.06 + virtual/pkgconfig + doc? ( app-doc/doxygen ) " - -CDEPEND=" +COMMON_DEPEND=" >=dev-libs/expat-2.1.0 - selinux? ( sys-libs/libselinux ) elogind? ( sys-auth/elogind ) + selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt - ) + ) " -# autoconf-archive-2019.01.06 blocker added for bug #674830 -# Please check on bumps if the blocker is still necessary. -DEPEND="${CDEPEND} - <sys-devel/autoconf-archive-2019.01.06 - app-text/xmlto - app-text/docbook-xml-dtd:4.4 +DEPEND="${COMMON_DEPEND} dev-libs/expat - sys-devel/autoconf-archive - doc? ( app-doc/doxygen ) test? ( - >=dev-libs/glib-2.40:2 ${PYTHON_DEPS} + >=dev-libs/glib-2.40:2 ) " -RDEPEND="${CDEPEND} +RDEPEND="${COMMON_DEPEND} selinux? ( sec-policy/selinux-dbus ) " -BDEPEND=" - virtual/pkgconfig -" - DOC_CONTENTS=" Some applications require a session bus in addition to the system bus. Please see \`man dbus-launch\` for more information. @@ -63,6 +57,7 @@ TBD="${WORKDIR}/${P}-tests-build" PATCHES=( "${FILESDIR}/${PN}-enable-elogind.patch" + "${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136 ) pkg_setup() { @@ -157,15 +152,12 @@ multilib_src_configure() { --disable-doxygen-docs ) myconf+=( + --disable-daemon --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 diff --git a/sys-apps/dbus/files/dbus-daemon-optional.patch b/sys-apps/dbus/files/dbus-daemon-optional.patch new file mode 100644 index 000000000000..353dcb5761be --- /dev/null +++ b/sys-apps/dbus/files/dbus-daemon-optional.patch @@ -0,0 +1,75 @@ +From 3c08d28fbae8b0ef3839ef26f8d2a713a9a684f9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 21 Feb 2019 23:53:19 +0100 +Subject: [PATCH] Make dbus daemon build optional + +--- + bus/Makefile.am | 2 ++ + configure.ac | 17 ++++++++++++++++- + 2 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/bus/Makefile.am b/bus/Makefile.am +index 9ae3071..26a770c 100644 +--- a/bus/Makefile.am ++++ b/bus/Makefile.am +@@ -70,6 +70,7 @@ agentdir=$(LAUNCHD_AGENT_DIR) + agent_DATA=org.freedesktop.dbus-session.plist + endif + ++if DBUS_DAEMON + if DBUS_BUS_ENABLE_KQUEUE + DIR_WATCH_SOURCE=dir-watch-kqueue.c + else +@@ -241,6 +242,7 @@ test_bus_LDADD = \ + $(top_builddir)/dbus/libdbus-internal.la \ + $(DBUS_BUS_LIBS) \ + $(NULL) ++endif DBUS_DAEMON + + install-data-hook: + $(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/session.d +diff --git a/configure.ac b/configure.ac +index be6b065..854e846 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -202,6 +202,7 @@ AC_ARG_ENABLE([apparmor], + [enable_apparmor=$enableval], + [enable_apparmor=auto]) + AC_ARG_ENABLE(libaudit,AS_HELP_STRING([--enable-libaudit],[build audit daemon support for SELinux]),enable_libaudit=$enableval,enable_libaudit=auto) ++AC_ARG_ENABLE(daemon, AS_HELP_STRING([--enable-daemon],[build with the dbus daemon]),enable_daemon=$enableval,enable_daemon=yes) + AC_ARG_ENABLE(inotify, AS_HELP_STRING([--enable-inotify],[build with inotify support (linux only)]),enable_inotify=$enableval,enable_inotify=auto) + 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) +@@ -830,7 +831,20 @@ AC_CHECK_FUNCS(getpeerucred getpeereid) + + AC_CHECK_FUNCS(pipe2 accept4) + +-PKG_CHECK_MODULES([EXPAT], [expat]) ++# dbusdaemon checks ++if test x$enable_daemon = xno ; then ++ have_daemon=no ++else ++ have_daemon=yes ++fi ++ ++dnl check if daemon shall be built ++if test x$have_daemon = xyes; then ++ AC_DEFINE(DBUS_DAEMON,1,[Use daemon]) ++ PKG_CHECK_MODULES([EXPAT], [expat]) ++fi ++ ++AM_CONDITIONAL(DBUS_DAEMON, test x$have_daemon = xyes) + + save_cflags="$CFLAGS" + save_libs="$LIBS" +@@ -1824,6 +1838,7 @@ echo " + Building bus stats API: ${enable_stats} + Building SELinux support: ${have_selinux} + Building AppArmor support: ${have_apparmor} ++ Building daemon: ${have_daemon} + Building inotify support: ${have_inotify} + Building kqueue support: ${have_kqueue} + Building systemd support: ${have_systemd} +-- +2.20.1 + |