Merge from Debian package tree.

4 files changed, 21 insertions, 8 deletions

diff --git a/debian/bitlbee.init b/debian/bitlbee.init
index baf1a0c6..51b807f5 100755
--- a/debian/bitlbee.init
+++ b/debian/bitlbee.init
@@ -36,7 +36,7 @@ d_start() {
 	chown bitlbee /var/run/bitlbee.pid
 	
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		-c bitlbee -g nogroup \
+		-c bitlbee: \
 		--exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $DAEMON_OPT
 }
 
diff --git a/debian/changelog b/debian/changelog
index 6c725964..b043c13a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,12 @@ bitlbee (1.2-2) unstable; urgency=low
 
   * Fixed some packaging issues reported by IRC and e-mail. (Closes: #472373)
   * Fixed proxy support. (Closes: #472395)
-  * Not ready yet.
+  * 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>  Sun, 23 Mar 2008 21:51:57 +0000
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Mon, 24 Mar 2008 19:48:24 +0000
 
 bitlbee (1.2-1) unstable; urgency=low
 
diff --git a/debian/postinst b/debian/postinst
index 1a906474..80249bfe 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -73,13 +73,21 @@ if [ -d $CONFDIR ] && chown -R bitlbee $CONFDIR; then
 	exit 0
 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
 	/etc/init.d/bitlbee start
diff --git a/debian/postrm b/debian/postrm
index f7686e7b..5c3b4b2e 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -8,5 +8,7 @@ if [ -e /usr/share/debconf/confmodule ]; then
 fi
 
 update-rc.d bitlbee remove > /dev/null 2>&1 || true
-deluser --system --remove-home bitlbee || true
 rm -f /etc/default/bitlbee
+
+deluser --system --remove-home bitlbee || true
+rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var