[Pkg-utopia-commits] r1861 - in /packages/unstable/dbus/debian: changelog dbus.postinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Nov 14 17:13:32 2007
New Revision: 1861

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1861
Log:
  - General cleanup. Remove superfluous addgroup and chgrp call.

Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/dbus.postinst

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=1861&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Wed Nov 14 17:13:32 2007
@@ -11,8 +11,9 @@
   * debian/dbus.postinst
     - Install the dbus-daemon-launch-helper binary SUID root and make it
       executable for the messagebus group.
-
- -- Michael Biebl <biebl at debian.org>  Mon, 05 Nov 2007 11:59:46 +0100
+    - General cleanup. Remove superfluous addgroup and chgrp call.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 14 Nov 2007 18:08:42 +0100
 
 dbus (1.1.1-3) unstable; urgency=low
 

Modified: packages/unstable/dbus/debian/dbus.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.postinst?rev=1861&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.postinst (original)
+++ packages/unstable/dbus/debian/dbus.postinst Wed Nov 14 17:13:32 2007
@@ -8,22 +8,33 @@
 
 MESSAGEUSER=messagebus
 MESSAGEHOME=/var/run/dbus
+LAUNCHER=/usr/lib/dbus-1.0/dbus-daemon-launch-helper
 
+case "$1" in
+    configure)
+	adduser --system \
+	        --home "$MESSAGEHOME" \
+                --no-create-home \
+                --disabled-password \
+        	--group "$MESSAGEUSER"
 
-chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup --system "$MESSAGEUSER"
-chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
-    adduser --system \
-            --home "$MESSAGEHOME" \
-            --no-create-home \
-            --disabled-password \
-            --ingroup "$MESSAGEUSER" \
-            "$MESSAGEUSER"
+	chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 
 
-launcher=/usr/lib/dbus-1.0/dbus-daemon-launch-helper
+	if ! dpkg-statoverride --list "$LAUNCHER" > /dev/null 2>&1; then
+		chown root:"$MESSAGEUSER" "$LAUNCHER"
+		chmod 4750 "$LAUNCHER"
+	fi
+    ;;
 
-if ! dpkg-statoverride --list $launcher > /dev/null 2>&1; then
-	chown root:messagebus $launcher
-	chmod 4750 $launcher
-fi
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
 
 #DEBHELPER#
+
+exit 0