[packages/ipmiutil] - up to 3.1.7 - fix broken openssl detection

[baggins]

commit 1da6ea2fc25220789e3624967ee1cdab1585fb7e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Oct 17 22:40:57 2021 +0200

    - up to 3.1.7
    - fix broken openssl detection

 ipmiutil.spec        | 10 +++++-----
 openssl-detect.patch | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)
---
diff --git a/ipmiutil.spec b/ipmiutil.spec
index 524058d..c17bc66 100644
--- a/ipmiutil.spec
+++ b/ipmiutil.spec
@@ -6,8 +6,8 @@
 Summary:	IPMI Management Utilities
 Summary(pl.UTF-8):	Narzędzia zarządzające IPMI
 Name:		ipmiutil
-Version:	3.1.3
-Release:	1
+Version:	3.1.7
+Release:	0.1
 %if %{with gpl}
 License:	GPL v2+
 %else
@@ -15,8 +15,8 @@ License:	BSD
 %endif
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/ipmiutil/%{name}-%{version}.tar.gz
-# Source0-md5:	0d448d14726e2fda0eb9451fb2866a5c
-
+# Source0-md5:	fab260bc834a0f3f9324a6365fc26eca
+Patch0:		openssl-detect.patch
 Patch1:		%{name}-idiscover-ifaces_with_dot_in_name_support.patch
 Patch2:		%{name}-libcrypto.patch
 Patch3:		%{name}-symlink.patch
@@ -106,7 +106,7 @@ Ten pakiet zawiera plik MIB od Intela:
 
 %prep
 %setup -q
-
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
diff --git a/openssl-detect.patch b/openssl-detect.patch
new file mode 100644
index 0000000..3b82104
--- /dev/null
+++ b/openssl-detect.patch
@@ -0,0 +1,35 @@
+--- ipmiutil-3.1.7/configure.ac~	2020-09-03 00:26:09.000000000 +0200
++++ ipmiutil-3.1.7/configure.ac	2021-10-17 22:37:06.524093059 +0200
+@@ -424,31 +424,7 @@
+            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
+-	if test $? -eq 0 ; then
+-		sslver=`rpm -q openssl-devel |cut -f3 -d'-' |cut -f1-2 -d'.'`
+-	fi
+-	if test "$sslver" = ""; then
+-		sslver=`openssl version |awk '{ print $2 }'|cut -f1-2 -d'.'`
+-	fi
+-	if test "$sslver" = "1.1"; then
+-		echo "Detected openssl-$sslver" 
+-		MD2_CFLAGS="-DSKIP_MD2 -DSSL11"
+-	else 
+-	 echo "Detected openssl-$sslver" 
+-	 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
+-			echo "No MD2 detected in openssl libcrypto.so"
+-			MD2_CFLAGS="-DSKIP_MD2"
+-		fi
+-	 else
+-		echo "No openssl $LIB_DIR/libcrypto.so detected"
+-		MD2_CFLAGS="-DSKIP_MD2"
+-	 fi
+-	fi
++	MD2_CFLAGS="-DSKIP_MD2 -DSSL11"
+ 	OS_CFLAGS="-DLINUX $MD2_CFLAGS -fPIC $cfwarn $cfgnu $cfalias $cfhard"
+   else
+      macos=1  # =1 means not mac
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ipmiutil.git/commitdiff/1da6ea2fc25220789e3624967ee1cdab1585fb7e