Merge branch 'release/debian/1.8.18-9'

9 files changed, 19 insertions, 171 deletions

diff --git a/debian/changelog b/debian/changelog
index 9089710..4f39b04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+ipmitool (1.8.18-9) unstable; urgency=medium
+
+  * debian/ipmitool.maintscript:
+    - Fix syntax (Closes: #947384).
+  * Remove System V init scripts:
+    - Remove debian/ipmitool.ipmievd.init.
+    - Remove debian/ipmitool.lintian-overrides.
+    - Remove debian/ipmitool.postinst.
+    - Remove debian/ipmitool.postrm.
+    - Remove debian/ipmitool.prerm.
+    - Remove override_dh_installinit from debian/rules.
+    - Remove init-system-helpers (>> 1.50) from debian/control.
+    - Add rm_conffile /etc/init.d/ipmievd 1.8.18-9~ ipmitool to
+      debian/ipmitool.maintscript.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Thu, 26 Dec 2019 19:25:06 +0100
+
 ipmitool (1.8.18-8) unstable; urgency=medium
 
   * New debian/patches/0130-Correct_lanplus_segment_violation.patch:
diff --git a/debian/control b/debian/control
index aac2486..eda013f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  debhelper-compat (= 12),
- init-system-helpers (>> 1.50),
  libncurses-dev,
  libfreeipmi-dev [!hurd-i386],
  libreadline-dev,
diff --git a/debian/ipmitool.ipmievd.init b/debian/ipmitool.ipmievd.init
deleted file mode 100644
index 27e918f..0000000
--- a/debian/ipmitool.ipmievd.init
+++ /dev/null
@@ -1,126 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          ipmievd
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: IPMI event daemon
-# Description:       ipmievd  is a daemon which will listen for events
-#                    from the BMC that are being sent to the SEL and
-#                    also log those messages to syslog.
-### END INIT INFO
-#
-# Author:	Elmar Hoffmann <elho@elho.net>
-# Licence:      This script is public domain using the same
-#               licence as ipmitool itself.
-# Modified by:  Petter Reinholdtsen
-#               Jörg Frings-Fürst 2014-06-01
-
-set -e
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DESC="IPMI event daemon"
-NAME=ipmievd
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid0
-SCRIPTNAME=/etc/init.d/$NAME
-ENABLED=true
-
-# Gracefully exit if the package has been removed.
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-test -r /etc/default/rcS && . /etc/default/rcS
-
-# Options used by ipmievd.
-#
-# "open" uses the asynchronous event notification from the OpenIPMI
-# kernel driver, "sel" uses active polling of the contents of the SEL
-# for new events.
-#
-# Need to force 'daemon' mode, to make sure messages are sent to
-# syslog and the program forks into the background.
-#
-# Se ipmievd(8) for more info.
-IPMIEVD_OPTIONS="open daemon"
-
-#
-# requested kernelmodules
-#
-#REQMODULES="ipmi_devintf ipmi_msghandler ipmi_poweroff ipmi_si ipmi_watchdog"
-REQMODULES=""
-
-# Read config file if it is present.
-[ -f /etc/default/$NAME ] && . /etc/default/$NAME
-
-test "$ENABLED" != "false" || exit 0
-
-# Backwards compatibility with version 1.8.6-2 and 1.8.6-1.  The
-# variable was renamed to be compatible with upstream, SuSe and RedHat.
-if [ -n "$IPMIEVD_OPTS" ]; then
-    echo "warning: /etc/default/$NAME variable IPMIEVD_OPTS should be renamed to IPMIEVD_OPTIONS"
-    IPMIEVD_OPTIONS="$IPMIEVD_OPTS"
-fi
-
-# 
-# function to load requested kernelmodules
-do_modprobe() {
-    if [ -x /sbin/modprobe -a -f /proc/modules ]
-    then
-        modprobe -q "$1" || true
-    fi
-}
-
-#
-#	Function that starts the daemon/service.
-#
-d_start() {
-	start-stop-daemon --start --quiet --exec $DAEMON --pidfile $PIDFILE -- $IPMIEVD_OPTIONS
-}
-
-#
-#	Function that stops the daemon/service.
-#
-d_stop() {
-	start-stop-daemon --stop --oknodo --quiet --name $NAME --exec $DAEMON --pidfile $PIDFILE 
-}
-
-CODE=0
-
-case "$1" in
-  start)
-	# load kernelmodules
-	for rmod in ${REQMODULES} 
-	do
-	    do_modprobe ${rmod} 
-	done
-	[ "$VERBOSE" != no ] && log_begin_msg "Starting $DESC" "$NAME"
-	d_start || CODE=$?
-	[ "$VERBOSE" != no ] && log_end_msg $CODE
-	exit $CODE
-	;;
-  stop)
-	log_begin_msg "Stopping $DESC" "$NAME"
-	d_stop || CODE=$?
-	log_end_msg $CODE
-	exit $CODE
-	;;
-  restart|force-reload)
-	log_begin_msg "Restarting $DESC" "$NAME"
-	d_stop || true
-	sleep 1
-	d_start || CODE=$?
-	log_end_msg $CODE
-	exit $CODE
-	;;
-  status)
-	status_of_proc $DAEMON $NAME
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/debian/ipmitool.lintian-overrides b/debian/ipmitool.lintian-overrides
deleted file mode 100644
index 00696e1..0000000
--- a/debian/ipmitool.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# see bug #932378
-#
-ipmitool: missing-versioned-depends-on-init-system-helpers postinst:23 "update-rc.d defaults-disabled" needs init-system-helpers >= 1.50
diff --git a/debian/ipmitool.maintscript b/debian/ipmitool.maintscript
index 92457ee..29e43b2 100644
--- a/debian/ipmitool.maintscript
+++ b/debian/ipmitool.maintscript
@@ -1 +1,2 @@
-rm_conffile /etc/default/ipmitool 1.8.18-6~
+rm_conffile /etc/default/ipmitool 1.8.18-6~ ipmitool
+rm_conffile /etc/init.d/ipmievd 1.8.18-9~ ipmitool
diff --git a/debian/ipmitool.postinst b/debian/ipmitool.postinst
deleted file mode 100644
index 7064f87..0000000
--- a/debian/ipmitool.postinst
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-
-ipmievd_initd_failed() {
-	echo "Unable to start ipmievd during installation.  Trying to disable."
-	if [ -f /etc/default/ipmievd ] && \
-           grep -q ^ENABLED=\"false\" /etc/default/ipmievd ; then
-	    :
-	else
-	    touch /etc/default/ipmievd
-	    echo "ENABLED=\"false\"" >> /etc/default/ipmievd
-	fi
-}
-
-#DEBHELPER#
diff --git a/debian/ipmitool.postrm b/debian/ipmitool.postrm
deleted file mode 100644
index 6cd9693..0000000
--- a/debian/ipmitool.postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh 
-
-set -e
-
-
-ipmievd_initd_failed() {
-    :
-}
-
-#DEBHELPER#
diff --git a/debian/ipmitool.prerm b/debian/ipmitool.prerm
deleted file mode 100644
index b45afde..0000000
--- a/debian/ipmitool.prerm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ipmievd_initd_failed() {
-    :
-}
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 08da15e..faf1fef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,9 +29,6 @@ override_dh_auto_install:
 	$(RM) $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/COPYING
 	$(RM) $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/ChangeLog
 
-override_dh_installinit:
-	dh_installinit --no-enable --name ipmievd --error-handler=ipmievd_initd_failed
-
 override_dh_installsystemd:
 	dh_installsystemd --no-enable --name ipmievd