Changeset d301872 for debian


Ignore:
Timestamp:
2008-08-24T16:49:03Z (11 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
934dddf3
Parents:
5d3b4e8
Message:

1.2.1-3:

  • chown /var/lib/bitlbee/*.xml to bitlbee:bitlbee to clean up after 1.2-5 and the bugfix in 1.2.1-2. (Closes: #495877)
  • Moved BITLBEE_DISABLED check to only check when trying to *start* the daemon. (Closes: #488611)
Location:
debian
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • debian/bitlbee.init

    r5d3b4e8 rd301872  
    3232fi
    3333
    34 [ "$BITLBEE_DISABLED" = "1" ] && exit 0
    35 
    3634
    3735#
     
    4139        # Make sure BitlBee can actually write its PID...
    4240        touch /var/run/bitlbee.pid
    43         chown bitlbee /var/run/bitlbee.pid
     41        chown bitlbee: /var/run/bitlbee.pid
    4442       
    45         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 \
    4652                --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
    4753}
     
    5864case "$1" in
    5965  start)
     66        [ "$BITLBEE_DISABLED" = "1" ] && exit 0
     67
    6068        echo -n "Starting $DESC: $NAME"
    6169        d_start
  • debian/changelog

    r5d3b4e8 rd301872  
     1bitlbee (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
    110bitlbee (1.2.1-2) unstable; urgency=low
    211
  • debian/postinst

    r5d3b4e8 rd301872  
    8080
    8181## If we're upgrading, we'll probably skip this next part
    82 if [ -d $CONFDIR ] && chown -R bitlbee $CONFDIR; then
     82if [ -d $CONFDIR ] && chown -R bitlbee: $CONFDIR; then
    8383        echo 'BitlBee (probably) already installed, skipping user/configdir installation'
    8484        exit 0
Note: See TracChangeset for help on using the changeset viewer.