summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin49390 -> 49389 bytes
-rw-r--r--sys-apps/dbus/Manifest7
-rw-r--r--sys-apps/dbus/dbus-1.14.4.ebuild (renamed from sys-apps/dbus/dbus-1.14.0-r7.ebuild)10
-rw-r--r--sys-apps/dbus/dbus-1.15.2.ebuild (renamed from sys-apps/dbus/dbus-1.12.22-r2.ebuild)64
4 files changed, 39 insertions, 42 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2172d5cbc37c..2e7aeb0b9e68 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 5c068fb16bb8..93e5554bf32b 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -9,13 +9,14 @@ AUX dbus-1.15.0-enable-elogind.patch 3045 BLAKE2B 450a63270867b1c570af595492e90a
AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a032c31ec1860c38c7a54910b3fe8da2a9bce175d01fab1c224008ba38e1981dfc161fde80f725096e644495740052e SHA512 6d07220d8c80c49057396dc76d808cad2c995cce259544e8435d0c8fe328f85ac3a7da5a88209f80a127a04b48591ac20fe661683665adca2af75fedd2563bf2
AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
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.14.4.tar.xz 1368196 BLAKE2B 7da5cd8f09eaef7a64f35f8ccbeb81c5687b3fad02d6ac05dd4c232e0f731dbcf4c76c36b615e6216815c8f8631bf9cb32543665440153a1199b1b35922cdda4 SHA512 7c8ce95b8a4c63cf51cc9f10bebbc19e66d6a96c4806befad48c3fe73b4468bb2b50f9570b73fe05ff12223e5e6815032139d316995eb670c28b23c028f293d6
DIST dbus-1.15.0.tar.xz 1391044 BLAKE2B 50cd9e5fc27f8ff53350f426d29b0ee7dd17a791e82e9d0465789c095443826d14396045c8301e73996d054e2b723b09c1c28dd392a240ed74b6c49c1369d480 SHA512 6f7e1d4ff525ce13c5f671f1b045a089c379cbfb777662ce7a55ffe4893a8ab2aaf38877a7b8f261823067a20f3b336437449eb353a97d30699496375e00bf1a
-EBUILD dbus-1.12.22-r2.ebuild 7681 BLAKE2B 126c3b7802a3ae3d1e3f928e33249f731f43bb1ad40f4992e645b727cc35e0836bd382810ef97b9f594a7db13bfa602ea13ed7c8da8c376fb9ebccc6c0ff2f47 SHA512 db95a5f1ddb86ad4657cef1e108b429976517961c374213d9b4fb158d65568bd71c1d4a67b53b6548c4349a8ed67e0ae1d7bed547678a97ef85b4db7f9b7f97c
+DIST dbus-1.15.2.tar.xz 1395516 BLAKE2B fdfaf8a1a407ddcac23ce5d22497b975b4b95e62a8afaa1ed8f5f25933ad4a113aea4a39c686c1e4a046e2a05b83ab7bb9c063f77012caaa7ecbdc8ea522259c SHA512 486eab8c4f87d75e988558724bff1b0708c969341ecb62bcb9d0b0612a653ac2674aa7caa4d129dd81c00af7989b122ee7837599262c9a0c5c7f9335ed3dacaf
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.14.4.ebuild 7779 BLAKE2B 37ea271f3179099eb18ac692e0d56d58e62b170966d734cbbc9e0515d18a9a473234eb1e27cc9e391d9e8688defda4dd333d0a0061c79539d774ca898900f23c SHA512 e24ca124186c014b8995e1b9446a1e229a0f6bcbdda357cb18b63c2b5bdb9531e50463224685a144b222bd0b3c9987ff73ebfb323ac927dc20d1796ba94616fc
EBUILD dbus-1.15.0-r1.ebuild 8035 BLAKE2B aebcb7cb128af679cf24be12450ee59cb00529218a57fe8b04c3f487e8fe85663ef9bb1a293747107fda5c55c7909de20d887a6c7c2b29a6bc6abb8bf691e1a9 SHA512 5a209e821b64c12c0d4cc114e1bf5b88d4730e527ef4c444dd60c0c5dec99cff47856a8be59f46232fe6dc5499ef7f5c1e4059be9652d2b33537728c7dcd899c
+EBUILD dbus-1.15.2.ebuild 8035 BLAKE2B aebcb7cb128af679cf24be12450ee59cb00529218a57fe8b04c3f487e8fe85663ef9bb1a293747107fda5c55c7909de20d887a6c7c2b29a6bc6abb8bf691e1a9 SHA512 5a209e821b64c12c0d4cc114e1bf5b88d4730e527ef4c444dd60c0c5dec99cff47856a8be59f46232fe6dc5499ef7f5c1e4059be9652d2b33537728c7dcd899c
MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.14.0-r7.ebuild b/sys-apps/dbus/dbus-1.14.4.ebuild
index 749b27116955..9333216aff30 100644
--- a/sys-apps/dbus/dbus-1.14.0-r7.ebuild
+++ b/sys-apps/dbus/dbus-1.14.4.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
TMPFILES_OPTIONAL=1
@@ -68,14 +68,6 @@ TBD="${WORKDIR}/${P}-tests-build"
PATCHES=(
"${FILESDIR}/dbus-enable-elogind.patch"
"${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
-
- "${FILESDIR}/dbus-1.14.0-x-autoconf-fixes.patch"
- "${FILESDIR}/dbus-1.12.22-check-fd.patch"
-
- # https://bugs.gentoo.org/836560
- "${FILESDIR}/dbus-1.14.0-oom_score_adj.patch"
-
- "${FILESDIR}/dbus-1.14.0-clang-15-configure.patch"
)
pkg_setup() {
diff --git a/sys-apps/dbus/dbus-1.12.22-r2.ebuild b/sys-apps/dbus/dbus-1.15.2.ebuild
index 78249a099180..36a64abaa510 100644
--- a/sys-apps/dbus/dbus-1.12.22-r2.ebuild
+++ b/sys-apps/dbus/dbus-1.15.2.ebuild
@@ -1,20 +1,27 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
TMPFILES_OPTIONAL=1
+# From 1.15.0 release notes:
+# "• Add a Meson build system. This is currently considered experimental,
+# but the intention is for it to replace Autotools and/or CMake in future
+# releases, preferably both. Please test!"
+# We haven't migrated to it yet as it's experimental but our elogind
+# patch needs adjusting too (and upstreaming, ideally!)
+# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/NEWS#L31
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://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
+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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 )"
@@ -31,7 +38,10 @@ BDEPEND="
COMMON_DEPEND="
>=dev-libs/expat-2.1.0
elogind? ( sys-auth/elogind )
- selinux? ( sys-libs/libselinux )
+ selinux? (
+ sys-process/audit
+ sys-libs/libselinux
+ )
systemd? ( sys-apps/systemd:0= )
X? (
x11-libs/libX11
@@ -49,7 +59,6 @@ RDEPEND="${COMMON_DEPEND}
acct-user/messagebus
selinux? ( sec-policy/selinux-dbus )
systemd? ( virtual/tmpfiles )
- X? ( sys-apps/which )
"
DOC_CONTENTS="
@@ -61,13 +70,8 @@ DOC_CONTENTS="
TBD="${WORKDIR}/${P}-tests-build"
PATCHES=(
- "${FILESDIR}/dbus-enable-elogind.patch"
- "${FILESDIR}/dbus-daemon-optional.patch" # bug #653136
-
- "${FILESDIR}/dbus-1.12.22-check-fd.patch"
-
- # https://bugs.gentoo.org/836560
- "${FILESDIR}/dbus-1.14.0-oom_score_adj.patch"
+ "${FILESDIR}/dbus-1.15.0-enable-elogind.patch"
+ "${FILESDIR}/dbus-1.15.0-daemon-optional.patch" # bug #653136
)
pkg_setup() {
@@ -80,12 +84,6 @@ pkg_setup() {
}
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
if [[ ${CHOST} == *-solaris* ]]; then
@@ -95,14 +93,16 @@ src_prepare() {
configure.ac || die
fi
- # required for bug 263909, cross-compile so don't remove eautoreconf
+ # 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
}
@@ -112,7 +112,7 @@ multilib_src_configure() {
# so we can get backtraces from apps
case ${CHOST} in
*-mingw*)
- # error: unrecognized command line option '-rdynamic' wrt #488036
+ # error: unrecognized command line option '-rdynamic', bug #488036
;;
*)
append-flags -rdynamic
@@ -123,6 +123,7 @@ multilib_src_configure() {
# not on an SELinux profile.
myconf=(
--localstatedir="${EPREFIX}/var"
+ --runstatedir="${EPREFIX}${rundir}"
$(use_enable static-libs static)
$(use_enable debug verbose-mode)
--disable-asserts
@@ -194,7 +195,7 @@ multilib_src_configure() {
multilib_src_compile() {
if multilib_is_native_abi; then
- # after the compile, it uses a selinuxfs interface to
+ # After the compile, it uses a selinuxfs interface to
# check if the SELinux policy has the right support
use selinux && addwrite /selinux/access
@@ -211,7 +212,10 @@ multilib_src_compile() {
}
src_test() {
- DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
+ # 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() {
@@ -229,25 +233,25 @@ multilib_src_install_all() {
newinitd "${T}"/dbus.initd dbus
if use X; then
- # dbus X session script (#77504)
+ # 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
- doexe "${FILESDIR}"/80-dbus
+ newexe "${FILESDIR}"/80-dbus-r1 80-dbus
fi
- # needs to exist for dbus sessions to launch
+ # 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
+ # Let the init script create the /var/run/dbus directory
rm -rf "${ED}"/var/run
- # https://bugs.gentoo.org/761763
+ # bug #761763
rm -rf "${ED}"/usr/lib/sysusers.d
- dodoc AUTHORS ChangeLog NEWS README doc/TODO
+ dodoc AUTHORS NEWS README doc/TODO
readme.gentoo_create_doc
find "${ED}" -name '*.la' -delete || die
@@ -260,7 +264,7 @@ pkg_postinst() {
tmpfiles_process dbus.conf
fi
- # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
+ # 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?
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 05:45:47 +0000