Changeset d301872

Timestamp:

2008-08-24T16:49:03Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

934dddf3

Parents:

5d3b4e8

Message:

1.2.1-3:

• chown /var/lib/bitlbee/*.xml to bitlbee:bitlbee to clean up after 1.2-5 and the bugfix in 1.2.1-2. (Closes: #495877)
• Moved BITLBEE_DISABLED check to only check when trying to *start* the daemon. (Closes: #488611)

Location:

debian

Files:

• bitlbee.init (modified) (3 diffs)
• changelog (modified) (1 diff)
• postinst (modified) (1 diff)

debian/bitlbee.init

@@ -32 +32 @@
 fi
 
-[ "$BITLBEE_DISABLED" = "1" ] && exit 0
-
 
 #
@@ -41 +39 @@
         # Make sure BitlBee can actually write its PID...
         touch /var/run/bitlbee.pid
-        chown bitlbee /var/run/bitlbee.pid
+        chown bitlbee: /var/run/bitlbee.pid
         
-        start-stop-daemon --start --quiet --pidfile $PIDFILE \
+        # Clean up after the bug between 1.2-5 and 1.2.1-2 where BitlBee ran
+        # as root. (#494656 and #495877) Fixing this in the postinst script
+        # is not enough since the user will restart his BitlBee after up-
+        # grading the package, and the BitlBee running as root will then
+        # save its settings, re-setting ownership of the file to root.
+        # TODO: Remove this after a few revisions.
+        find /var/lib/bitlbee -uid 0 -name '*.xml' -exec chown bitlbee: {} \;
+
+        start-stop-daemon --start --quiet \
                 --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
 }
@@ -58 +64 @@
 case "$1" in
   start)
+        [ "$BITLBEE_DISABLED" = "1" ] && exit 0
+
         echo -n "Starting $DESC: $NAME"
         d_start

debian/changelog

@@ +1 @@
+bitlbee (1.2.1-3) unstable; urgency=high
+
+  * chown /var/lib/bitlbee/*.xml to bitlbee:bitlbee to clean up after
+    1.2-5 and the bugfix in 1.2.1-2. (Closes: #495877)
+  * Moved BITLBEE_DISABLED check to only check when trying to *start*
+    the daemon. (Closes: #488611)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 23 Aug 2008 18:53:54 +0100
+
 bitlbee (1.2.1-2) unstable; urgency=low
 

debian/postinst

@@ -80 +80 @@
 
 ## If we're upgrading, we'll probably skip this next part
-if [ -d $CONFDIR ] && chown -R bitlbee $CONFDIR; then
+if [ -d $CONFDIR ] && chown -R bitlbee: $CONFDIR; then
         echo 'BitlBee (probably) already installed, skipping user/configdir installation'
         exit 0