commit d2033955a90d84d8e1227eb48a52cfa96d946862 Author: Juergen Daubert <jue@jue.li> Date: Fri Feb 18 13:58:56 2022 +0100 dbus: move system_bus_socket to /run/dbus diff --git a/dbus/.footprint b/dbus/.footprint index a4886dae1..fe3d0e7b0 100644 --- a/dbus/.footprint +++ b/dbus/.footprint @@ -65,5 +65,3 @@ drwxr-xr-x root/root usr/share/dbus-1/system.d/ drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/dbus/ -drwxr-xr-x root/root var/run/ -drwxr-xr-x root/root var/run/dbus/ diff --git a/dbus/.signature b/dbus/.signature index 765e88ab5..0684227d8 100644 --- a/dbus/.signature +++ b/dbus/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XZWvxiG4l1DO8tGkMCXTAPuwiTe0B8KkkDNYH6d5Kh478SyRfw6pVY0p0FBKvqPKzVhbkOKBX/Y6uPsQdcYxAg= -SHA256 (Pkgfile) = 30943b5957a9081c64e0e99938c52a19b1e510ff3b8fcba27fac282a83f68e1d -SHA256 (.footprint) = 2e385c670cb97879a0fc8cac1e12b06bbe4591424979160f19c1a67091c4f0a8 +RWSE3ohX2g5d/YsTNFZNRQkiZ9ye8JK4n0jDOZD2+Vjw0ZGa26E1Va32KsyjdAXY6Bq/a562OQigEBHD4ZjMMwuZsk7kgkluwAg= +SHA256 (Pkgfile) = 52fcfa3f671d30d3576a005324a306de5a3b8c712366083d70e1c1eef2fff3e2 +SHA256 (.footprint) = 3a2adf0fa1e787412381c9d1df6b742cd6d171abf0ef08a5ec45a032beaeb78b SHA256 (dbus-1.12.20.tar.gz) = f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe -SHA256 (rc.dbus) = fdddf2024e2d3b684fa1fbac53200483b1e9637d5d4e720814857e80e41dd2b2 +SHA256 (rc.dbus) = 6d67e387a8b3296f7c5b88cbe5e5c4ec113ce9b36abc8da4b733aae624a6a6d6 SHA256 (30-dbus.launch) = 18ea1e79698bb876f7f5fb298daae5ff6cd17c56764b087f8da2e1d5809af37a diff --git a/dbus/Pkgfile b/dbus/Pkgfile index 180b90a20..234f13806 100644 --- a/dbus/Pkgfile +++ b/dbus/Pkgfile @@ -5,7 +5,7 @@ name=dbus version=1.12.20 -release=2 +release=3 source=(https://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz rc.dbus 30-dbus.launch) @@ -21,7 +21,8 @@ build() { --libexecdir=/usr/lib/dbus \ --with-dbus-user=messagebus \ --with-init-scripts=none \ - --with-system-pid-file=/run/$name.pid + --with-system-pid-file=/run/dbus/pid \ + --with-system-socket=/run/dbus/system_bus_socket make make DESTDIR=$PKG install @@ -30,7 +31,7 @@ build() { install -D -m 0755 $SRC/30-dbus.launch \ $PKG/etc/X11/xinit/xinitrc.d/30-dbus.launch.sh - rm -r $PKG/usr/share/doc + rm -r $PKG/usr/share/doc $PKG/var/run rm -rf $PKG/usr/lib/cmake rm -rf $PKG/usr/share/xml } diff --git a/dbus/rc.dbus b/dbus/rc.dbus index 68c272031..338431afd 100644 --- a/dbus/rc.dbus +++ b/dbus/rc.dbus @@ -5,7 +5,7 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/dbus-daemon -PID=/run/dbus.pid +PID=/run/dbus/pid OPTS="--system" case $1 in @@ -14,6 +14,7 @@ case $1 in then /usr/bin/dbus-uuidgen --ensure fi + mkdir -p /run/dbus $SSD --start --pidfile=$PID --exec $PROG -- $OPTS ;;