Changeset 990d5fd


Ignore:
Timestamp:
2008-03-24T19:57:40Z (11 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
5e81e60
Parents:
bfe7caa (diff), 628e601 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from Debian package tree.

Location:
debian
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • debian/bitlbee.init

    rbfe7caa r990d5fd  
    3737       
    3838        start-stop-daemon --start --quiet --pidfile $PIDFILE \
    39                 -c bitlbee -g nogroup \
     39                -c bitlbee: \
    4040                --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $DAEMON_OPT
    4141}
  • debian/changelog

    rbfe7caa r990d5fd  
    33  * Fixed some packaging issues reported by IRC and e-mail. (Closes: #472373)
    44  * Fixed proxy support. (Closes: #472395)
    5   * Not ready yet.
    6 
    7  -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 23 Mar 2008 21:51:57 +0000
     5  * Added a BitlBee group so only root can edit the configs and BitlBee can
     6    just *read* it.
     7  * Manually deleting /var/lib/bitlbee/ when purging, deluser doesn't want to
     8    do it.
     9
     10 -- Wilmer van der Gaast <wilmer@gaast.net>  Mon, 24 Mar 2008 19:48:24 +0000
    811
    912bitlbee (1.2-1) unstable; urgency=low
  • debian/postinst

    rbfe7caa r990d5fd  
    7474fi
    7575
    76 adduser --system --home /var/lib/bitlbee/ --disabled-login --disabled-password bitlbee
     76adduser --system --group --disabled-login --disabled-password --home /var/lib/bitlbee/ bitlbee
    7777chmod 700 /var/lib/bitlbee/
    7878
    7979## Can't do this in packaging phase: Don't know the UID yet. Access to
    80 ## the file should be limited, now that it stores passwords.
    81 chmod 600 /etc/bitlbee/bitlbee.conf
    82 chown bitlbee /etc/bitlbee/bitlbee.conf
     80## the file should be limited, now that it stores passwords. Added
     81## --group later for a little more security, but have to see if I can
     82## apply this change to existing installations on upgrades. Will think
     83## about that later.
     84if getent group bitlbee > /dev/null; then
     85        chmod 640 /etc/bitlbee/bitlbee.conf
     86        chown root:bitlbee /etc/bitlbee/bitlbee.conf
     87else
     88        chmod 600 /etc/bitlbee/bitlbee.conf
     89        chown bitlbee /etc/bitlbee/bitlbee.conf
     90fi
    8391
    8492if [ -z "$2" ]; then
  • debian/postrm

    rbfe7caa r990d5fd  
    99
    1010update-rc.d bitlbee remove > /dev/null 2>&1 || true
     11rm -f /etc/default/bitlbee
     12
    1113deluser --system --remove-home bitlbee || true
    12 rm -f /etc/default/bitlbee
     14rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
Note: See TracChangeset for help on using the changeset viewer.