summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-09-27 21:10:49 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-09-27 21:10:49 +0100
commit3ca7a521e79841f7247feb67780a70722c997d55 (patch)
tree30b9afb1b822575d8e6ac4009489795a105a56ce /sys-apps
parentc268590c556cb766e1ca3f55fde8a40cdde19c44 (diff)
gentoo auto-resync : 27:09:2022 - 21:10:48
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin49386 -> 49393 bytes
-rw-r--r--sys-apps/dbus-broker/Manifest3
-rw-r--r--sys-apps/dbus-broker/dbus-broker-32.ebuild4
-rw-r--r--sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch26
-rw-r--r--sys-apps/dbus/Manifest2
-rw-r--r--sys-apps/dbus/dbus-1.14.2.ebuild290
6 files changed, 324 insertions, 1 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b390ff1018f5..4b9e4e6c3ee3 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 3ffb60e3a8f1..030cdd590fa8 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,6 +1,7 @@
+AUX dbus-broker-32-apparmor-libaudit.patch 766 BLAKE2B 4cbca2ae01f7e63048f303953a131ea2a927cc372abadd5bf2a23ef5f5618e4045ce587eb9983b3d6040a70c6f4fba10acfd775fdda62ef976b3899f141d9d36 SHA512 750f68436845765db7a7ff12b42045fb2e25f15c177e4f08ed17bd4919e60d856837a54145920c276a7dff772e32e6ce48e4f1eac803cb4cdf05fc9e49ed6c22
DIST dbus-broker-31.tar.xz 239520 BLAKE2B ba34308de7c598e72ac3874894fb90ebc6970840eb2fc193a2b3294033759b39d7d712695ddbc88c3b947842b0131e0a068ffe3cef616ce431d9a8c021f30593 SHA512 22fd53cff84e48ae1c11303b5340e16dc9b7124c9e562174c1f0af465c55d69bb8b2768063de281f6f791442126a29ab864ad6b8acf110247a500f6425eae5d9
DIST dbus-broker-32.tar.xz 248196 BLAKE2B 511159673f0e3a2260e611b85b80719506e9eafe9d93d743891be664e4a79e3ade48f6ec047fa085c414087673290d6b958eec30d3b0d27048e2c1a1521d6c10 SHA512 aa23d058771f56e6378df0a17ac413813b6350b77e61128c0887f35a546f10534b1a6d598868e9f5c642244c3632a8ce5e315e6794305a56f5abbebd36bf822c
EBUILD dbus-broker-31.ebuild 1142 BLAKE2B 8ad73709c37e5c7e6aa134cdafb5f9226114af6378fb90c32d2f8e509b2529377cbb3f51d3e49ddaef9bca544f5b1a368495059688d6c86a7d55d50b18f89f54 SHA512 07fdd1101c415cfbc43d9aa1ed51a9ff72db52ef1f5e8044d43af922f1d82e6c6c48c2b1eddbf6db85ae8266a25cdd4c897755d7711ab4e5ef7b9be16f511c5f
-EBUILD dbus-broker-32.ebuild 1168 BLAKE2B 8b47edc4c79dfbfec304ea6507aae368f32f203f5dd851e95082f0eaed0bbc28abb82aee9c35ea318b3e43e3c3e79c229fe1e2fde318ee5a1ecaa53d0ec0a53f SHA512 ad9345d70303c62ecc7e692a5bcea503209fe8f21e73ac994f8e601c17069477b5113b0f65e756b490fadb9ae1ad31d938a6f8fc439601897285daa09c9f4040
+EBUILD dbus-broker-32.ebuild 1235 BLAKE2B a58f876b3d17ab8da3cac73bab374160324743eb22bf49269b210b77394516ad0bcf2caefd7dbc4070a5d4284cfaf894fbe88987aa536b2a1e290e623cc8768e SHA512 a9be765a1e61a2757b7defa9478e5c39585e5289ec679aa1f65ca837a27a2e48842b209d1255a531bd4d965ed3ee85d2067e0b4c4e935055880c25eade4cd574
EBUILD dbus-broker-9999.ebuild 1168 BLAKE2B 8b47edc4c79dfbfec304ea6507aae368f32f203f5dd851e95082f0eaed0bbc28abb82aee9c35ea318b3e43e3c3e79c229fe1e2fde318ee5a1ecaa53d0ec0a53f SHA512 ad9345d70303c62ecc7e692a5bcea503209fe8f21e73ac994f8e601c17069477b5113b0f65e756b490fadb9ae1ad31d938a6f8fc439601897285daa09c9f4040
MISC metadata.xml 328 BLAKE2B 8d8eea6a3d5e3309106ec3e6f248c4b5cad557ccd5095794bd153cd270c5f43de508363646afce491d5e6cc3bff1dca1ca024c2e87e656401432ac2d833cca90 SHA512 971b4214d0a9f9a68ca12a309096b7345014d2e0f57e85e6e10ff0a09b533d5cafe153fa8082ac01609e3417a31afc319cb285a822194c9c672a57ce316340c4
diff --git a/sys-apps/dbus-broker/dbus-broker-32.ebuild b/sys-apps/dbus-broker/dbus-broker-32.ebuild
index 9345691d61b5..b910903b5f10 100644
--- a/sys-apps/dbus-broker/dbus-broker-32.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-32.ebuild
@@ -41,6 +41,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/dbus-broker-32-apparmor-libaudit.patch"
+)
+
if [[ ${PV} == 9999 ]]; then
src_unpack() {
git-r3_src_unpack
diff --git a/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch b/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch
new file mode 100644
index 000000000000..95bdb9a407e0
--- /dev/null
+++ b/sys-apps/dbus-broker/files/dbus-broker-32-apparmor-libaudit.patch
@@ -0,0 +1,26 @@
+From ef1c9f03a6be40474486044b6a28780d12107d9b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 26 Sep 2022 14:07:29 -0400
+Subject: [PATCH] Drop '#include <libaudit.h>' from src/util/apparmor.c
+
+This header does not seem to be required.
+Tested with -Dapparmor=true and -Daudit=true/-Daudit=false.
+
+Bug: https://bugs.gentoo.org/873082
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ src/util/apparmor.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/util/apparmor.c b/src/util/apparmor.c
+index f319ffcf..4b7a7809 100644
+--- a/src/util/apparmor.c
++++ b/src/util/apparmor.c
+@@ -8,7 +8,6 @@
+
+ #include <c-rbtree.h>
+ #include <c-stdaux.h>
+-#include <libaudit.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/apparmor.h>
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 9043c472b41b..5c068fb16bb8 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -11,9 +11,11 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
DIST dbus-1.12.22.tar.gz 2108231 BLAKE2B 40c30ad9e48d8ac6b5f1c67726015eb17cb3501372ef2c8ffcd8ad73e4a2f186b80a7bbba094460d4093d1d0a3f1bbb8d83a27724397a8f5312bb8542237e6b7 SHA512 0a716022f9d693fcaf871b6dfb5f242b49a8dd05d3316ec3e530f5129f1d81a2fa9caec795fa62cfdcba6ed21549fdd2f896f9bf1cc9a96e2a7d04f2c7ec7be6
DIST dbus-1.14.0.tar.xz 1360228 BLAKE2B ae0ebc2779e840e2d83f633029f81fba0e35969648dddce0280640dd9bee3f9508aa7fb6aef696d1c4c56d40f91b754941f847525afaee5cc3170ad23a7eddbf SHA512 9bf17a3ebb3cf44722c6fbf24ee56e9dc14d6882fc312f26c7f07459d969424bc2fb63a229139e011804ecc479a8f0eb1a0c83286f8d5a664c5979d12634179f
+DIST dbus-1.14.2.tar.xz 1362972 BLAKE2B 81c79bbdaa19b214d2462e5ebc42933b60c72c346c71e89e2b15ed17860257ec81c1dc86cd4726f7b352933b02bf5172c1466be0bc63e67a432c76d97fbbb68b SHA512 6e503385bfc1b17d4922dc6d2fb3fa10626ed306fe2b3a6a59f6cf81667c4cd63c2fc5e4fd040f48415235e9f4a75b10948ef512f022af1edab20f426271a9b4
DIST dbus-1.15.0.tar.xz 1391044 BLAKE2B 50cd9e5fc27f8ff53350f426d29b0ee7dd17a791e82e9d0465789c095443826d14396045c8301e73996d054e2b723b09c1c28dd392a240ed74b6c49c1369d480 SHA512 6f7e1d4ff525ce13c5f671f1b045a089c379cbfb777662ce7a55ffe4893a8ab2aaf38877a7b8f261823067a20f3b336437449eb353a97d30699496375e00bf1a
EBUILD dbus-1.12.22-r2.ebuild 7681 BLAKE2B 126c3b7802a3ae3d1e3f928e33249f731f43bb1ad40f4992e645b727cc35e0836bd382810ef97b9f594a7db13bfa602ea13ed7c8da8c376fb9ebccc6c0ff2f47 SHA512 db95a5f1ddb86ad4657cef1e108b429976517961c374213d9b4fb158d65568bd71c1d4a67b53b6548c4349a8ed67e0ae1d7bed547678a97ef85b4db7f9b7f97c
EBUILD dbus-1.14.0-r4.ebuild 7886 BLAKE2B 5a40cdda99f78c9a7a4d65130582960d37537bcf4c33f2a4de99331a254e297f8dface9c8bdd10d1875c48d9d78d8c88dfd0a7bf63515ce5ca01a92e0fba2824 SHA512 13023462e662c0fb261e26a61d450aa6a166d665cca12b9b33addb5effb77c635b54601952b01df456c402bd3f7fd8a047b9b591994e68fd607ff44c05d7206f
EBUILD dbus-1.14.0-r7.ebuild 8008 BLAKE2B 35dbb4a79d669f13c0cc530412ed542b1e274a61b9354c6e808be9db553ef680f7742ab643324142392b57ea4246655828ab811f2123f6a4bd353fbfe2d3b771 SHA512 533e208e95f3e8852db9e4166e935b7411877a197a963ed5ee15806e67e5db0d6639aeef748fa430c405efe49a6d823a92fc50e7efbde4e17dc9a6d946ed27fa
+EBUILD dbus-1.14.2.ebuild 7779 BLAKE2B 37ea271f3179099eb18ac692e0d56d58e62b170966d734cbbc9e0515d18a9a473234eb1e27cc9e391d9e8688defda4dd333d0a0061c79539d774ca898900f23c SHA512 e24ca124186c014b8995e1b9446a1e229a0f6bcbdda357cb18b63c2b5bdb9531e50463224685a144b222bd0b3c9987ff73ebfb323ac927dc20d1796ba94616fc
EBUILD dbus-1.15.0-r1.ebuild 8035 BLAKE2B aebcb7cb128af679cf24be12450ee59cb00529218a57fe8b04c3f487e8fe85663ef9bb1a293747107fda5c55c7909de20d887a6c7c2b29a6bc6abb8bf691e1a9 SHA512 5a209e821b64c12c0d4cc114e1bf5b88d4730e527ef4c444dd60c0c5dec99cff47856a8be59f46232fe6dc5499ef7f5c1e4059be9652d2b33537728c7dcd899c
MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.14.2.ebuild b/sys-apps/dbus/dbus-1.14.2.ebuild
new file mode 100644
index 000000000000..9333216aff30
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.14.2.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+TMPFILES_OPTIONAL=1
+
+# At least at the moment, while a CMake port exists, it's not recommended
+# for distributions.
+# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L189
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/dbus/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.xz"
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind selinux static-libs systemd test X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+ acct-user/messagebus
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.4
+ sys-devel/autoconf-archive
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+ >=dev-libs/expat-2.1.0
+ elogind? ( sys-auth/elogind )
+ selinux? (
+ sys-process/audit
+ sys-libs/libselinux
+ )
+ systemd? ( sys-apps/systemd:0= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXt
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/expat
+ test? (
+ ${PYTHON_DEPS}
+ >=dev-libs/glib-2.40:2
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-user/messagebus
+ selinux? ( sec-policy/selinux-dbus )
+ systemd? ( virtual/tmpfiles )
+"
+
+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}/dbus-enable-elogind.patch"
+ "${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+
+ if use kernel_linux; then
+ CONFIG_CHECK="~EPOLL"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ default
+
+ if [[ ${CHOST} == *-solaris* ]]; then
+ # fix standards conflict, due to gcc being c99 by default nowadays
+ sed -i \
+ -e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+ configure.ac || die
+ fi
+
+ # required for bug #263909, cross-compile so don't remove eautoreconf
+ eautoreconf
+}
+
+src_configure() {
+ local rundir=$(usex kernel_linux /run /var/run)
+
+ sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
+ > "${T}"/dbus.initd || die
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local docconf myconf testconf
+
+ # so we can get backtraces from apps
+ case ${CHOST} in
+ *-mingw*)
+ # error: unrecognized command line option '-rdynamic', bug #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"
+ --runstatedir="${EPREFIX}${rundir}"
+ $(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)
+ --disable-kqueue
+ $(use_enable elogind)
+ $(use_enable systemd)
+ $(use_enable systemd user-session)
+ --disable-embedded-tests
+ --disable-modular-tests
+ $(use_enable debug stats)
+ --with-session-socket-dir="${EPREFIX}"/tmp
+ --with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
+ --with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ --with-systemduserunitdir="$(systemd_get_userunitdir)"
+ --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-daemon
+ --disable-selinux
+ --disable-libaudit
+ --disable-elogind
+ --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}" || die
+ cd "${TBD}" || die
+ testconf=(
+ $(use_enable test asserts)
+ $(use_enable test checks)
+ $(use_enable test embedded-tests)
+ $(use_enable test stats)
+ $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+ )
+ einfo "Running configure in ${TBD}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
+ 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_TEST_MALLOC_FAILURES=0 to avoid huge test logs
+ # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/CONTRIBUTING.md#L231
+ DBUS_TEST_MALLOC_FAILURES=0 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 "${T}"/dbus.initd dbus
+
+ if use X; then
+ # dbus X session script (bug #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
+ newexe "${FILESDIR}"/80-dbus-r1 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
+
+ # bug #761763
+ rm -rf "${ED}"/usr/lib/sysusers.d
+
+ dodoc AUTHORS NEWS README doc/TODO
+ readme.gentoo_create_doc
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if use systemd; then
+ tmpfiles_process dbus.conf
+ fi
+
+ # Ensure unique id is generated and put it in /etc wrt bug #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)
+ # TODO: should be safe to remove at least the ln because of the above tmpfiles_process?
+ 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
+}