Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=715aea794f30b0f59e5e69868df4f4d1b7aa2599

commit 715aea794f30b0f59e5e69868df4f4d1b7aa2599
Author: DeX77 <[email protected]>
Date:   Thu Aug 11 17:05:11 2016 +0200

dbus-1.10.8-5-x86_64

* use sysuser.d for user creation but install to remove

diff --git a/source/base/dbus/FrugalBuild b/source/base/dbus/FrugalBuild
index faa52ef..49acf5d 100644
--- a/source/base/dbus/FrugalBuild
+++ b/source/base/dbus/FrugalBuild
@@ -9,7 +9,7 @@ USE_TC_X=${USE_TC_X:-"y"}

pkgname=dbus
pkgver=1.10.8
-pkgrel=4
+pkgrel=5
pkgdesc="A message bus system"
url="http://freedesktop.org/wiki/Software/dbus";
rodepends=('scriptlet-core')
@@ -23,9 +23,11 @@ up2date="Flasttar http://dbus.freedesktop.org/releases/dbus/";
backup=(etc/dbus-1/session.conf etc/tmpfiles.d/dbus.conf)

source=(http://dbus.freedesktop.org/releases/dbus/$pkgname-$pkgver.tar.gz \
-       dbus-1-launch.desktop)
+       dbus-1-launch.desktop
+       dbus.conf )
sha1sums=('86f87cf42f6b9f976ddd9eef8de925ff3d3c0191' \
-          '1c7bd0b397f281ab26a70d48269496cc5a742509')
+          '1c7bd0b397f281ab26a70d48269496cc5a742509' \
+          'd006b4e680e6fbc4bcaac8337fc3a8b2af151b98')

subpkgs=('dbus-x11')
subdescs=('X based tools for D-BUS.')
@@ -105,6 +107,11 @@ EOF

Ffileschown /usr/lib/dbus-1/dbus-daemon-launch-helper 0 38
Ffileschmod /usr/lib/dbus-1/dbus-daemon-launch-helper 4750
+
+       # Create users using sysuser.d
+       Fmkdir usr/lib/sysusers.d/
+       Ffile /usr/lib/sysusers.d/$pkgname.conf
+
}

# optimization OK
diff --git a/source/base/dbus/dbus.conf b/source/base/dbus/dbus.conf
new file mode 100644
index 0000000..08c709e
--- /dev/null
+++ b/source/base/dbus/dbus.conf
@@ -0,0 +1,2 @@
+g messagebus 38 -
+u messagebus 38 "D-BUS system user"
diff --git a/source/base/dbus/dbus.install b/source/base/dbus/dbus.install
index 50b4479..9aad196 100644
--- a/source/base/dbus/dbus.install
+++ b/source/base/dbus/dbus.install
@@ -1,9 +1,5 @@
post_install()
{
-       echo "adding messagebus group and user"
-       getent group messagebus 2>&1 > /dev/null || groupadd -g 38 messagebus
-       getent passwd messagebus 2>&1 > /dev/null || useradd -s /bin/false -c 
"D-BUS system user" -d '/' -u 38 -g messagebus messagebus
-
echo "generating uuid for dbus"
/usr/bin/dbus-uuidgen --ensure
echo "done installing dbus"
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to