Changeset 934dddf3 for debian

Timestamp:

2008-08-24T16:51:01Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7125cb3

Parents:

88d2208 (diff), d301872 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging Debian package tree.

Location:

debian

Files:

• bitlbee.init (modified) (3 diffs)
• changelog (modified) (1 diff)
• postinst (modified) (2 diffs)
• prerm (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-6) UNRELEASED; urgency=low
-
-  * Add Homepage and Vcs-Bzr fields.
-
- -- Jelmer Vernooij <jelmer@samba.org>  Sun, 11 May 2008 14:18:16 +0200
+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
+
+  * Properly set the User= line to something sensible so BitlBee won't
+    run as root anymore. 1.2-5 was a bad upload. :-( (Closes: #494656)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 12 Aug 2008 00:36:03 +0100
+
+bitlbee (1.2.1-1.1) unstable; urgency=low
+
+  * Non-Maintainer Upload
+  * Use invoke-rc.d as per policy. (Closes: #492637) [Thanks to Matt
+    Kraai]
+
+ -- Don Armstrong <don@debian.org>  Wed, 06 Aug 2008 06:57:18 -0700
+
+bitlbee (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add Homepage and Vcs-Bzr fields. (From Jelmer.)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Thu, 26 Jun 2008 00:07:50 +0100
 
 bitlbee (1.2-5) unstable; urgency=low

debian/postinst

@@ -64 +64 @@
 fi
 
+if ! grep -qi '^User *= *' /etc/bitlbee/bitlbee.conf; then
+        echo 'Updating configuration file, enabling User-setting...'
+        if ! sed -i -e 's/# *User *= *.*/User = bitlbee/i' /etc/bitlbee/bitlbee.conf; then
+                echo 'Failed! BitlBee may run as root now, please check your configs.'
+        fi
+fi
+
 if [ -n "$2" -a "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then
-        /etc/init.d/bitlbee restart
+        if which invoke-rc.d >/dev/null 2>&1; then
+                invoke-rc.d bitlbee restart
+        else
+                /etc/init.d/bitlbee restart
+        fi
 fi
 
 ## 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
@@ -91 +102 @@
 
 if [ -z "$2" ]; then
-        /etc/init.d/bitlbee start
+        if which invoke-rc.d >/dev/null 2>&1; then
+                invoke-rc.d bitlbee start
+        else
+                /etc/init.d/bitlbee start
+        fi
 fi

debian/prerm

@@ -10 +10 @@
         fi
 else
-        /etc/init.d/bitlbee stop || exit 0
+        if which invoke-rc.d >/dev/null 2>&1; then
+                invoke-rc.d bitblee stop || exit 0
+        else
+                /etc/init.d/bitlbee stop || exit 0
+        fi
 fi