Merge branch 'release/debian/3.1.8-2'debian/3.1.8-2

5 files changed, 40 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index dde8619..4bee817 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ipmiutil (3.1.8-2) unstable; urgency=medium
+
+  * debian/patches/0700-init.patch (Closes: #1020558):
+    - Fix insert of /lib/lsb/init-functions.
+  * Declare compliance with Debian Policy 4.6.1.0 (No changes needed).
+  * debian/copyright:
+    - Add year 2022 to myself.
+  * debian/source/lintian-overrides:
+    - Fix typo.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 02 Oct 2022 15:01:17 +0200
+
 ipmiutil (3.1.8-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 4344cc9..19b85eb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  libssl-dev,
  libtool-bin,
  openssl
-Standards-Version: 4.6.0.1
+Standards-Version: 4.6.1.0
 Rules-Requires-Root: no
 Homepage: https://sourceforge.net/projects/ipmiutil/
 Vcs-Git: git://jff.email/opt/git/ipmiutil.git
diff --git a/debian/copyright b/debian/copyright
index 4961442..9c42e20 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Copyright: 2002-2004 Service Availability(TM) Forum
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2014-2021 Jörg Frings-Fürst <debian@jff.email>
+Copyright: 2014-2022 Jörg Frings-Fürst <debian@jff.email>
 License: BSD-3-clause
 
 Files: kern/bmcpanic-2.4.*
diff --git a/debian/patches/0700-init.patch b/debian/patches/0700-init.patch
index 64993d8..506d4f4 100644
--- a/debian/patches/0700-init.patch
+++ b/debian/patches/0700-init.patch
@@ -1,6 +1,6 @@
 Description: include lsb/init-functions
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2014-08-09
+Author: Jörg Frings-Fürst <debian@jff.email>
+Last-Update: 2022-10-02
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/scripts/ipmi_port.sh
@@ -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/source/lintian-overrides b/debian/source/lintian-overrides
index 07a7e84..b082113 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1 @@
-# with compat 10 autoreconf run all times
-ancient-libtool ltconfig
+ancient-libtool [ltconfig]