Changeset 25dfb16 for debian/patches


Ignore:
Timestamp:
2009-06-07T20:19:25Z (11 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:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/bitlbee.conf.diff

    r5916995 r25dfb16  
    1 === modified file 'bitlbee.conf'
    2 --- debian/bitlbee/etc/bitlbee/bitlbee.conf     2008-08-26 22:33:54 +0000
    3 +++ debian/bitlbee/etc/bitlbee/bitlbee.conf     2008-08-27 23:18:13 +0000
    4 @@ -23,7 +23,7 @@
     1--- bitlbee.conf        2009-06-01 00:20:24.000000000 +0100
     2+++ /tmp/bitlbee.conf   2009-06-07 21:16:19.000000000 +0100
     3@@ -23,13 +23,18 @@
    54 ## If BitlBee is started by root as a daemon, it can drop root privileges,
    65 ## and change to the specified user.
    76 ##
    87-# User = bitlbee
     8+## DEBIAN NOTE: Without this, BitlBee will run as root!
     9+##
    910+User = bitlbee
    1011 
    1112 ## DaemonPort/DaemonInterface:
    1213 ##
    13 
     14 ## For daemon mode, you can specify on what interface and port the daemon
     15 ## should be listening for connections.
     16 ##
     17+## DEBIAN NOTE: The init script passes the -p flag to use the port number
     18+## set using debconf, this overrides the DaemonPort setting here.
     19+##
     20 # DaemonInterface = 0.0.0.0
     21 # DaemonPort = 6667
     22 
Note: See TracChangeset for help on using the changeset viewer.