Changeset 25dfb16 for debian/patches

Timestamp:

2009-06-07T20:19:25Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0c41177

Parents:

5916995

Message:

Forgot to commit before starting to work on the second item, so here's a
monster commit. :-)

• Removing code that edits bitlbee.conf from postinst (and chown code in the init script), it's not really necessary anymore; bitlbee may only still run as root if the admin doesn't read conffile diffs. (Closes: #514572)
• No longer overwriting port number info in /etc/default/bitlbee with what's in debconf. (Closes: #514148)
• Added notes about the above two changes to bitlbee.conf.

File:

• debian/patches/bitlbee.conf.diff (modified) (1 diff)

debian/patches/bitlbee.conf.diff

@@ -1 @@
-=== 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 @@
+--- bitlbee.conf        2009-06-01 00:20:24.000000000 +0100
++++ /tmp/bitlbee.conf   2009-06-07 21:16:19.000000000 +0100
+@@ -23,13 +23,18 @@
  ## If BitlBee is started by root as a daemon, it can drop root privileges,
  ## and change to the specified user.
  ##
 -# User = bitlbee
++## DEBIAN NOTE: Without this, BitlBee will run as root!
++##
 +User = bitlbee
  
  ## DaemonPort/DaemonInterface:
  ##
-
+ ## For daemon mode, you can specify on what interface and port the daemon
+ ## should be listening for connections.
+ ##
++## DEBIAN NOTE: The init script passes the -p flag to use the port number
++## set using debconf, this overrides the DaemonPort setting here.
++##
+ # DaemonInterface = 0.0.0.0
+ # DaemonPort = 6667
+