Changes in / [75554d0:f9928cb]


Ignore:
Location:
debian
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • debian/bitlbee.init

    r75554d0 rf9928cb  
    4141        chown bitlbee: /var/run/bitlbee.pid
    4242       
    43         start-stop-daemon --start --quiet --pidfile $PIDFILE \
     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
     51        start-stop-daemon --start --quiet \
    4452                --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
    4553}
  • debian/changelog

    r75554d0 rf9928cb  
    1 bitlbee (1.2.4-2) unstable; urgency=low
    2 
    3   * Merging in some changes from bzr-head:
    4   * Use libresolv.so where possible. (Closes: #551775)
    5   * Some include file changes that make the bitlbee-dev package useful again.
    6 
    7  -- Wilmer van der Gaast <wilmer@gaast.net>  Thu, 19 Nov 2009 23:02:43 +0000
    8 
    9 bitlbee (1.2.4-1) unstable; urgency=low
    10 
    11   * New upstream version.
    12   * Fixed issues with Yahoo! (Closes: #536178)
    13 
    14  -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 17 Oct 2009 18:12:45 +0100
    15 
    16 bitlbee (1.2.3-2) unstable; urgency=low
    17 
    18   * Fixed bitblee typo in prerm (introduced by NMU 1.2.1-1.1).
    19     (Closes: #531287)
    20   * Fixed bitlbee.deb dep in bitlbee-dev to deal with binary NMUs.
    21     (Closes: #531219)
    22   * Fixed free port detection code in debian/config which was a bit limited
    23     and also buggy.
    24   * Removing code that edits bitlbee.conf from postinst (and chown code in
    25     the init script), it's not really necessary anymore; bitlbee may only
    26     still run as root if the admin doesn't read conffile diffs.
    27     (Closes: #514572)
    28   * No longer overwriting port number info in /etc/default/bitlbee with
    29     what's in debconf. (Closes: #514148)
    30   * Added notes about the above two changes to bitlbee.conf.
    31 
    32  -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 07 Jun 2009 21:17:39 +0100
    33 
    34 bitlbee (1.2.3-1) unstable; urgency=critical
    35 
    36   * New upstream version.
    37   * Fixes another account hijacking issue. (Closes: #498159)
    38   * Restored --pidfile argument to start-stop-daemon, otherwise the init
    39     script fails to restart BitlBee when users are connected.
    40 
    41  -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 07 Sep 2008 18:53:04 +0100
    42 
    431bitlbee (1.2.2-1) unstable; urgency=critical
    442
  • debian/config

    r75554d0 rf9928cb  
    22
    33. /usr/share/debconf/confmodule
    4 [ -f /etc/default/bitlbee ] && . /etc/default/bitlbee
    54
    65db_title BitlBee
    76
    8 if [ -n "$BITLBEE_PORT" ]; then
    9         db_set bitlbee/serveport "$BITLBEE_PORT"
    10 else
    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;
     7db_get bitlbee/serveport
     8if [ "$RET" = "stillhavetoask" ]; then
     9        if netstat -ltn | grep ':6667' 2> /dev/null > /dev/null; then
     10                port=6668;
     11        else
     12                port=6667;
    2013        fi
     14        db_set bitlbee/serveport $port;
    2115fi
    2216
  • debian/control

    r75554d0 rf9928cb  
    1919Package: bitlbee-dev
    2020Architecture: all
    21 Depends: bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~)
     21Depends: bitlbee (= ${binary:Version})
    2222Description: An IRC to other chat networks gateway
    2323 This program can be used as an IRC server which forwards everything you
  • debian/patches/bitlbee.conf.diff

    r75554d0 rf9928cb  
    1 --- debian/bitlbee/etc/bitlbee/bitlbee.conf     2009-06-01 00:20:24.000000000 +0100
    2 +++ debian/bitlbee/etc/bitlbee/bitlbee.conf     2009-06-07 21:16:19.000000000 +0100
    3 @@ -23,13 +23,18 @@
     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 @@
    45 ## If BitlBee is started by root as a daemon, it can drop root privileges,
    56 ## and change to the specified user.
    67 ##
    78-# User = bitlbee
    8 +## DEBIAN NOTE: Without this, BitlBee will run as root!
    9 +##
    109+User = bitlbee
    1110 
    1211 ## DaemonPort/DaemonInterface:
    1312 ##
    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  
     13
  • debian/postinst

    r75554d0 rf9928cb  
    3333## /etc/default/bitlbee: Auto-generated/updated script.
    3434##
    35 ## If running in (fork)daemon mode, listen on this TCP port.
     35## Don't edit this line, use dpkg-reconfigure bitlbee
    3636BITLBEE_PORT="$PORT"
    3737
     
    6161        else
    6262                mv /usr/share/bitlbee/help.upgrading /usr/share/bitlbee/help.txt
     63        fi
     64fi
     65
     66if ! 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.'
    6370        fi
    6471fi
  • debian/prerm

    r75554d0 rf9928cb  
    1111else
    1212        if which invoke-rc.d >/dev/null 2>&1; then
    13                 invoke-rc.d bitlbee stop || exit 0
     13                invoke-rc.d bitblee stop || exit 0
    1414        else
    1515                /etc/init.d/bitlbee stop || exit 0
Note: See TracChangeset for help on using the changeset viewer.