Changes in / [934dddf3:88d2208]


Ignore:
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • bitlbee.conf

    r934dddf3 r88d2208  
    2424## and change to the specified user.
    2525##
    26 User = bitlbee
     26# User = bitlbee
    2727
    2828## DaemonPort/DaemonInterface:

  • debian/bitlbee.init

    r934dddf3 r88d2208  
    3232fi
    3333
     34[ "$BITLBEE_DISABLED" = "1" ] && exit 0
     35
    3436
    3537#
    … …  
    3941        # Make sure BitlBee can actually write its PID...
    4042        touch /var/run/bitlbee.pid
    41         chown bitlbee: /var/run/bitlbee.pid
     43        chown bitlbee /var/run/bitlbee.pid
    4244       
    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 \
     45        start-stop-daemon --start --quiet --pidfile $PIDFILE \
    5246                --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
    5347}
    … …  
    6458case "$1" in
    6559  start)
    66         [ "$BITLBEE_DISABLED" = "1" ] && exit 0
    67 
    6860        echo -n "Starting $DESC: $NAME"
    6961        d_start

  • debian/changelog

    r934dddf3 r88d2208  
    1 bitlbee (1.2.1-3) unstable; urgency=high
    2 
    3   * chown /var/lib/bitlbee/*.xml to bitlbee:bitlbee to clean up after
    4     1.2-5 and the bugfix in 1.2.1-2. (Closes: #495877)
    5   * Moved BITLBEE_DISABLED check to only check when trying to *start*
    6     the daemon. (Closes: #488611)
    7 
    8  -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 23 Aug 2008 18:53:54 +0100
    9 
    10 bitlbee (1.2.1-2) unstable; urgency=low
    11 
    12   * Properly set the User= line to something sensible so BitlBee won't
    13     run as root anymore. 1.2-5 was a bad upload. :-( (Closes: #494656)
    14 
    15  -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 12 Aug 2008 00:36:03 +0100
    16 
    17 bitlbee (1.2.1-1.1) unstable; urgency=low
    18 
    19   * Non-Maintainer Upload
    20   * Use invoke-rc.d as per policy. (Closes: #492637) [Thanks to Matt
    21     Kraai]
    22 
    23  -- Don Armstrong <don@debian.org>  Wed, 06 Aug 2008 06:57:18 -0700
    24 
    25 bitlbee (1.2.1-1) unstable; urgency=low
    26 
    27   * New upstream release.
    28   * Add Homepage and Vcs-Bzr fields. (From Jelmer.)
    29 
    30  -- Wilmer van der Gaast <wilmer@gaast.net>  Thu, 26 Jun 2008 00:07:50 +0100
     1bitlbee (1.2-6) UNRELEASED; urgency=low
     2
     3  * Add Homepage and Vcs-Bzr fields.
     4
     5 -- Jelmer Vernooij <jelmer@samba.org>  Sun, 11 May 2008 14:18:16 +0200
    316
    327bitlbee (1.2-5) unstable; urgency=low

  • debian/postinst

    r934dddf3 r88d2208  
    6464fi
    6565
    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.'
    70         fi
    71 fi
    72 
    7366if [ -n "$2" -a "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then
    74         if which invoke-rc.d >/dev/null 2>&1; then
    75                 invoke-rc.d bitlbee restart
    76         else
    77                 /etc/init.d/bitlbee restart
    78         fi
     67        /etc/init.d/bitlbee restart
    7968fi
    8069
    8170## If we're upgrading, we'll probably skip this next part
    82 if [ -d $CONFDIR ] && chown -R bitlbee: $CONFDIR; then
     71if [ -d $CONFDIR ] && chown -R bitlbee $CONFDIR; then
    8372        echo 'BitlBee (probably) already installed, skipping user/configdir installation'
    8473        exit 0
    … …  
    10291
    10392if [ -z "$2" ]; then
    104         if which invoke-rc.d >/dev/null 2>&1; then
    105                 invoke-rc.d bitlbee start
    106         else
    107                 /etc/init.d/bitlbee start
    108         fi
     93        /etc/init.d/bitlbee start
    10994fi

  • debian/prerm

    r934dddf3 r88d2208  
    1010        fi
    1111else
    12         if which invoke-rc.d >/dev/null 2>&1; then
    13                 invoke-rc.d bitblee stop || exit 0
    14         else
    15                 /etc/init.d/bitlbee stop || exit 0
    16         fi
     12        /etc/init.d/bitlbee stop || exit 0
    1713fi
Note: See TracChangeset for help on using the changeset viewer.