Commit e42f0cd4 authored by Jakub Jirutka's avatar Jakub Jirutka 🇺🇦
Browse files

main/dbus: replace deprecated /var/run with /run

...and also move configured dbus.pid from /run to /run/dbus, to avoid
potential conflict with pid file managed by OpenRC.
parent ebb342a9
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dbus
pkgver=1.12.20
pkgrel=2
pkgrel=3
pkgdesc="Freedesktop.org message bus system"
url="https://www.freedesktop.org/Software/dbus"
arch="all"
......@@ -50,7 +50,7 @@ build() {
--localstatedir=/var \
--with-xml=expat \
--with-dbus-user=messagebus \
--with-system-pid-file=/var/run/dbus.pid \
--with-system-pid-file=/run/dbus/dbus.pid \
--disable-verbose-mode \
--disable-static \
--enable-inotify \
......@@ -89,7 +89,9 @@ x11() {
amove usr/bin/dbus-launch
}
sha512sums="0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056 dbus-1.12.20.tar.gz
sha512sums="
0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056 dbus-1.12.20.tar.gz
3db35499361e84d8e2469b88b033f49813b179188ac25f1841a989988c352af398a56dfd94383813626c6dfd032194f7a9fcdba001ccc3e005e7cd22dae7a7ed 0001-_dbus_generate_random_bytes-use-getrandom-2.patch
cdd01f51882be4f388515441237aa6318888db6e88a4d980bafbf9b790945e4d959c6633d6d002274c0a617ac919f9355ba628c9b502b355f73fed602f997791 avoid-opendir-between-fork-exec.patch
4c6beba2382416e60a3adfa85ef843d90d93ca5f38c23f573e058ffca6d4fc3850d11d40938c74383bba61599569b7fdfb1fcf3b9d2f1463e6b2e2cc81097c84 dbus.initd"
b457f8a2d2c7f9cd3cd32c6dd23cdf5598a6db2ec6e007471383159a775d29950016699037948c07011d7b7d49723026c1c05f627536bc88947c39e4529e8c4e dbus.initd
"
......@@ -22,11 +22,11 @@ start_pre() {
/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
# We need to test if /var/run/dbus exists, since script will fail if it does not
[ -e /var/run/dbus ] || mkdir /var/run/dbus
[ -e /run/dbus ] || mkdir /run/dbus
}
stop_post() {
[ ! -S /var/run/dbus/system_bus_socket ] || rm -f /var/run/dbus/system_bus_socket
[ ! -S /run/dbus/system_bus_socket ] || rm -f /run/dbus/system_bus_socket
}
reload() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment