Changeset 990d5fd

Timestamp:

2008-03-24T19:57:40Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5e81e60

Parents:

bfe7caa (diff), 628e601 (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:

Merge from Debian package tree.

Location:

debian

Files:

• bitlbee.init (modified) (1 diff)
• changelog (modified) (1 diff)
• postinst (modified) (1 diff)
• postrm (modified) (1 diff)

debian/bitlbee.init

@@ -37 +37 @@
         
         start-stop-daemon --start --quiet --pidfile $PIDFILE \
-                -c bitlbee -g nogroup \
+                -c bitlbee: \
                 --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $DAEMON_OPT
 }

debian/changelog

@@ -3 +3 @@
   * Fixed some packaging issues reported by IRC and e-mail. (Closes: #472373)
   * Fixed proxy support. (Closes: #472395)
-  * Not ready yet.
-
- -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 23 Mar 2008 21:51:57 +0000
+  * Added a BitlBee group so only root can edit the configs and BitlBee can
+    just *read* it.
+  * Manually deleting /var/lib/bitlbee/ when purging, deluser doesn't want to
+    do it.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Mon, 24 Mar 2008 19:48:24 +0000
 
 bitlbee (1.2-1) unstable; urgency=low

debian/postinst

@@ -74 +74 @@
 fi
 
-adduser --system --home /var/lib/bitlbee/ --disabled-login --disabled-password bitlbee
+adduser --system --group --disabled-login --disabled-password --home /var/lib/bitlbee/ bitlbee
 chmod 700 /var/lib/bitlbee/
 
 ## Can't do this in packaging phase: Don't know the UID yet. Access to
-## the file should be limited, now that it stores passwords.
-chmod 600 /etc/bitlbee/bitlbee.conf
-chown bitlbee /etc/bitlbee/bitlbee.conf
+## the file should be limited, now that it stores passwords. Added
+## --group later for a little more security, but have to see if I can
+## apply this change to existing installations on upgrades. Will think
+## about that later.
+if getent group bitlbee > /dev/null; then
+        chmod 640 /etc/bitlbee/bitlbee.conf
+        chown root:bitlbee /etc/bitlbee/bitlbee.conf
+else
+        chmod 600 /etc/bitlbee/bitlbee.conf
+        chown bitlbee /etc/bitlbee/bitlbee.conf
+fi
 
 if [ -z "$2" ]; then

debian/postrm

@@ -9 +9 @@
 
 update-rc.d bitlbee remove > /dev/null 2>&1 || true
+rm -f /etc/default/bitlbee
+
 deluser --system --remove-home bitlbee || true
-rm -f /etc/default/bitlbee
+rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var