Changeset 7a3d2c7

Timestamp:

2017-01-02T06:44:38Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

73e2b69

Parents:

8768f67

git-author:

dequis <dx@…> (01-01-17 22:40:09)

git-committer:

dequis <dx@…> (02-01-17 06:44:38)

Message:

debian: drop support for /etc/default/bitlbee

It was broken with the transition to systemd and doesn't seem worth
fixing - it's redundant with bitlbee.conf and not much more than a
source of confusion for users.

This also removes all the debconf stuff and all the translations which
are not used anymore (that looked a bit excessive for something that
just asks for a port number)

Location:

debian

Files:

• bitlbee-common.config (deleted)
• bitlbee-common.init (modified) (3 diffs)
• bitlbee-common.postinst (modified) (2 diffs)
• bitlbee-common.templates (deleted)
• po/POTFILES.in (deleted)
• po/cs.po (deleted)
• po/da.po (deleted)
• po/de.po (deleted)
• po/es.po (deleted)
• po/fr.po (deleted)
• po/it.po (deleted)
• po/ja.po (deleted)
• po/nl.po (deleted)
• po/pt.po (deleted)
• po/pt_BR.po (deleted)
• po/ru.po (deleted)
• po/sv.po (deleted)
• po/templates.pot (deleted)
• po/vi.po (deleted)

debian/bitlbee-common.init

@@ -23 +23 @@
 [ -x $DAEMON ] || exit 0
 
-# Default value
-BITLBEE_PORT=6667
 BITLBEE_OPTS=-F
-
-# Read config file if it is present.
-if [ -r /etc/default/$NAME ]; then
-        . /etc/default/$NAME
-fi
 
 
@@ -42 +35 @@
         
         start-stop-daemon --start --quiet --pidfile $PIDFILE \
-                --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
+                --exec $DAEMON -- -P $PIDFILE $BITLBEE_OPTS
 }
 
@@ -56 +49 @@
 case "$1" in
   start)
-        [ "$BITLBEE_DISABLED" = "1" ] && exit 0
-
         echo -n "Starting $DESC: $NAME"
         d_start

debian/bitlbee-common.postinst

@@ -3 +3 @@
 set -e
 
-. /usr/share/debconf/confmodule
-
-db_get bitlbee/serveport
-PORT="$RET"
-
 CONFDIR=/var/lib/bitlbee/
 
-## Load default option. Don't want to put this in debconf (yet?)
-BITLBEE_OPTS=-F
-BITLBEE_DISABLED=0
-BITLBEE_UPGRADE_DONT_RESTART=0
-[ -r /etc/default/bitlbee ] && . /etc/default/bitlbee
-
-if [ "$BITLBEE_DISABLED" = "0" ] && which update-inetd > /dev/null 2> /dev/null &&
-   ( expr "$2" : '0\..*' > /dev/null || expr "$2" : '1\.0\..*' > /dev/null ); then
-        ## Make sure the inetd entry is gone (can still be there from a
-        ## previous version.
-        update-inetd --remove '.*/usr/sbin/bitlbee'
-        if grep -q /usr/sbin/bitlbee /etc/inetd.conf 2> /dev/null; then
-                # Thanks for breaking update-inetd! (bugs.debian.org/311111)
-                # I hope that it works at least with xinetd, because this
-                # emergency hack doesn't:
-                perl -pi -e 's:^[^#].*/usr/sbin/bitlbee$:## Now using daemon mode\: # $&:' /etc/inetd.conf
-                killall -HUP inetd || true
-        fi
-fi
-
-cat<<EOF>/etc/default/bitlbee
+if [ -e /etc/default/bitlbee ]; then
+   cat <<EOF >/etc/default/bitlbee
 ## /etc/default/bitlbee: Auto-generated/updated script.
 ##
-## If running in (fork)daemon mode, listen on this TCP port.
-BITLBEE_PORT="$PORT"
-
-## Use single-process or forking daemon mode? Can't be changed from debconf,
-## but maintainer scripts will save your changes here.
-BITLBEE_OPTS="$BITLBEE_OPTS"
-
-## In case you want to stick with inetd mode (or if you just want to disable
-## the init scripts for some other reason), you can disable the init script
-## here. (Just set it to 1)
-BITLBEE_DISABLED=$BITLBEE_DISABLED
-
-## As a server operator, you can use the RESTART command to restart only the
-## master process while keeping all the child processes and their IPC
-## connections. By enabling this, the maintainer scripts won't restart
-## BitlBee during upgrades so you can restart the master process by hand.
-BITLBEE_UPGRADE_DONT_RESTART=$BITLBEE_UPGRADE_DONT_RESTART
+## This file is deprecated and no longer used.
+## Please edit /etc/bitlbee/bitlbee.conf instead
 EOF
 
-## Bye-bye DebConf, we don't need you anymore.
-db_stop
+fi
 
 ## Restore the helpfile in case we weren't upgrading but just reconfiguring:
@@ -64 +24 @@
 fi
 
-if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a  -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
+if [ -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
         invoke-rc.d bitlbee restart
 fi