Changeset ebed81c


Ignore:
Timestamp:
2017-01-08T22:57:19Z (2 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
79b83da
Parents:
e2a5be7 (diff), 8dbecd23 (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 debian stuff to prepare for 3.5

Files:
2 added
17 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • debian/README.Debian

    re2a5be7 rebed81c  
    1                    *** NEWS (Version 1.2 and later) ***
    2 
    3 Starting from version 1.2, BitlBee has a forking daemon mode. The Debian
    4 package now uses this mode by default, instead of inetd mode. If you don't
    5 want to use this, you can disable the init scripts (best way to do this is
    6 by editing /etc/default/bitlbee) and restore the inetd.conf entry. This
    7 should be necessary only once, it won't be touched during upgrades.
    8 
    9 Another important change in BitlBee 1.2 is the file format used for your
    10 personal settings. Everything's now saved in a single .xml (per account,
    11 of course) file instead of $nick.accounts and $nick.nicks. One advantage
    12 of this new format is that the passwords are actually encrypted instead of
    13 just vaguely obfuscated. BitlBee can still read the old files, and will
    14 save things in the new format when you save/disconnect. After that, you
    15 can safely remove the old-style files (this is recommended).
    16 
    17 I tried making this transition (the new file format but especially, in this
    18 case, the inetd->forkdaemon mode change) as smooth as possible, but I'm
    19 aware that many BitlBee users will have their own hacks already to run the
    20 program. I hope the package won't break any of this for anyone. 1.2-2
    21 should fix at least some of the issues.
    22 
    23 ---------------------------------------------------------------------------
    24 
    25 Debconf should have asked you on what port you want BitlBee to run. If it
    26 did not, the port number should be 6667 or 6668. (6668 if you already got
    27 something running at 6667)
    28 
    29 Fire up your favourite IRC client and connect to localhost:6667 (or 6668),
     1Fire up your favourite IRC client and connect to localhost:6667,
    302and read the documentation (type help for a list of commands).
    313
  • debian/bitlbee-common.init

    re2a5be7 rebed81c  
    2323[ -x $DAEMON ] || exit 0
    2424
    25 # Default value
    26 BITLBEE_PORT=6667
    2725BITLBEE_OPTS=-F
    28 
    29 # Read config file if it is present.
    30 if [ -r /etc/default/$NAME ]; then
    31         . /etc/default/$NAME
    32 fi
    3326
    3427
     
    4235       
    4336        start-stop-daemon --start --quiet --pidfile $PIDFILE \
    44                 --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
     37                --exec $DAEMON -- -P $PIDFILE $BITLBEE_OPTS
    4538}
    4639
     
    5649case "$1" in
    5750  start)
    58         [ "$BITLBEE_DISABLED" = "1" ] && exit 0
    59 
    6051        echo -n "Starting $DESC: $NAME"
    6152        d_start
  • debian/bitlbee-common.postinst

    re2a5be7 rebed81c  
    33set -e
    44
    5 . /usr/share/debconf/confmodule
    6 
    7 db_get bitlbee/serveport
    8 PORT="$RET"
    9 
    105CONFDIR=/var/lib/bitlbee/
    116
    12 ## Load default option. Don't want to put this in debconf (yet?)
    13 BITLBEE_OPTS=-F
    14 BITLBEE_DISABLED=0
    15 BITLBEE_UPGRADE_DONT_RESTART=0
    16 [ -r /etc/default/bitlbee ] && . /etc/default/bitlbee
    17 
    18 if [ "$BITLBEE_DISABLED" = "0" ] && which update-inetd > /dev/null 2> /dev/null &&
    19    ( expr "$2" : '0\..*' > /dev/null || expr "$2" : '1\.0\..*' > /dev/null ); then
    20         ## Make sure the inetd entry is gone (can still be there from a
    21         ## previous version.
    22         update-inetd --remove '.*/usr/sbin/bitlbee'
    23         if grep -q /usr/sbin/bitlbee /etc/inetd.conf 2> /dev/null; then
    24                 # Thanks for breaking update-inetd! (bugs.debian.org/311111)
    25                 # I hope that it works at least with xinetd, because this
    26                 # emergency hack doesn't:
    27                 perl -pi -e 's:^[^#].*/usr/sbin/bitlbee$:## Now using daemon mode\: # $&:' /etc/inetd.conf
    28                 killall -HUP inetd || true
    29         fi
    30 fi
    31 
    32 cat<<EOF>/etc/default/bitlbee
     7if [ -e /etc/default/bitlbee ]; then
     8   cat <<EOF >/etc/default/bitlbee
    339## /etc/default/bitlbee: Auto-generated/updated script.
    3410##
    35 ## If running in (fork)daemon mode, listen on this TCP port.
    36 BITLBEE_PORT="$PORT"
    37 
    38 ## Use single-process or forking daemon mode? Can't be changed from debconf,
    39 ## but maintainer scripts will save your changes here.
    40 BITLBEE_OPTS="$BITLBEE_OPTS"
    41 
    42 ## In case you want to stick with inetd mode (or if you just want to disable
    43 ## the init scripts for some other reason), you can disable the init script
    44 ## here. (Just set it to 1)
    45 BITLBEE_DISABLED=$BITLBEE_DISABLED
    46 
    47 ## As a server operator, you can use the RESTART command to restart only the
    48 ## master process while keeping all the child processes and their IPC
    49 ## connections. By enabling this, the maintainer scripts won't restart
    50 ## BitlBee during upgrades so you can restart the master process by hand.
    51 BITLBEE_UPGRADE_DONT_RESTART=$BITLBEE_UPGRADE_DONT_RESTART
     11## This file is deprecated and no longer used.
     12## Please edit /etc/bitlbee/bitlbee.conf instead
    5213EOF
    5314
    54 ## Bye-bye DebConf, we don't need you anymore.
    55 db_stop
     15fi
    5616
    5717## Restore the helpfile in case we weren't upgrading but just reconfiguring:
     
    6424fi
    6525
    66 if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a  -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
     26if [ -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
    6727        invoke-rc.d bitlbee restart
    6828fi
  • debian/bitlbee-common.postrm

    re2a5be7 rebed81c  
    55if [ "$1" = "purge" ]; then
    66        rm -f /etc/default/bitlbee
    7         deluser --system bitlbee || true
     7        deluser --system bitlbee > /dev/null || true
    88        rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
    99fi
  • debian/changelog

    re2a5be7 rebed81c  
     1bitlbee (3.5-1) UNRELEASED; urgency=medium
     2
     3  [ Jochen Sprickerhof ]
     4  * Drop dependency on net-tools
     5
     6  [ dequis ]
     7  * Use dh_systemd
     8  * Drop support for /etc/default/bitlbee
     9  * Drop debconf and its translations (only used to ask for the port)
     10  * Add preinst script for a smoother transition to systemd units
     11  * Ignore the stdout of deluser, fixes postrm error exit code
     12  * Remove some mentions of yahoo in control and copyright
     13  * Remove outdated stuff from README.debian
     14
     15 -- dequis <dx@dxzone.com.ar>  Mon, 02 Jan 2017 14:25:05 -0300
     16
    117bitlbee (3.4.2-1) unstable; urgency=medium
    218
  • debian/control

    re2a5be7 rebed81c  
    1818 This program can be used as an IRC server which forwards everything you
    1919 say to people on other chat networks: Jabber (which includes Google Talk
    20  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
     20 and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
    2121
    2222Package: bitlbee-libpurple
     
    2828 This program can be used as an IRC server which forwards everything you
    2929 say to people on other chat networks: Jabber (which includes Google Talk
    30  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
     30 and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
    3131 .
    3232 This package contains a version of BitlBee that uses the libpurple instant
     
    4444 This program can be used as an IRC server which forwards everything you
    4545 say to people on other chat networks: Jabber (which includes Google Talk
    46  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
     46 and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
    4747 .
    4848 This package contains common files (mostly documentation) for bitlbee and
     
    5555 This program can be used as an IRC server which forwards everything you
    5656 say to people on other chat networks: Jabber (which includes Google Talk
    57  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
     57 and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
    5858 .
    5959 This package holds development stuff for compiling plug-ins.
     
    6565 This program can be used as an IRC server which forwards everything you
    6666 say to people on other chat networks: Jabber (which includes Google Talk
    67  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
     67 and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
    6868 .
    6969 This package contains a plugin that adds support for Off-The-Record
     
    7777 This program can be used as an IRC server which forwards everything you
    7878 say to people on other chat networks: Jabber (which includes Google Talk
    79  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
     79 and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
    8080 .
    8181 This package contains a plugin that adds support for the Skype IM network.
  • debian/copyright

    re2a5be7 rebed81c  
    1111
    1212Bits of third party code, also (L)GPLed:
    13 * protocols/yahoo/ is libyahoo2 <http://libyahoo2.sf.net/>.
    1413* Some parts (though there is very little left at this point) are borrowed
    1514  from Gaim (version 0.58), now known as Pidgin <http://www.pidgin.im/>.
  • init/bitlbee.service.in

    re2a5be7 rebed81c  
    11[Unit]
    22Description=BitlBee IRC/IM gateway
    3 After=syslog.target
    43
    54[Service]
  • init/bitlbee@.service.in

    re2a5be7 rebed81c  
    11[Unit]
    22Description=BitlBee Per-Connection Server
    3 After=syslog.target
    43
    54[Service]
Note: See TracChangeset for help on using the changeset viewer.