Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting10.git;a=commitdiff;h=9eec313373037e8f8a25253950d7dae89e3ad1a6
commit 9eec313373037e8f8a25253950d7dae89e3ad1a6 Author: James Buren <r...@frugalware.org> Date: Mon Feb 18 04:29:53 2013 -0600 dbus-1.6.8-6-x86_64 * move part of dbus scriptlet to build time * simplify the remainder of the scriptlet diff --git a/source/base/dbus/FrugalBuild b/source/base/dbus/FrugalBuild index 87406df..7b6b0c2 100644 --- a/source/base/dbus/FrugalBuild +++ b/source/base/dbus/FrugalBuild @@ -3,10 +3,10 @@ pkgname=dbus pkgver=1.6.8 -pkgrel=5 +pkgrel=6 pkgdesc="A message bus system" url="http://freedesktop.org/wiki/Software/dbus"; -depends=('libxml2>=2.7.8' 'expat' 'shadow' 'grep') +depends=('libxml2>=2.7.8' 'expat' 'shadow') groups=('base' 'core') archs=('i686' 'x86_64' 'arm') up2date="Flasttar http://dbus.freedesktop.org/releases/dbus/"; @@ -80,6 +80,9 @@ d $Flocalstatedir/run/dbus 0755 root root - EOF Fsplit dbus-x11 usr/bin/dbus-launch /etc/xdg usr/bin/dbus-1-launch + + Ffileschown /usr/lib/dbus-1/dbus-daemon-launch-helper 0 38 + Ffileschmod /usr/lib/dbus-1/dbus-daemon-launch-helper 4750 } # optimization OK diff --git a/source/base/dbus/dbus.install b/source/base/dbus/dbus.install index edf3c21..748c8d6 100644 --- a/source/base/dbus/dbus.install +++ b/source/base/dbus/dbus.install @@ -1,33 +1,19 @@ post_install() { - if ! grep -q 'messagebus' /etc/group; then - /usr/sbin/groupadd -g 38 messagebus - /usr/sbin/useradd -s /bin/false -c "D-BUS system user" -d '/' -u 38 -g messagebus messagebus - fi - chown root:messagebus /usr/lib/dbus-1/dbus-daemon-launch-helper - chmod 4750 /usr/lib/dbus-1/dbus-daemon-launch-helper - /usr/bin/dbus-uuidgen --ensure + getent group messagebus 2>&1 > /dev/null || groupadd -g 38 messagebus + getent user messagebus 2>&1 > /dev/null || useradd -s /bin/false -c "D-BUS system user" -d '/' -u 38 -g messagebus messagebus + dbus-uuidgen --ensure } post_upgrade() { - if grep -q 'messagebus' /etc/group; then - /usr/sbin/usermod -d '/' messagebus 2>/dev/null - else - /usr/sbin/groupadd -g 38 messagebus 2>/dev/null - /usr/sbin/useradd -s /bin/false -c "D-BUS system user" -d '/' -u 38 -g messagebus messagebus 2>/dev/null - fi - chown root:messagebus /usr/lib/dbus-1/dbus-daemon-launch-helper - chmod 4750 /usr/lib/dbus-1/dbus-daemon-launch-helper - /usr/bin/dbus-uuidgen --ensure + post_install } -pre_remove() +post_remove() { - if grep -q 'messagebus' /etc/group; then - /usr/sbin/userdel messagebus 2>/dev/null - /usr/sbin/groupdel messagebus 2>/dev/null - fi + getent user messagebus 2>&1 > /dev/null && userdel messagebus + getent group messagebus 2>&1 > /dev/null && groupdel messagebus } op=$1 _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
