moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

dbus: run dbus-uuidgen --ensure via post-install not via runit.

Browse source 
Also remove the REMOVE script, which is completely wrong.
This commit is contained in:
Juan RP 2015-01-13 19:09:24 +01:00
parent 77321f7e72
commit a1628c643e
4 changed files with 4 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
srcpkgs/dbus/INSTALL
View file

@ -1,13 +1,9 @@
#
# This script fixes permissions for dbus-daemon-launch-helper.
#
dbus_launch=usr/libexec/dbus-daemon-launch-helper
case "${ACTION}" in case "${ACTION}" in
post) post)
[ ! -d var/lib/dbus ] && install -d var/lib/dbus [ ! -d var/lib/dbus ] && install -d var/lib/dbus
[ ! -d etc/dbus-1/session.d ] && install -d etc/dbus-1/session.d [ ! -d etc/dbus-1/session.d ] && install -d etc/dbus-1/session.d
chown root:22 ${dbus_launch} chown root:22 usr/libexec/dbus-daemon-launch-helper
chmod 4750 ${dbus_launch} chmod 4750 usr/libexec/dbus-daemon-launch-helper
usr/bin/dbus-uuidgen --ensure || :
;; ;;
esac esac

13
srcpkgs/dbus/REMOVE
View file

@ -1,13 +0,0 @@
#
# This script removes pre-created dirs required for dbus-daemon.
#
case "${ACTION}" in
purge)
if [ -d var/run/dbus ]; then
rm -rf var/run/dbus
fi
if [ -d etc/dbus-1/session.d ]; then
rm -rf etc/dbus-1/session.d
fi
;;
esac

1
srcpkgs/dbus/files/dbus/run
View file

@ -1,4 +1,3 @@
#!/bin/sh #!/bin/sh
[ ! -d /run/dbus ] && install -m755 -g 22 -o 22 -d /run/dbus [ ! -d /run/dbus ] && install -m755 -g 22 -o 22 -d /run/dbus
dbus-uuidgen --ensure
exec dbus-daemon --system --nofork --nopidfile exec dbus-daemon --system --nofork --nopidfile

2
srcpkgs/dbus/template
View file

@ -2,7 +2,7 @@
# #
pkgname=dbus pkgname=dbus
version=1.8.14 version=1.8.14
revision=1 revision=2
short_desc="Message bus system" short_desc="Message bus system"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2" license="GPL-2"