Changeset 25dfb16


Ignore:
Timestamp:
2009-06-07T20:19:25Z (16 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.
Location:
debian
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • debian/bitlbee.init

    r5916995 r25dfb16  
    4141        chown bitlbee: /var/run/bitlbee.pid
    4242       
    43         # Clean up after the bug between 1.2-5 and 1.2.1-2 where BitlBee ran
    44         # as root. (#494656 and #495877) Fixing this in the postinst script
    45         # is not enough since the user will restart his BitlBee after up-
    46         # grading the package, and the BitlBee running as root will then
    47         # save its settings, re-setting ownership of the file to root.
    48         # TODO: Remove this after a few revisions.
    49         find /var/lib/bitlbee -uid 0 -name '*.xml' -exec chown bitlbee: {} \;
    50 
    5143        start-stop-daemon --start --quiet --pidfile $PIDFILE \
    5244                --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS

  • debian/changelog

    r5916995 r25dfb16  
    77  * Fixed free port detection code in debian/config which was a bit limited
    88    and also buggy.
    9 
    10  -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 07 Jun 2009 20:40:00 +0100
     9  * Removing code that edits bitlbee.conf from postinst (and chown code in
     10    the init script), it's not really necessary anymore; bitlbee may only
     11    still run as root if the admin doesn't read conffile diffs.
     12    (Closes: #514572)
     13  * No longer overwriting port number info in /etc/default/bitlbee with
     14    what's in debconf. (Closes: #514148)
     15  * Added notes about the above two changes to bitlbee.conf.
     16
     17 -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 07 Jun 2009 21:17:39 +0100
    1118
    1219bitlbee (1.2.3-1) unstable; urgency=critical

  • debian/config

    r5916995 r25dfb16  
    22
    33. /usr/share/debconf/confmodule
     4[ -f /etc/default/bitlbee ] && . /etc/default/bitlbee
    45
    56db_title BitlBee
    67
    7 db_get bitlbee/serveport
    8 if [ "$RET" = "stillhavetoask" ]; then
    9         listens=$(netstat -ltn | awk '{print $4}')
    10         for port in 6667 6666 6668 6669; do
    11                 if [ $(expr "$listens " : ".*:$port\s") = "0" ]; then
    12                         break
    13                 fi
    14         done
    15         db_set bitlbee/serveport $port;
     8if [ -n "$BITLBEE_PORT" ]; then
     9        db_set bitlbee/serveport "$BITLBEE_PORT"
     10else
     11        db_get bitlbee/serveport
     12        if [ "$RET" = "stillhavetoask" ]; then
     13                listens=$(netstat -ltn | awk '{print $4}')
     14                for port in 6667 6666 6668 6669; do
     15                        if [ $(expr "$listens " : ".*:$port\s") = "0" ]; then
     16                                break
     17                        fi
     18                done
     19                db_set bitlbee/serveport $port;
     20        fi
    1621fi
    1722

  • 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 

  • debian/postinst

    r5916995 r25dfb16  
    3333## /etc/default/bitlbee: Auto-generated/updated script.
    3434##
    35 ## Don't edit this line, use dpkg-reconfigure bitlbee
     35## If running in (fork)daemon mode, listen on this TCP port.
    3636BITLBEE_PORT="$PORT"
    3737
    … …  
    6161        else
    6262                mv /usr/share/bitlbee/help.upgrading /usr/share/bitlbee/help.txt
    63         fi
    64 fi
    65 
    66 if ! grep -qi '^User *= *' /etc/bitlbee/bitlbee.conf; then
    67         echo 'Updating configuration file, enabling User-setting...'
    68         if ! sed -i -e 's/# *User *= *.*/User = bitlbee/i' /etc/bitlbee/bitlbee.conf; then
    69                 echo 'Failed! BitlBee may run as root now, please check your configs.'
    7063        fi
    7164fi
Note: See TracChangeset for help on using the changeset viewer.