new upstream release; switch to OpenSSL 1.1

5 files changed, 25 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 607164f..1c03a73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,16 @@
-ipmiutil (3.0.0-3) unstable; urgency=medium
-
-  * Correct some systemd issues (Closes: #848861):
-    - debian/rules: Add overright_dh_systemd_enable to install *.service files
-      and add option --no-enable to all services which need a ipmi driver.
-    - New debian/patches/0710-systemd.patch to remove not supported
-      characters.
-    - Add override_dh_system_start with --no-start --restart-after-upgrade for
-      all daemons which need aipmi driver.
-    (Thanks to Andreas Henriksson <andreas@fatal.se>)
+ipmiutil (3.0.1-1) unstable; urgency=medium
+
+  * New upstream release:
+    - Correct some systemd issues (Closes: #848861):
+      + debian/rules: Add overright_dh_systemd_enable to install *.service
+        files and add option --no-enable to all services which need a ipmi
+        driver.
+      + Add override_dh_system_start with --no-start --restart-after-upgrade
+        for all daemons which need a ipmi driver.
+      (Thanks to Andreas Henriksson <andreas@fatal.se>)
+    - Switch to OpenSSL 1.1.0 (Closes: #828353)
+      + Switch Build-Depends from libssl1.0-dev to libssl-dev.
+      + Add openssl to Build-Depends (requested for the configure script).
   * Drop both dh-autoreconf/dh-systemd from both build-depends
     and dh --with arguments because this is all defaults when
     using dh compat 10.
@@ -19,8 +22,9 @@ ipmiutil (3.0.0-3) unstable; urgency=medium
   * Remove unwanted conf files from /etc/init.d:
     - New debian/maintscript.
     - debian/control: Add Pre-Depends dpkg for maintscript.
+  * debian/copyright: Add year 2017 to debian/*.
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 21 Dec 2016 18:00:03 +0100
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Tue, 03 Jan 2017 03:38:28 +0100
 
 ipmiutil (3.0.0-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 0a54865..5cc948b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,9 @@ Build-Depends:
  autotools-dev,
  debhelper (>= 10),
  libfreeipmi-dev (>= 1.1.5) | libopenipmi-dev (>=2.0.18),
- libssl1.0-dev,
- libtool-bin
+ libssl-dev,
+ libtool-bin,
+ openssl
 Standards-Version: 3.9.8
 Homepage: https://sourceforge.net/projects/ipmiutil/
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/ipmiutil.git
@@ -21,7 +22,7 @@ Depends:
  lsb-base (>= 3.0-6),
  rpcbind
 Pre-Depends:
- dpkg
+ dpkg (>= 1.15.7.2)
 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/copyright b/debian/copyright
index 6056dc3..b31776d 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-2016 Jörg Frings-Fürst <debian@jff-webhosting.net>
+Copyright: 2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
 License: BSD-3-clause
 
 Files: kern/bmcpanic-2.4.*
diff --git a/debian/patches/0700-init.patch b/debian/patches/0700-init.patch
index 3d10755..d0701e4 100644
--- a/debian/patches/0700-init.patch
+++ b/debian/patches/0700-init.patch
@@ -200,7 +200,7 @@ Index: trunk/scripts/ipmi_port.service
 ===================================================================
 --- trunk.orig/scripts/ipmi_port.service
 +++ trunk/scripts/ipmi_port.service
-@@ -10,5 +10,3 @@ ExecStart=/usr/share/ipmiutil/ipmiutil.s
+@@ -11,5 +11,3 @@ ExecStart=-/usr/sbin/ipmi_port -b
  
  [Install]
  WantedBy=multi-user.target
@@ -223,6 +223,6 @@ Index: trunk/configure.ac
 +#           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
- 	if test -f "$LIB_DIR/libcrypto.so"; then
- 		strings $LIB_DIR/libcrypto.so | grep EVP_md2 >/dev/null 2>&1
- 		if test $? -ne 0; then
+     # The openssl rpm might not be installed
+     which rpm >/dev/null 2>&1
+ 	if test $? -eq 0 ; then
diff --git a/debian/patches/series b/debian/patches/series
index 1f4e061..6fce8b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@
 0700-init.patch
 0600-typo-man.patch
 0705-crontab.patch
-0710-systemd.patch
+#0710-systemd.patch