Replace outdated portmap with rpsbind; Add --with autoreconf

4 files changed, 23 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index f8f796d..9a3643f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-ipmiutil (2.9.7-1) UNRELEASED; urgency=medium
+ipmiutil (2.9.7-1) unstable; urgency=medium
 
   * New upstream release
   * Refresh and rename patches.
   * Remove misspelled debian/ipmiutuil.ipmi_port.init
+  * Replace outdated portmap with rpsbind (Closes: #796364):
+    - debian/patches/0700-init.patch:
+      + At scripts/ipmi_port.sh replace portmap.
+    - debian/control:
+      + Add rpcbind to Depends.
+  * debian/rules:
+    - Add --with autoreconf to prevent build errors.
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 06 Nov 2015 01:45:52 +0100
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Thu, 17 Dec 2015 21:42:37 +0100
 
 ipmiutil (2.9.6-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9570bf7..9d5e4db 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,10 @@ Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/ipmiutil.git
 
 Package: ipmiutil
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ rpcbind
 Description: IPMI management utilities
  ipmiutil performs a series of common IPMI server management
  functions to allow administrators to perform management functions
diff --git a/debian/patches/0700-init.patch b/debian/patches/0700-init.patch
index 42c60c0..f27b7c1 100644
--- a/debian/patches/0700-init.patch
+++ b/debian/patches/0700-init.patch
@@ -18,6 +18,15 @@ Index: trunk/scripts/ipmi_port.sh
  # 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"
diff --git a/debian/rules b/debian/rules
index 8c11f8a..f123770 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ CFLAGS += -fPIC
 CONFPARA = --enable-gpl --enable-useflags --enable-libsensors
 
 %:
-	dh $@  --with autotools-dev --with systemd
+	dh $@  --with autotools-dev --with systemd --with autoreconf
 
 override_dh_auto_configure:
 	$(CURDIR)/beforeconf.sh