Merge tag 'upstream/3.0.1'

Upstream version 3.0.1

1 files changed, 24 insertions, 12 deletions

diff --git a/configure b/configure
index 66aac63..bde6c5b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for ipmiutil 3.0.0.
+# Generated by GNU Autoconf 2.63 for ipmiutil 3.0.1.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='ipmiutil'
 PACKAGE_TARNAME='ipmiutil'
-PACKAGE_VERSION='3.0.0'
-PACKAGE_STRING='ipmiutil 3.0.0'
+PACKAGE_VERSION='3.0.1'
+PACKAGE_STRING='ipmiutil 3.0.1'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="util/ipmiutil.c"
@@ -1503,7 +1503,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ipmiutil 3.0.0 to adapt to many kinds of systems.
+\`configure' configures ipmiutil 3.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1573,7 +1573,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ipmiutil 3.0.0:";;
+     short | recursive ) echo "Configuration of ipmiutil 3.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1683,7 +1683,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ipmiutil configure 3.0.0
+ipmiutil configure 3.0.1
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1697,7 +1697,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ipmiutil $as_me 3.0.0, which was
+It was created by ipmiutil $as_me 3.0.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2551,7 +2551,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ipmiutil'
- VERSION='3.0.0'
+ VERSION='3.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13366,15 +13366,27 @@ else
            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
+    # The openssl rpm might not be installed
+    which rpm >/dev/null 2>&1
+	if test $? -eq 0 ; then
+		sslver=`rpm -q openssl-devel |cut -f3 -d'-' |cut -f1-2 -d'.'`
+    else
+        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
+	 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
+	 else
 		echo "No openssl $LIB_DIR/libcrypto.so detected"
 		MD2_CFLAGS="-DSKIP_MD2"
+	 fi
 	fi
 	OS_CFLAGS="-DLINUX $MD2_CFLAGS -fPIC $cfwarn $cfgnu $cfhard"
   else
@@ -13931,7 +13943,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ipmiutil $as_me 3.0.0, which was
+This file was extended by ipmiutil $as_me 3.0.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13994,7 +14006,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-ipmiutil config.status 3.0.0
+ipmiutil config.status 3.0.1
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"