Changes in / [ebed81c:e2a5be7]


Ignore:
Files:
17 added
2 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • debian/README.Debian

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

  • debian/bitlbee-common.init

    rebed81c re2a5be7  
    2323[ -x $DAEMON ] || exit 0
    2424
     25# Default value
     26BITLBEE_PORT=6667
    2527BITLBEE_OPTS=-F
     28
     29# Read config file if it is present.
     30if [ -r /etc/default/$NAME ]; then
     31        . /etc/default/$NAME
     32fi
    2633
    2734
    … …  
    3542       
    3643        start-stop-daemon --start --quiet --pidfile $PIDFILE \
    37                 --exec $DAEMON -- -P $PIDFILE $BITLBEE_OPTS
     44                --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
    3845}
    3946
    … …  
    4956case "$1" in
    5057  start)
     58        [ "$BITLBEE_DISABLED" = "1" ] && exit 0
     59
    5160        echo -n "Starting $DESC: $NAME"
    5261        d_start

  • debian/bitlbee-common.postinst

    rebed81c re2a5be7  
    33set -e
    44
     5. /usr/share/debconf/confmodule
     6
     7db_get bitlbee/serveport
     8PORT="$RET"
     9
    510CONFDIR=/var/lib/bitlbee/
    611
    7 if [ -e /etc/default/bitlbee ]; then
    8    cat <<EOF >/etc/default/bitlbee
     12## Load default option. Don't want to put this in debconf (yet?)
     13BITLBEE_OPTS=-F
     14BITLBEE_DISABLED=0
     15BITLBEE_UPGRADE_DONT_RESTART=0
     16[ -r /etc/default/bitlbee ] && . /etc/default/bitlbee
     17
     18if [ "$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
     30fi
     31
     32cat<<EOF>/etc/default/bitlbee
    933## /etc/default/bitlbee: Auto-generated/updated script.
    1034##
    11 ## This file is deprecated and no longer used.
    12 ## Please edit /etc/bitlbee/bitlbee.conf instead
     35## If running in (fork)daemon mode, listen on this TCP port.
     36BITLBEE_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.
     40BITLBEE_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)
     45BITLBEE_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.
     51BITLBEE_UPGRADE_DONT_RESTART=$BITLBEE_UPGRADE_DONT_RESTART
    1352EOF
    1453
    15 fi
     54## Bye-bye DebConf, we don't need you anymore.
     55db_stop
    1656
    1757## Restore the helpfile in case we weren't upgrading but just reconfiguring:
    … …  
    2464fi
    2565
    26 if [ -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
     66if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a  -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
    2767        invoke-rc.d bitlbee restart
    2868fi

  • debian/bitlbee-common.postrm

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

  • debian/changelog

    rebed81c re2a5be7  
    1 bitlbee (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 
    171bitlbee (3.4.2-1) unstable; urgency=medium
    182

  • debian/control

    rebed81c re2a5be7  
    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 and Twitter/Identica/Status.net.
     20 and Facebook Chat), ICQ, AIM, MSN, Yahoo! 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 and Twitter/Identica/Status.net.
     30 and Facebook Chat), ICQ, AIM, MSN, Yahoo! 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 and Twitter/Identica/Status.net.
     46 and Facebook Chat), ICQ, AIM, MSN, Yahoo! 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 and Twitter/Identica/Status.net.
     57 and Facebook Chat), ICQ, AIM, MSN, Yahoo! 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 and Twitter/Identica/Status.net.
     67 and Facebook Chat), ICQ, AIM, MSN, Yahoo! 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 and Twitter/Identica/Status.net.
     79 and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
    8080 .
    8181 This package contains a plugin that adds support for the Skype IM network.

  • debian/copyright

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

  • init/bitlbee.service.in

    rebed81c re2a5be7  
    11[Unit]
    22Description=BitlBee IRC/IM gateway
     3After=syslog.target
    34
    45[Service]

  • init/bitlbee@.service.in

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