Fix insert of /lib/lsb/init-functions

3 files changed, 256 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index dde8619..a22c9c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ipmiutil (3.1.8-2) UNRELEASED; urgency=medium
+
+  * debian/patches/0700-init.patch (Closes: #1020558):
+    - Fix insert of /lib/lsb/init-functions.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 02 Oct 2022 13:58:26 +0200
+
 ipmiutil (3.1.8-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/0700-init.patch b/debian/patches/0700-init.patch
index 64993d8..e1f8b81 100644
--- a/debian/patches/0700-init.patch
+++ b/debian/patches/0700-init.patch
@@ -56,15 +56,15 @@ Index: trunk/scripts/ipmiutil_asy
  # Short-Description: ipmiutil async bridge agent init script
  # Description: Init script starts ipmiutil async bridge agent for remote reset
  ### END INIT INFO
-@@ -37,6 +37,8 @@ getpid () {
-     echo $p
- }
+@@ -25,6 +25,8 @@
+ #. /etc/init.d/functions
+ #fi
  
 +. /lib/lsb/init-functions
 +
- start()
- {
- 	echo -n "Starting $dname: "
+ name="ipmiutil_asy"
+ dname="ipmiutil_asy bridge agent"
+ getevtlog=/var/log/${name}.log
 @@ -152,4 +154,3 @@ case "$1" in
          exit 2
  esac
@@ -74,7 +74,7 @@ Index: trunk/scripts/ipmiutil_wdt
 ===================================================================
 --- trunk.orig/scripts/ipmiutil_wdt
 +++ trunk/scripts/ipmiutil_wdt
-@@ -14,8 +14,8 @@
+@@ -14,13 +14,15 @@
  # Provides: ipmiutil_wdt
  # Required-Start: $local_fs $remote_fs $syslog
  # Required-Stop: $local_fs $remote_fs $syslog
@@ -85,15 +85,13 @@ Index: trunk/scripts/ipmiutil_wdt
  # Short-Description: ipmiutil watchdog timer init script
  # Description: Init script to enable and reset ipmiutil watchdog timer via cron
  ### END INIT INFO
-@@ -28,6 +28,8 @@ LOCKFILE=/var/lock/subsys/$name
- wdtlog=/var/log/$name
- wdtsec=150  # default 150 seconds for watchdog timeout (2*60 + 30)
+ #
  
 +. /lib/lsb/init-functions
 +
- start() {
- 	echo -n "Starting $prog: "
- 	echo
+ name=ipmiutil_wdt
+ prog="/usr/bin/ipmiutil wdt"
+ wdtcron=/etc/cron.d/wdt
 @@ -123,10 +125,13 @@ case "$1" in
    restart)
    	restart
@@ -124,16 +122,24 @@ Index: trunk/scripts/ipmiutil_evt
  # Short-Description: ipmiutil event monitoring init script
  # Description: Init script starts ipmiutil event monitoring service
  ### END INIT INFO
-@@ -40,6 +40,8 @@ getpid () {
+@@ -27,6 +27,8 @@
+ #. /etc/init.d/functions
+ #fi
+ 
++. /lib/lsb/init-functions
++
+ name="ipmiutil_evt"
+ getevtlog=/var/log/$name.log
+ lockfile=/var/lock/subsys/$name
+@@ -40,6 +42,7 @@ getpid () {
      echo $p
  }
  
-+. /lib/lsb/init-functions
 +
  start()
  {
  	echo -n "Starting $name: "
-@@ -155,4 +157,3 @@ case "$1" in
+@@ -155,4 +158,3 @@ case "$1" in
          exit 2
  esac
  exit $?
@@ -210,7 +216,7 @@ Index: trunk/configure.ac
 ===================================================================
 --- trunk.orig/configure.ac
 +++ trunk/configure.ac
-@@ -410,11 +410,11 @@ else
+@@ -421,11 +421,11 @@ else
  		MD2_CFLAGS="-DSKIP_MD2"
  		init0=/etc/rc.d/init.d
          fi
diff --git a/debian/patches/0700-init.patch~ b/debian/patches/0700-init.patch~
new file mode 100644
index 0000000..fe5d2de
--- /dev/null
+++ b/debian/patches/0700-init.patch~
@@ -0,0 +1,226 @@
+Description: include lsb/init-functions
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2014-08-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/scripts/ipmi_port.sh
+===================================================================
+--- trunk.orig/scripts/ipmi_port.sh
++++ trunk/scripts/ipmi_port.sh
+@@ -14,8 +14,8 @@
+ # Provides: ipmi_port
+ # Required-Start: $local_fs $network $remote_fs
+ # Required-Stop:  $local_fs $network $remote_fs
+-# Default-Start: 3 4 5 3 4 5  
+-# Default-Stop:  0 1 2 6  0 1 2 6   
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
+ # Short-Description: ipmi_port reserves the RMCP port from portmap
+ # Description: ipmi_port is used to reserve the RMCP port from portmap
+ ### END INIT INFO
+@@ -29,7 +29,7 @@ name=ipmi_port
+ progdir=/usr/sbin
+ prog="$progdir/$name"
+ lockfile=/var/lock/subsys/$name
+-portmap=/etc/init.d/portmap
++portmap=/etc/init.d/rpcbind
+ shardir=/usr/share
+ mibdir=$shardir/snmp/mibs
+ datadir=$shardir/ipmiutil
+@@ -40,6 +40,8 @@ threshout=${vardir}/thresh_out.txt
+ # This threshold script could be created by ipmiutil sensor -p ...
+ thresh="${vardir}/thresholds.sh"
+ 
++. /lib/lsb/init-functions
++
+ getpid () {
+     # This is messy if the parent script is same name as $1
+     p=`ps -ef |grep "$1" |grep -v grep |awk '{print $2}'`
+@@ -184,4 +186,3 @@ case "$1" in
+ esac
+ 
+ exit $?
+-
+Index: trunk/scripts/ipmiutil_asy
+===================================================================
+--- trunk.orig/scripts/ipmiutil_asy
++++ trunk/scripts/ipmiutil_asy
+@@ -13,8 +13,8 @@
+ # Provides: ipmiutil_asy
+ # Required-Start: $local_fs $remote_fs $syslog
+ # Required-Stop: $local_fs $remote_fs $syslog
+-# Default-Start: 3 4 5 3 4 5 
+-# Default-Stop:  0 1 2 6  0 1 2 6 
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
+ # Short-Description: ipmiutil async bridge agent init script
+ # Description: Init script starts ipmiutil async bridge agent for remote reset
+ ### END INIT INFO
+@@ -37,6 +37,8 @@ getpid () {
+     echo $p
+ }
+ 
++. /lib/lsb/init-functions
++
+ start()
+ {
+ 	echo -n "Starting $dname: "
+@@ -152,4 +154,3 @@ case "$1" in
+         exit 2
+ esac
+ exit $?
+-
+Index: trunk/scripts/ipmiutil_wdt
+===================================================================
+--- trunk.orig/scripts/ipmiutil_wdt
++++ trunk/scripts/ipmiutil_wdt
+@@ -14,13 +14,15 @@
+ # Provides: ipmiutil_wdt
+ # Required-Start: $local_fs $remote_fs $syslog
+ # Required-Stop: $local_fs $remote_fs $syslog
+-# Default-Start: 3 4 5 3 4 5
+-# Default-Stop:  0 1 2 6  0 1 2 6
++# Default-Start: 2 3 4 5
++# Default-Stop:  0 1 6
+ # Short-Description: ipmiutil watchdog timer init script
+ # Description: Init script to enable and reset ipmiutil watchdog timer via cron
+ ### END INIT INFO
+ #
+ 
++. /lib/lsb/init-functions
++
+ name=ipmiutil_wdt
+ prog="/usr/bin/ipmiutil wdt"
+ wdtcron=/etc/cron.d/wdt
+@@ -123,10 +125,13 @@ case "$1" in
+   restart)
+   	restart
+ 	;;
++  force-reload)
++	restart
++        ;;
+   reload)
+   	restart
+ 	;;
+   *)
+-	echo "Usage: $0 {start|stop|status|restart|reload}"
++	echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
+ 	exit 1
+ esac
+Index: trunk/scripts/ipmiutil_evt
+===================================================================
+--- trunk.orig/scripts/ipmiutil_evt
++++ trunk/scripts/ipmiutil_evt
+@@ -15,8 +15,8 @@
+ # Provides: ipmiutil_evt
+ # Required-Start: $local_fs $remote_fs $syslog
+ # Required-Stop: $local_fs $remote_fs $syslog
+-# Default-Start: 3 4 5 3 4 5 
+-# Default-Stop:  0 1 2 6  0 1 2 6 
++# Default-Start: 2 3 4 5
++# Default-Stop:  0 1 6
+ # Short-Description: ipmiutil event monitoring init script
+ # Description: Init script starts ipmiutil event monitoring service
+ ### END INIT INFO
+@@ -40,6 +40,8 @@ getpid () {
+     echo $p
+ }
+ 
++. /lib/lsb/init-functions
++
+ start()
+ {
+ 	echo -n "Starting $name: "
+@@ -155,4 +157,3 @@ case "$1" in
+         exit 2
+ esac
+ exit $?
+-
+Index: trunk/scripts/ipmi_info
+===================================================================
+--- trunk.orig/scripts/ipmi_info
++++ trunk/scripts/ipmi_info
+@@ -11,8 +11,8 @@
+ # Provides: ipmi_info
+ # Required-Start: $local_fs $network $remote_fs
+ # Required-Stop:  $local_fs $network $remote_fs
+-# Default-Start:  
+-# Default-Stop:   
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
+ # Short-Description: ipmi_info saves OS info to the IPMI system info
+ # Description: ipmi_info saves OS info to the IPMI system info
+ ### END INIT INFO
+@@ -21,6 +21,8 @@ name=ipmi_info
+ iuprog=/usr/bin/ipmiutil
+ tmp=/tmp/ipmi_info.tmp
+ 
++. /lib/lsb/init-functions
++
+ getosver() {
+    if [ -f /etc/os-release ]; then
+       . /etc/os-release
+@@ -121,4 +123,3 @@ case "$1" in
+ esac
+ 
+ exit $?
+-
+Index: trunk/scripts/ipmiutil_asy.service
+===================================================================
+--- trunk.orig/scripts/ipmiutil_asy.service
++++ trunk/scripts/ipmiutil_asy.service
+@@ -11,4 +11,3 @@ ExecStart=/usr/bin/ipmiutil getevt -a -b
+ 
+ [Install]
+ WantedBy=multi-user.target
+-
+Index: trunk/scripts/ipmiutil_evt.service
+===================================================================
+--- trunk.orig/scripts/ipmiutil_evt.service
++++ trunk/scripts/ipmiutil_evt.service
+@@ -11,5 +11,3 @@ ExecStart=/usr/bin/ipmiutil getevt $IPMI
+ 
+ [Install]
+ WantedBy=multi-user.target
+-
+-
+Index: trunk/scripts/ipmiutil_wdt.service
+===================================================================
+--- trunk.orig/scripts/ipmiutil_wdt.service
++++ trunk/scripts/ipmiutil_wdt.service
+@@ -10,5 +10,3 @@ RemainAfterExit=1
+ 
+ [Install]
+ WantedBy=multi-user.target
+-
+-
+Index: trunk/scripts/ipmi_port.service
+===================================================================
+--- trunk.orig/scripts/ipmi_port.service
++++ trunk/scripts/ipmi_port.service
+@@ -11,5 +11,3 @@ ExecStart=-/usr/sbin/ipmi_port -b
+ 
+ [Install]
+ WantedBy=multi-user.target
+-
+-
+Index: trunk/configure.ac
+===================================================================
+--- trunk.orig/configure.ac
++++ trunk/configure.ac
+@@ -421,11 +421,11 @@ else
+ 		MD2_CFLAGS="-DSKIP_MD2"
+ 		init0=/etc/rc.d/init.d
+         fi
+-	if test $isredhat -eq 0 ; then
++#	if test $isredhat -eq 0 ; then
+ 	   # set default start/stop for init scripts
+-           sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts
+-	   sed -i 's/# Default-Stop:/# Default-Stop:  0 1 2 6/' $init_scripts
+-	fi
++#           sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts
++#	   sed -i 's/# Default-Stop:/# Default-Stop:  0 1 2 6/' $init_scripts
++#	fi
+     # The openssl rpm might not be installed
+ 	sslver=""
+     which rpm >/dev/null 2>&1