diff --git a/dbus/.SRCINFO b/dbus/.SRCINFO new file mode 100644 index 0000000000..e3d32b25fc --- /dev/null +++ b/dbus/.SRCINFO @@ -0,0 +1,61 @@ +pkgbase = dbus + pkgdesc = Freedesktop.org message bus system + pkgver = 1.16.0 + pkgrel = 1 + url = https://www.freedesktop.org/wiki/Software/dbus/ + arch = x86_64 + arch = powerpc64le + arch = powerpc64 + arch = powerpc + arch = espresso + arch = riscv64 + license = AFL-2.1 OR GPL-2.0-or-later + makedepends = docbook-xsl + makedepends = doxygen + makedepends = glib2 + makedepends = mallard-ducktype + makedepends = meson + makedepends = python + makedepends = qt5-tools + makedepends = systemd + makedepends = xmlto + makedepends = yelp-tools + depends = audit + depends = expat + depends = glibc + depends = libcap-ng + depends = systemd-libs + source = https://dbus.freedesktop.org/releases/dbus/dbus-1.16.0.tar.xz + source = https://dbus.freedesktop.org/releases/dbus/dbus-1.16.0.tar.xz.asc + source = 0001-Arch-Linux-tweaks.patch + source = dbus-reload.hook + validpgpkeys = DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90 + b2sums = a5a3ebe777c1c0296ba7240f9ed29ad329a6578a05baf10a469ce8c7d243791d35aca42a70d04cdd88feea238d081c3c8b0db444df24abcf7ce5ffe9187a0440 + b2sums = SKIP + b2sums = 3896c994aa7afde605aebb88b7123f33c578ad1ede2dc3e76982dbc021d6994874c5c735d31a66c7b3e9d3cba77ebbba7db05013716bbac14948618b1464e4a8 + b2sums = 05ab81bf72e7cf45ad943f5b84eaecef4f06bed94979c579a3e23134cbabd7ea6f65fa9ac252f8b43ceb4a3295e0d2325f06560a044fe7ddf125fc30dfc2b7e2 + +pkgname = dbus + depends = audit + depends = expat + depends = glibc + depends = libcap-ng + depends = systemd-libs + depends = libaudit.so + depends = libcap-ng.so + depends = libexpat.so + depends = libsystemd.so + provides = libdbus + provides = libdbus-1.so + conflicts = libdbus + replaces = libdbus + +pkgname = dbus-daemon-units + pkgdesc = Freedesktop.org message bus system - Service units + depends = dbus + provides = dbus-units + conflicts = dbus-broker-units + +pkgname = dbus-docs + pkgdesc = Freedesktop.org message bus system - Documentation + depends = diff --git a/dbus/.nvchecker.toml b/dbus/.nvchecker.toml new file mode 100644 index 0000000000..980dbf16eb --- /dev/null +++ b/dbus/.nvchecker.toml @@ -0,0 +1,5 @@ +[dbus] +source = "git" +git = "https://gitlab.freedesktop.org/dbus/dbus.git" +include_regex = 'dbus-\d+\.\d*[02468]\.\d+' +prefix = "dbus-" diff --git a/dbus/0001-Arch-Linux-tweaks.patch b/dbus/0001-Arch-Linux-tweaks.patch new file mode 100644 index 0000000000..94d04acf87 --- /dev/null +++ b/dbus/0001-Arch-Linux-tweaks.patch @@ -0,0 +1,43 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Tue, 17 Dec 2024 09:09:09 +0100 +Subject: [PATCH] Arch Linux tweaks + +- Remove legacy config +- Don't package runstatedir +- Use our preassigned message bus UID (81) +--- + bus/meson.build | 2 -- + bus/sysusers.d/dbus.conf.in | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/bus/meson.build b/bus/meson.build +index 176894d62c2e..0fffe8c18dbf 100644 +--- a/bus/meson.build ++++ b/bus/meson.build +@@ -84,7 +84,6 @@ if use_systemd + endif + endif + +-subdir('legacy-config') + + + libdbus_daemon_internal_sources = [ +@@ -190,7 +189,6 @@ install_emptydirs += [ + + if platform_unix + install_emptydirs += [ +- runstatedir / 'dbus', + get_option('datadir') / 'dbus-1' / 'system.d', + get_option('datadir') / 'dbus-1' / 'system-services', + ] +diff --git a/bus/sysusers.d/dbus.conf.in b/bus/sysusers.d/dbus.conf.in +index fb35702ddfb7..f01000b83158 100644 +--- a/bus/sysusers.d/dbus.conf.in ++++ b/bus/sysusers.d/dbus.conf.in +@@ -2,4 +2,4 @@ + # at boot on systemd-based systems that ship with an unpopulated + # /etc. See sysusers.d(5) for details. + +-u @DBUS_USER@ - "System Message Bus" ++u @DBUS_USER@ 81 "System Message Bus" diff --git a/dbus/PKGBUILD b/dbus/PKGBUILD index f6c0da766c..0dd9fe2db8 100644 --- a/dbus/PKGBUILD +++ b/dbus/PKGBUILD @@ -10,32 +10,39 @@ pkgname=( dbus-daemon-units dbus-docs ) -pkgver=1.14.10 -pkgrel=2.1 +pkgver=1.16.0 +pkgrel=1 pkgdesc="Freedesktop.org message bus system" -url="https://wiki.freedesktop.org/www/Software/dbus/" +url="https://www.freedesktop.org/wiki/Software/dbus/" arch=(x86_64 powerpc64le powerpc64 powerpc espresso riscv64) license=("AFL-2.1 OR GPL-2.0-or-later") depends=( audit - libcap-ng expat + glibc + libcap-ng systemd-libs ) makedepends=( docbook-xsl doxygen + glib2 + mallard-ducktype + meson python + qt5-tools systemd xmlto yelp-tools ) source=( https://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.xz{,.asc} + 0001-Arch-Linux-tweaks.patch dbus-reload.hook ) -b2sums=('f605b0810dcde6a0753384927131e7f4675be737ad7506a51261717c2622e74b99ac33cc2c199b98e5aa6b9d7c68ef692b8ee9f684f6fdab8d06c6fa861a6f6b' +b2sums=('a5a3ebe777c1c0296ba7240f9ed29ad329a6578a05baf10a469ce8c7d243791d35aca42a70d04cdd88feea238d081c3c8b0db444df24abcf7ce5ffe9187a0440' 'SKIP' + '3896c994aa7afde605aebb88b7123f33c578ad1ede2dc3e76982dbc021d6994874c5c735d31a66c7b3e9d3cba77ebbba7db05013716bbac14948618b1464e4a8' '05ab81bf72e7cf45ad943f5b84eaecef4f06bed94979c579a3e23134cbabd7ea6f65fa9ac252f8b43ceb4a3295e0d2325f06560a044fe7ddf125fc30dfc2b7e2') validpgpkeys=( DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90 # Simon McVittie @@ -43,38 +50,26 @@ validpgpkeys=( prepare() { cd dbus-$pkgver + patch -Np1 -i ../0001-Arch-Linux-tweaks.patch } build() { - local configure_options=( - --prefix=/usr - --sysconfdir=/etc - --localstatedir=/var - --libexecdir=/usr/lib/dbus-1.0 - --runstatedir=/run - --with-console-auth-dir=/run/console/ - --with-dbus-user=dbus - --with-system-pid-file=/run/dbus/pid - --with-system-socket=/run/dbus/system_bus_socket - --with-systemdsystemunitdir=/usr/lib/systemd/system - --enable-inotify - --enable-libaudit - --enable-systemd - --enable-user-session - --enable-xml-docs - --enable-doxygen-docs - --enable-ducktype-docs - --disable-static - --without-x + local meson_options=( + -D apparmor=disabled + -D dbus_user=dbus + -D kqueue=disabled + -D launchd=disabled + -D relocation=disabled + -D selinux=disabled + -D x11_autolaunch=disabled ) - cd dbus-$pkgver - ./configure "${configure_options[@]}" - make + arch-meson dbus-$pkgver build "${meson_options[@]}" + meson compile -C build } check() { - make -C dbus-$pkgver -j1 check + meson test -C build --print-errorlogs } _pick() { @@ -101,21 +96,15 @@ package_dbus() { conflicts=(libdbus) replaces=(libdbus) - cd dbus-$pkgver - DESTDIR="$pkgdir" make install - - rm -r "$pkgdir"/{etc,var} + meson install -C build --destdir "$pkgdir" _pick unit "$pkgdir"/usr/lib/systemd/{system,user}/dbus.service _pick docs "$pkgdir"/usr/share/doc - # We have a pre-assigned uid (81) - echo 'u dbus 81 "System Message Bus"' | - install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf" + install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook - install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook - - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 \ + dbus-$pkgver/COPYING dbus-$pkgver/LICENSES/AFL-2.1.txt } package_dbus-daemon-units() { @@ -125,6 +114,9 @@ package_dbus-daemon-units() { conflicts=(dbus-broker-units) mv unit/* "$pkgdir" + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s dbus "$pkgdir/usr/share/licenses/$pkgname" } package_dbus-docs() { @@ -132,6 +124,9 @@ package_dbus-docs() { depends=() mv docs/* "$pkgdir" + + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 \ + dbus-$pkgver/COPYING dbus-$pkgver/LICENSES/AFL-2.1.txt } # vim:set sw=2 sts=-1 et: diff --git a/dbus/keys/pgp/DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90.asc b/dbus/keys/pgp/DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90.asc index 918e478595..edbf31adcd 100644 --- a/dbus/keys/pgp/DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90.asc +++ b/dbus/keys/pgp/DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90.asc @@ -134,17 +134,75 @@ uZ+ZLztvXE8obbOOLDWSFbWB4NUQBqAtxIKloIvMUFE0WIqCgIs/zIIcoUJRn8vk 02jm/zaO82myoGzRvivZdztZlCGtsJjsLdbm4dzP0oywdOXeS0YqWjiDuNNLbye0 I9fVRvKojr0ban/vx42cUy91CloBtjoNuCWqpmqzTdFB7xc7PWMNxQ6VpSjcsKH8 3O7pw5/pLLXdY4sl/SdRHFUHjhS+uGfceL4jABEBAAGJAjwEGAEKACYCGwwWIQTa -mPJcCHHEmlnq/yxN6P8qY8fMkAUCY5+TXAUJHV2MhQAKCRBN6P8qY8fMkAWHD/0f -g/pKB4sc7eXtJa4SgaBCSzmOCPUqWCieYe3t8tOOBqbw4GJc5pxgu+VigvcsqVfU -VxjuOT9CabuM1+1COM379cgn0c8xyguSTNN9d1E0uswCBRuUuCWt9CI+XJXl6c9/ -KsodBRDFmLsX6OkLexoFOGL8a9pb8JD4pizr3FsQt+iVHhT+llo1ubGVHsh0J6FX -+k3f3cc/ozsxYZiDIYnzaLIgG+tIKvAoN2LYk4lEp+BMkWUtpILs2dHCqda6Ovqb -VNgmMiQ/REI0UvtYIZNeyytnhakY3cKJBgyKu+NDvvNArZuWFs5yUjZql/a2k41B -gzBuuKGBRLRNLUZcV4iqzhIMJ8WTdnUP3YSZ1rQekcraE5YpFgDrRduuf3ISJP0E -YwcncESjMq49mXk5FcfZ4Tp7BjVz1wy/mw3JJCWVF6xA94BIs1ku0dsfwFzxp4r0 -z9GGjXCA7tAwPXyuAUHkOe85eJ7+mrmAl1tkH8QegHIvl0mfWQQoNYZeyHGa4Amm -2QhLComJhK7u/SGd81F3IFJxgsKvDrIGp8c3X8j6o/oMbnVxSEz9Dn0M6wk2QhSC -DHvLekzmeUWyyvynoDDeG2+8b3UY7BZA5DixOkF39Ds6wGXMVXEgl+SVXLj7JcCK -2LL4Ng+zt+qKDbleFYczRbhwS0UlNayS44NjJ8XxRA== -=MQ7V +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 +PmCTRmiTd2KDK+AlIQF7jrp3lw== +=Ysqc -----END PGP PUBLIC KEY BLOCK-----