diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/bitlbee.conf.diff | 13 | ||||
| -rwxr-xr-x | debian/rules | 1 |
3 files changed, 23 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 1745e6c4..a11a67b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +bitlbee (1.2.2-1) unstable; urgency=critical + + * New upstream version. + * Fixes a security issue (account hijacking), hence the high priority. + * Using a patch to set the User setting in bitlbee.conf properly to keep + upstream and Debian properly separated in my bzr tree. + + -- Wilmer van der Gaast <wilmer@gaast.net> Wed, 27 Aug 2008 23:59:50 +0100 + bitlbee (1.2.1-3) unstable; urgency=high * chown /var/lib/bitlbee/*.xml to bitlbee:bitlbee to clean up after diff --git a/debian/patches/bitlbee.conf.diff b/debian/patches/bitlbee.conf.diff new file mode 100644 index 00000000..b80bcb4c --- /dev/null +++ b/debian/patches/bitlbee.conf.diff @@ -0,0 +1,13 @@ +=== modified file 'bitlbee.conf' +--- debian/bitlbee/etc/bitlbee/bitlbee.conf 2008-08-26 22:33:54 +0000 ++++ debian/bitlbee/etc/bitlbee/bitlbee.conf 2008-08-27 23:18:13 +0000 +@@ -23,7 +23,7 @@ + ## If BitlBee is started by root as a daemon, it can drop root privileges, + ## and change to the specified user. + ## +-# User = bitlbee ++User = bitlbee + + ## DaemonPort/DaemonInterface: + ## + diff --git a/debian/rules b/debian/rules index 661cf30e..788e5006 100755 --- a/debian/rules +++ b/debian/rules @@ -54,6 +54,7 @@ binary-arch: build-arch install-arch cp doc/CHANGES debian/bitlbee/usr/share/doc/bitlbee/changelog cp utils/* debian/bitlbee/usr/share/doc/bitlbee/examples/ cp debian/bitlbee.init debian/bitlbee/etc/init.d/bitlbee + patch -p0 < debian/patches/bitlbee.conf.diff cd debian/bitlbee/usr/share/; \ gzip -9 doc/bitlbee/changelog.Debian doc/bitlbee/changelog doc/bitlbee/user-guide.txt \ doc/bitlbee/examples/* man/man8/bitlbee.8 man/man5/bitlbee.conf.5 |