summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-02-17 20:56:53 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-02-17 20:56:53 +0100
commit2adeca46f677bacad1914a3a1eedabaf710c71ad (patch)
tree71028a415516aa9c702e86a6959cb9d2101229a6
parent842dcead48ee80a10afa6e03667e9bf74cb8f2ab (diff)
parentd3c90cdcdf56146af89056ed36bfcc7b4d4956c5 (diff)
Merge tag 'upstream/2.9.8'
Upstream version 2.9.8
-rw-r--r--.configure.ac.swpbin0 -> 16384 bytes
-rw-r--r--ChangeLog26
-rw-r--r--config.h.in3
-rw-r--r--config.h.in~3
-rwxr-xr-xconfigure174
-rw-r--r--configure.ac26
-rw-r--r--debpkg/changelog6
-rw-r--r--doc/Makefile28
-rw-r--r--doc/UserGuide2
-rw-r--r--doc/ipmiutil.spec2
-rw-r--r--lib/Makefile34
-rw-r--r--lib/Makefile.am6
-rw-r--r--lib/Makefile.in6
-rw-r--r--lib/libipmiutil.pc2
-rw-r--r--scripts/Makefile28
-rw-r--r--scripts/ipmi_port.service3
-rwxr-xr-xscripts/ipmiutil.setup9
-rwxr-xr-xsetver4
-rw-r--r--util/ialarms.c2
-rw-r--r--util/icmd.c2
-rw-r--r--util/iconfig.c2
-rw-r--r--util/idcmi.c2
-rw-r--r--util/ievents.c2
-rw-r--r--util/ifirewall.c2
-rw-r--r--util/ifru.c20
-rw-r--r--util/ifruset.c2
-rw-r--r--util/igetevent.c2
-rw-r--r--util/ihealth.c2
-rw-r--r--util/ilan.c2
-rw-r--r--util/imb_api.h29
-rw-r--r--util/ipicmg.c2
-rw-r--r--util/ipmicmd.c8
-rw-r--r--util/ipmidir.c6
-rw-r--r--util/ipmimv.c6
-rw-r--r--util/ipmiutil.c2
-rw-r--r--util/ireset.c2
-rw-r--r--util/isel.c2
-rw-r--r--util/iseltime.c2
-rw-r--r--util/isensor.c3
-rw-r--r--util/iserial.c2
-rw-r--r--util/isol.c2
-rw-r--r--util/itsol.c2
-rw-r--r--util/iwdt.c2
-rw-r--r--util/oem_dell.c2
-rw-r--r--util/oem_sun.c2
-rw-r--r--util/oem_supermicro.c2
46 files changed, 330 insertions, 148 deletions
diff --git a/.configure.ac.swp b/.configure.ac.swp
new file mode 100644
index 0000000..b01444d
--- /dev/null
+++ b/.configure.ac.swp
Binary files differ
diff --git a/ChangeLog b/ChangeLog
index f036aef..ae67e8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4111,3 +4111,29 @@ wdt.8 iwdt.8 (ipmiutil wdt)
ihpm (ipmiutil hpm) ver 1.09
idiscover (ipmiutil discover) ver 1.9
ipmi_port (ipmi_port) ver 1.4
+
+11/20/2015 ARCress ipmiutil-2.9.8beta changes
+ util/ipmidir.c - do not close(iofd) in BSD if <0 (fedora#138819)
+ lib/Makefile.am - fix if no lanplus and openssl missing (Baruch Siach)
+ configure.ac - fix stack protection check for uClibc (Baruch Siach),
+ configure.ac - For HP-UX, clean up GNU .NOEXPORT,
+ Differentiate between FreeBSD 7 and later versions
+ util/ipmimv.c - fix structure packing for FreeBSD 8 & 9
+ scripts/ipmi_port.service - if $IPORTMAP not there in setup, handle cleanly
+
+12/30/2015 ARCress ipmiutil-2.9.8 changes
+ util/isensor.c - show an error message for malformed SDR record
+ util/ipmicmd.c - show vendor/prod debug message with getdeviceid
+ util/ifru.c - fix all %f expects double warnings (Felix Janda)
+ util/imb_api.h - remove extra WCHAR defines, use config.h (Felix Janda)
+ configure.ac - add AC_CHECK_TYPES(wchar_t) (Felix Janda)
+ ipmiutil-2.9.8 contains:
+ ipmiutil (ipmiutil) ver 2.98
+ ...(various subcommands) ver 2.98
+ ifwum (ipmiutil fwum) ver 1.3
+ ihpm (ipmiutil hpm) ver 1.09
+ iekanalyzer (ipmiutil ekanalyzer) ver 1.00
+ idiscover (ipmiutil discover) ver 1.10
+ ipmi_port (ipmi_port) ver 1.4
+
+
diff --git a/config.h.in b/config.h.in
index 86a60af..86c496c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -78,6 +78,9 @@
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
+/* Define to 1 if the system has the type `wchar_t'. */
+#undef HAVE_WCHAR_T
+
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
diff --git a/config.h.in~ b/config.h.in~
index 95d7e2c..8e5136e 100644
--- a/config.h.in~
+++ b/config.h.in~
@@ -78,6 +78,9 @@
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
+/* Define to 1 if the system has the type `wchar_t'. */
+#undef HAVE_WCHAR_T
+
/* Name of package */
#undef PACKAGE
diff --git a/configure b/configure
index b37e09c..65fa9ac 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 2.9.7.
+# Generated by GNU Autoconf 2.63 for ipmiutil 2.9.8.
#
# 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='2.9.7'
-PACKAGE_STRING='ipmiutil 2.9.7'
+PACKAGE_VERSION='2.9.8'
+PACKAGE_STRING='ipmiutil 2.9.8'
PACKAGE_BUGREPORT=''
ac_unique_file="util/ipmiutil.c"
@@ -1502,7 +1502,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 2.9.7 to adapt to many kinds of systems.
+\`configure' configures ipmiutil 2.9.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1572,7 +1572,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ipmiutil 2.9.7:";;
+ short | recursive ) echo "Configuration of ipmiutil 2.9.8:";;
esac
cat <<\_ACEOF
@@ -1681,7 +1681,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ipmiutil configure 2.9.7
+ipmiutil configure 2.9.8
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1695,7 +1695,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 2.9.7, which was
+It was created by ipmiutil $as_me 2.9.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2549,7 +2549,7 @@ fi
# Define the identity of the package.
PACKAGE='ipmiutil'
- VERSION='2.9.7'
+ VERSION='2.9.8'
cat >>confdefs.h <<_ACEOF
@@ -4996,6 +4996,109 @@ _ACEOF
fi
+{ $as_echo "$as_me:$LINENO: checking for wchar_t" >&5
+$as_echo_n "checking for wchar_t... " >&6; }
+if test "${ac_cv_type_wchar_t+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_wchar_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (wchar_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((wchar_t)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_wchar_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
+$as_echo "$ac_cv_type_wchar_t" >&6; }
+if test "x$ac_cv_type_wchar_t" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_WCHAR_T 1
+_ACEOF
+
+
+fi
+
if test $ac_cv_c_compiler_gnu = yes; then
{ $as_echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
@@ -6531,13 +6634,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6534: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:6637: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6537: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:6640: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6540: output\"" >&5)
+ (eval echo "\"\$as_me:6643: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -7731,7 +7834,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7734 "configure"' > conftest.$ac_ext
+ echo '#line 7837 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9096,11 +9199,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9099: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9202: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9103: \$? = $ac_status" >&5
+ echo "$as_me:9206: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9435,11 +9538,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9438: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9541: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9442: \$? = $ac_status" >&5
+ echo "$as_me:9545: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9540,11 +9643,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9543: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9646: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9547: \$? = $ac_status" >&5
+ echo "$as_me:9650: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9595,11 +9698,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9598: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9701: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9602: \$? = $ac_status" >&5
+ echo "$as_me:9705: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12398,7 +12501,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12401 "configure"
+#line 12504 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12494,7 +12597,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12497 "configure"
+#line 12600 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13188,10 +13291,10 @@ else
else
echo "ok, suppress excess warnings"
fi
- rm -f $tmpc $tmpo >/dev/null 2>&1
+ rm -f $tmpc $tmpo >/dev/null 2>&1
echo $ECHO_N "checking compile fortify flags ... $ECHO_C"
cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- echo "int main() { return(1); }" >$tmpc
+ echo "int main() { alloca(100); return(1); }" >$tmpc
$CC -o $tmpo $cfhard $tmpc >/dev/null 2>&1
if test $? -ne 0 ; then
cfhard=
@@ -13199,7 +13302,7 @@ else
else
echo "ok, add"
fi
- rm -f $tmpc $tmpo >/dev/null 2>&1
+ rm -f $tmpc $tmpo >/dev/null 2>&1
if test -f "/etc/debian_version"; then
echo "Detected Debian Linux"
os=debian
@@ -13289,9 +13392,15 @@ else
SHR_LINK=""
else
if test $bsd -eq 0; then
- echo "Detected BSD"
+ # FreeBSD uname -K shows 903000 for 9.3
os=bsd
- OS_CFLAGS="-DBSD -fPIC"
+ osver=`uname -K |cut -c1`
+ echo "Detected BSD $osver"
+ if $osver -eq 7 ; then
+ OS_CFLAGS="-DBSD7 -DBSD -fPIC"
+ else
+ OS_CFLAGS="-DBSD -fPIC"
+ fi
OS_LFLAGS=""
OS_DRIVERS="ipmimv.c ipmidir.c"
drivers="open direct"
@@ -13810,7 +13919,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 2.9.7, which was
+This file was extended by ipmiutil $as_me 2.9.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13873,7 +13982,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-ipmiutil config.status 2.9.7
+ipmiutil config.status 2.9.8
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -15733,8 +15842,11 @@ if test "x$sysname" = "xSunOS"; then
cp -f /tmp/make util/Makefile
fi
if test "x$os" = "xhpux" ; then
- sed -e 's/^.NOEXPORT:/#.NOEXPORT:/' util/Makefile >/tmp/make
- cp -f /tmp/make util/Makefile
+ for mk in Makefile util/Makefile lib/Makefile lib/libipmiutil.pc lib/lanplus/Makefile doc/Makefile scripts/Makefile
+ do
+ sed -e 's/^.NOEXPORT:/#.NOEXPORT:/' $mk >/tmp/make
+ cp -f /tmp/make $mk
+ done
fi
{ $as_echo "$as_me:$LINENO: result: " >&5
diff --git a/configure.ac b/configure.ac
index 344b27a..345a344 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ipmiutil,2.9.7)
+AC_INIT(ipmiutil,2.9.8)
AC_CONFIG_SRCDIR(util/ipmiutil.c)
echo "ipmiutil version ${PACKAGE_VERSION}"
AM_CONFIG_HEADER(config.h)
@@ -26,6 +26,7 @@ AC_C_CONST
AC_TYPE_OFF_T
AC_HEADER_TIME
AC_STRUCT_TM
+AC_CHECK_TYPES(wchar_t)
dnl Checks for library functions.
AC_PROG_GCC_TRADITIONAL
@@ -331,10 +332,10 @@ else
else
echo "ok, suppress excess warnings"
fi
- rm -f $tmpc $tmpo >/dev/null 2>&1
+ rm -f $tmpc $tmpo >/dev/null 2>&1
echo $ECHO_N "checking compile fortify flags ... $ECHO_C"
cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- echo "int main() { return(1); }" >$tmpc
+ echo "int main() { alloca(100); return(1); }" >$tmpc
$CC -o $tmpo $cfhard $tmpc >/dev/null 2>&1
if test $? -ne 0 ; then
cfhard=
@@ -342,7 +343,7 @@ else
else
echo "ok, add"
fi
- rm -f $tmpc $tmpo >/dev/null 2>&1
+ rm -f $tmpc $tmpo >/dev/null 2>&1
if test -f "/etc/debian_version"; then
echo "Detected Debian Linux"
os=debian
@@ -432,9 +433,15 @@ else
SHR_LINK=""
else
if test $bsd -eq 0; then
- echo "Detected BSD"
+ # FreeBSD uname -K shows 903000 for 9.3
os=bsd
- OS_CFLAGS="-DBSD -fPIC"
+ osver=`uname -K |cut -c1`
+ echo "Detected BSD $osver"
+ if [ $osver -eq 7 ]; then
+ OS_CFLAGS="-DBSD7 -DBSD -fPIC"
+ else
+ OS_CFLAGS="-DBSD -fPIC"
+ fi
OS_LFLAGS=""
OS_DRIVERS="ipmimv.c ipmidir.c"
drivers="open direct"
@@ -512,8 +519,11 @@ if test "x$sysname" = "xSunOS"; then
cp -f /tmp/make util/Makefile
fi
if test "x$os" = "xhpux" ; then
- sed -e 's/^.NOEXPORT:/#.NOEXPORT:/' util/Makefile >/tmp/make
- cp -f /tmp/make util/Makefile
+ for mk in Makefile util/Makefile lib/Makefile lib/libipmiutil.pc lib/lanplus/Makefile doc/Makefile scripts/Makefile
+ do
+ sed -e 's/^.NOEXPORT:/#.NOEXPORT:/' $mk >/tmp/make
+ cp -f /tmp/make $mk
+ done
fi
AC_MSG_RESULT([])
diff --git a/debpkg/changelog b/debpkg/changelog
index 61963ed..6ff9cc1 100644
--- a/debpkg/changelog
+++ b/debpkg/changelog
@@ -1,3 +1,9 @@
+ipmiutil (2.9.8-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Andy Cress <arcress@users.sourceforge.net> Thu, 12 Nov 2015 10:20:17 -0500
+
ipmiutil (2.9.7-1) unstable; urgency=low
* New upstream version.
diff --git a/doc/Makefile b/doc/Makefile
index 34948f8..dbb2ee0 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -46,12 +46,12 @@ CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run automake-1.11
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -99,7 +99,7 @@ LIB_DIR = /usr/lib64
LIPO =
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
@@ -113,9 +113,9 @@ OTOOL64 =
PACKAGE = ipmiutil
PACKAGE_BUGREPORT =
PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 2.9.7
+PACKAGE_STRING = ipmiutil 2.9.8
PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 2.9.7
+PACKAGE_VERSION = 2.9.8
PATH_SEPARATOR = :
PKG_DIR = /root/rpmbuild
RANLIB = ranlib
@@ -127,11 +127,11 @@ SHR_LINK = libipmiutil.so.1
STRIP = strip
SUBDIR_S = doc scripts lib util
SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 2.9.7
-abs_builddir = /usr/dev/ipmiutil-2.9.7/doc
-abs_srcdir = /usr/dev/ipmiutil-2.9.7/doc
-abs_top_builddir = /usr/dev/ipmiutil-2.9.7
-abs_top_srcdir = /usr/dev/ipmiutil-2.9.7
+VERSION = 2.9.8
+abs_builddir = /usr/dev/ipmiutil-2.9.8/doc
+abs_srcdir = /usr/dev/ipmiutil-2.9.8/doc
+abs_top_builddir = /usr/dev/ipmiutil-2.9.8
+abs_top_srcdir = /usr/dev/ipmiutil-2.9.8
ac_ct_CC = gcc
ac_ct_DUMPBIN =
am__include = include
@@ -159,7 +159,7 @@ host_vendor = redhat
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.7/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.8/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
diff --git a/doc/UserGuide b/doc/UserGuide
index 5d25330..fef91aa 100644
--- a/doc/UserGuide
+++ b/doc/UserGuide
@@ -1,6 +1,6 @@
IPMIUTIL USER GUIDE
- VERSION 2.9.7
+ VERSION 2.9.8
An easy-to-use IPMI server management utility
diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec
index fdb25c3..facb897 100644
--- a/doc/ipmiutil.spec
+++ b/doc/ipmiutil.spec
@@ -3,7 +3,7 @@
# Copyright (c) 2012 Andy Cress
#
Name: ipmiutil
-Version: 2.9.7
+Version: 2.9.8
Release: 1%{?dist}
Summary: Easy-to-use IPMI server management utilities
License: BSD
diff --git a/lib/Makefile b/lib/Makefile
index 78d967d..e32afa5 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -47,12 +47,12 @@ CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run automake-1.11
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -101,7 +101,7 @@ LIB_DIR = /usr/lib64
LIPO =
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
@@ -115,9 +115,9 @@ OTOOL64 =
PACKAGE = ipmiutil
PACKAGE_BUGREPORT =
PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 2.9.7
+PACKAGE_STRING = ipmiutil 2.9.8
PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 2.9.7
+PACKAGE_VERSION = 2.9.8
PATH_SEPARATOR = :
PKG_DIR = /root/rpmbuild
RANLIB = ranlib
@@ -129,11 +129,11 @@ SHR_LINK = libipmiutil.so.1
STRIP = strip
SUBDIR_S = doc scripts lib util
SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 2.9.7
-abs_builddir = /usr/dev/ipmiutil-2.9.7/lib
-abs_srcdir = /usr/dev/ipmiutil-2.9.7/lib
-abs_top_builddir = /usr/dev/ipmiutil-2.9.7
-abs_top_srcdir = /usr/dev/ipmiutil-2.9.7
+VERSION = 2.9.8
+abs_builddir = /usr/dev/ipmiutil-2.9.8/lib
+abs_srcdir = /usr/dev/ipmiutil-2.9.8/lib
+abs_top_builddir = /usr/dev/ipmiutil-2.9.8
+abs_top_srcdir = /usr/dev/ipmiutil-2.9.8
ac_ct_CC = gcc
ac_ct_DUMPBIN =
am__include = include
@@ -161,7 +161,7 @@ host_vendor = redhat
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.7/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.8/install-sh
libdir = $(iprefix)/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -410,8 +410,10 @@ distclean:
cd lanplus; make distclean
install:
- $(MKDIR) ${datato}
- cd lanplus; make install
+ if [ "$(PLUSFLAGS)" = "-DHAVE_LANPLUS" ]; then \
+ $(MKDIR) ${datato} ; \
+ cd lanplus; make install ; \
+ fi
check:
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 805a218..16400f2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -51,8 +51,10 @@ distclean:
cd lanplus; make distclean
install:
- $(MKDIR) ${datato}
- cd lanplus; make install
+ if [ "$(PLUSFLAGS)" = "-DHAVE_LANPLUS" ]; then \
+ $(MKDIR) ${datato} ; \
+ cd lanplus; make install ; \
+ fi
check:
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 3bcfeda..a203723 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -410,8 +410,10 @@ distclean:
cd lanplus; make distclean
install:
- $(MKDIR) ${datato}
- cd lanplus; make install
+ if [ "$(PLUSFLAGS)" = "-DHAVE_LANPLUS" ]; then \
+ $(MKDIR) ${datato} ; \
+ cd lanplus; make install ; \
+ fi
check:
diff --git a/lib/libipmiutil.pc b/lib/libipmiutil.pc
index a952285..b6e9013 100644
--- a/lib/libipmiutil.pc
+++ b/lib/libipmiutil.pc
@@ -8,6 +8,6 @@ nutuser=@RUN_AS_USER@
Name: libipmiutil
Description: Library for ipmiutil
-Version: 2.9.7
+Version: 2.9.8
Libs: -L${libdir} -lipmi_lanplus
Cflags: -I${includedir}
diff --git a/scripts/Makefile b/scripts/Makefile
index fc29dd3..77c7fe8 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -46,12 +46,12 @@ CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run automake-1.11
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -99,7 +99,7 @@ LIB_DIR = /usr/lib64
LIPO =
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
@@ -113,9 +113,9 @@ OTOOL64 =
PACKAGE = ipmiutil
PACKAGE_BUGREPORT =
PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 2.9.7
+PACKAGE_STRING = ipmiutil 2.9.8
PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 2.9.7
+PACKAGE_VERSION = 2.9.8
PATH_SEPARATOR = :
PKG_DIR = /root/rpmbuild
RANLIB = ranlib
@@ -127,11 +127,11 @@ SHR_LINK = libipmiutil.so.1
STRIP = strip
SUBDIR_S = doc scripts lib util
SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 2.9.7
-abs_builddir = /usr/dev/ipmiutil-2.9.7/scripts
-abs_srcdir = /usr/dev/ipmiutil-2.9.7/scripts
-abs_top_builddir = /usr/dev/ipmiutil-2.9.7
-abs_top_srcdir = /usr/dev/ipmiutil-2.9.7
+VERSION = 2.9.8
+abs_builddir = /usr/dev/ipmiutil-2.9.8/scripts
+abs_srcdir = /usr/dev/ipmiutil-2.9.8/scripts
+abs_top_builddir = /usr/dev/ipmiutil-2.9.8
+abs_top_srcdir = /usr/dev/ipmiutil-2.9.8
ac_ct_CC = gcc
ac_ct_DUMPBIN =
am__include = include
@@ -159,7 +159,7 @@ host_vendor = redhat
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.7/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.8/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
diff --git a/scripts/ipmi_port.service b/scripts/ipmi_port.service
index d09b37c..80ed31a 100644
--- a/scripts/ipmi_port.service
+++ b/scripts/ipmi_port.service
@@ -6,8 +6,7 @@ After=network.target
Type=forking
PIDFile=/run/ipmi_port.pid
EnvironmentFile=/usr/share/ipmiutil/ipmiutil.env
-ExecStartPre=/usr/share/ipmiutil/ipmiutil.setup
-ExecStart=/usr/sbin/ipmi_port -b
+ExecStart=/usr/share/ipmiutil/ipmiutil.setup >/dev/null && /usr/sbin/ipmi_port -b || :
[Install]
WantedBy=multi-user.target
diff --git a/scripts/ipmiutil.setup b/scripts/ipmiutil.setup
index 9087021..0330a29 100755
--- a/scripts/ipmiutil.setup
+++ b/scripts/ipmiutil.setup
@@ -37,8 +37,13 @@ isetup() {
retval=6
else
# portmap may have been replaced by portreserve
- [ -x $IPORTMAP ] || exit 6
- retval=0
+ # only need ipmi_port if portmap exists
+ if [ -x $IPORTMAP ]
+ then
+ retval=0
+ else
+ retval=6
+ fi
fi
return $retval
}
diff --git a/setver b/setver
index 2e59ec2..9f8d4a1 100755
--- a/setver
+++ b/setver
@@ -6,7 +6,7 @@
# [doinc?] is 'n'.
# if [doinc?] is 'r', reverse increment (decrement).
#
-ver=2.9.7
+ver=2.9.9
rel=1
tmped=/tmp/edver.tmp
tmpspec=/tmp/edspec.tmp
@@ -201,7 +201,7 @@ cmdc="ialarms.c icmd.c iconfig.c ievents.c ifru.c igetevent.c ihealth.c
ilan.c ireset.c isel.c isensor.c iserial.c isol.c iwdt.c
ifruset.c oem_sun.c ipicmg.c ifirewall.c oem_dell.c itsol.c
idcmi.c iseltime.c oem_supermicro.c
- iekanalyzer.c ifwum.c ihpm.c idiscover.c"
+ ifwum.c ihpm.c iekanalyzer.c idiscover.c"
if [ $skipinc -ne 1 ]
then
diff --git a/util/ialarms.c b/util/ialarms.c
index e13960b..2519345 100644
--- a/util/ialarms.c
+++ b/util/ialarms.c
@@ -75,7 +75,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/*
* Global variables
*/
-static char * progver = "2.97";
+static char * progver = "2.98";
static char * progname = "ialarms";
static char fdebug = 0;
static char fbmctam = 0;
diff --git a/util/icmd.c b/util/icmd.c
index 4472879..b481c96 100644
--- a/util/icmd.c
+++ b/util/icmd.c
@@ -78,7 +78,7 @@ extern void ipmi_lan_set_timeout(int ipmito, int tries, int pingto);
/*
* Global variables
*/
-static char * progver = "2.97";
+static char * progver = "2.98";
static char * progname = "icmd";
static char fdebug = 0;
static char fquiet = 0;
diff --git a/util/iconfig.c b/util/iconfig.c
index ea2b65d..6f7fd83 100644
--- a/util/iconfig.c
+++ b/util/iconfig.c
@@ -171,7 +171,7 @@ typedef struct
/*
* Global variables
*/
-static char * progver = "2.97";
+static char * progver = "2.98";
static char * progname = "iconfig";
static char fdebug = 0;
static char fipmilan = 0;
diff --git a/util/idcmi.c b/util/idcmi.c
index 173e55a..2786efb 100644
--- a/util/idcmi.c
+++ b/util/idcmi.c
@@ -62,7 +62,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "idcmi.h"
static char * progname = "idcmi";
-static char * progver = "2.97";
+static char * progver = "2.98";
extern char fdebug; /*from ipmicmd.c*/
static uchar g_bus = PUBLIC_BUS;
static uchar g_sa = BMC_SA;
diff --git a/util/ievents.c b/util/ievents.c
index dcef599..cc40318 100644
--- a/util/ievents.c
+++ b/util/ievents.c
@@ -76,7 +76,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define SELprintf printf
#define SMS_SA 0x41
#define SMI_SA 0x21
-static char *progver = "2.97";
+static char *progver = "2.98";
static char *progname = "ievents";
static char fsensdesc = 0; /* 1= get extended sensor descriptions*/
static char fcanonical = 0; /* 1= show canonical, delimited output*/
diff --git a/util/ifirewall.c b/util/ifirewall.c
index 9a9fa25..18dca7a 100644
--- a/util/ifirewall.c
+++ b/util/ifirewall.c
@@ -64,7 +64,7 @@
/* global variables */
static char * progname = "ifirewall";
-static char * progver = "2.97";
+static char * progver = "2.98";
static char fdebug = 0;
static uchar g_bus = PUBLIC_BUS;
static uchar g_sa = BMC_SA;
diff --git a/util/ifru.c b/util/ifru.c
index 61a19f3..b10c42e 100644
--- a/util/ifru.c
+++ b/util/ifru.c
@@ -116,7 +116,7 @@ extern int ipmi_kontronoem_main(void * intf, int argc, char ** argv);
#endif
static char *progname = "ifru";
-static char *progver = "2.97";
+static char *progver = "2.98";
static int vend_id = 0;
static int prod_id = 0;
static char fdebug = 0;
@@ -736,33 +736,33 @@ void show_fru_multi(char *tag, int midx, uchar mtype, uchar *pdata, int dlen)
printf("\t Standby power \t%c %s\n", bdelim,
(b2 ? "Yes" : "No"));
v1 = pdata[1] + (pdata[2] << 8);
- printf("\t Nominal voltage \t%c %.2f V\n", bdelim, v1 / 100);
+ printf("\t Nominal voltage \t%c %.2f V\n", bdelim, (double)v1 / 100);
v2 = pdata[3] + (pdata[4] << 8);
v3 = pdata[5] + (pdata[6] << 8);
printf("\t Voltage deviation \t%c + %.2f V / - %.2f V\n",
- bdelim, v3/100, v2/100);
+ bdelim, (double)v3/100, (double)v2/100);
v4 = pdata[7] + (pdata[8] << 8);
printf("\t Ripple and noise pk-pk \t%c %d mV\n", bdelim, v4);
v5 = pdata[9] + (pdata[10] << 8);
- printf("\t Min current draw \t%c %.3f A\n", bdelim, v5/1000);
+ printf("\t Min current draw \t%c %.3f A\n", bdelim, (double)v5/1000);
v6 = pdata[11] + (pdata[12] << 8);
- printf("\t Max current draw \t%c %.3f A\n", bdelim, v6/1000);
+ printf("\t Max current draw \t%c %.3f A\n", bdelim, (double)v6/1000);
break;
case 0x02: /*DC Load*/
b1 = pdata[0] & 0x0f;
printf("%sDC Load %c number %d\n",mystr,bdelim,b1);
v1 = pdata[1] + (pdata[2] << 8);
- printf("\t Nominal voltage \t%c %.2f V\n", bdelim, v1 / 100);
+ printf("\t Nominal voltage \t%c %.2f V\n", bdelim, (double)v1 / 100);
v2 = pdata[3] + (pdata[4] << 8);
v3 = pdata[5] + (pdata[6] << 8);
- printf("\t Min voltage allowed \t%c %.2f A\n", bdelim, v2);
- printf("\t Max voltage allowed \t%c %.2f A\n", bdelim, v3);
+ printf("\t Min voltage allowed \t%c %.2f A\n", bdelim, (double)v2);
+ printf("\t Max voltage allowed \t%c %.2f A\n", bdelim, (double)v3);
v4 = pdata[7] + (pdata[8] << 8);
printf("\t Ripple and noise pk-pk \t%c %d mV\n", bdelim, v4);
v5 = pdata[9] + (pdata[10] << 8);
- printf("\t Min current load \t%c %.3f A\n", bdelim, v5/1000);
+ printf("\t Min current load \t%c %.3f A\n", bdelim, (double)v5/1000);
v6 = pdata[11] + (pdata[12] << 8);
- printf("\t Max current load \t%c %.3f A\n", bdelim, v6/1000);
+ printf("\t Max current load \t%c %.3f A\n", bdelim, (double)v6/1000);
break;
case 0x03: /*Management Access*/
b1 = pdata[0];
diff --git a/util/ifruset.c b/util/ifruset.c
index f8beada..b7a894c 100644
--- a/util/ifruset.c
+++ b/util/ifruset.c
@@ -106,7 +106,7 @@ extern void fmt_time(time_t etime, char *buf, int bufsz); /*see ievents.c*/
#define IPROD_OEM 7
static char *progname = "ifruset";
-static char *progver = "2.97";
+static char *progver = "2.98";
static char fdebug = 0;
static char fpicmg = 0;
static char fonlybase = 0;
diff --git a/util/igetevent.c b/util/igetevent.c
index 25d0d8e..9d1786c 100644
--- a/util/igetevent.c
+++ b/util/igetevent.c
@@ -169,7 +169,7 @@ extern void free_sdr_cache(uchar *pret); /*see isensor.c*/
* Global variables
*/
static char * progname = "igetevent";
-static char * progver = "2.97";
+static char * progver = "2.98";
static char fdebug = 0;
static char fipmilan = 0;
static char frunonce = 0;
diff --git a/util/ihealth.c b/util/ihealth.c
index fbe5f0d..76f1121 100644
--- a/util/ihealth.c
+++ b/util/ihealth.c
@@ -82,7 +82,7 @@ extern int oem_supermicro_get_firmware_str(char *pstr, int sz); /*oem_supermicro
* Global variables
*/
static char * progname = "ihealth";
-static char * progver = "2.97";
+static char * progver = "2.98";
static char fdebug = 0;
static char fipmilan = 0;
static char fcanonical = 0;
diff --git a/util/ilan.c b/util/ilan.c
index b314c73..3499ed9 100644
--- a/util/ilan.c
+++ b/util/ilan.c
@@ -305,7 +305,7 @@ extern char *get_sensor_type_desc(uchar stype); /*from ievents.c*/
/*
* Global variables
*/
-static char * progver = "2.97";
+static char * progver = "2.98";
static char * progname = "ilan";
static char fdebug = 0;
static char fipmilan = 0;
diff --git a/util/imb_api.h b/util/imb_api.h
index e6951f8..cca3c5f 100644
--- a/util/imb_api.h
+++ b/util/imb_api.h
@@ -37,24 +37,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _WINDEFS_H
#define _WINDEFS_H
-#ifndef NULL
-#define NULL 0
-#endif
-#define TRUE 1
-#define FALSE 0
-
#if defined(WIN32) | defined(BSD) | defined(DOS)
/* WIN32 defines wchar_t in stdio.h */
/* BSD defines wchar_t in stdlib.h */
/* DOS defines wchar_t in stdlib.h */
-#else
- // defined(LINUX) | defined(SOLARIS)
-#if !defined(_WCHAR_T) && !defined(__WCHAR_TYPE__)
-#define _WCHAR_T
+#else
+#if defined(LINUX)
+/* LINUX should define wchar_t in stdlib.h */
+#include <stdlib.h>
+#endif
+// SOLARIS or MACOS may need wchar_t
+#include "config.h"
+#if !HAVE_WCHAR_T
typedef long wchar_t;
#endif
#endif
+#ifndef NULL
+#define NULL 0
+#endif
+#define TRUE 1
+#define FALSE 0
#define far
#define near
#define FAR far
@@ -136,9 +139,6 @@ typedef LARGE_INTEGER * PPHYSICAL_ADDRESS;
typedef ULARGE_INTEGER * PULARGE_INTEGER;
typedef UCHAR BOOLEAN;
typedef BOOLEAN *PBOOLEAN;
-typedef wchar_t WCHAR;
-typedef WCHAR *PWCHAR, *PWSTR;
-typedef CONST WCHAR *LPCWSTR, *PCWSTR;
/*
Unicode strings are counted 16-bit character strings. If they are
@@ -147,10 +147,9 @@ typedef CONST WCHAR *LPCWSTR, *PCWSTR;
typedef struct _UNICODE_STRING {
USHORT Length;
USHORT MaximumLength;
- PWSTR Buffer;
+ wchar_t *Buffer;
} UNICODE_STRING;
typedef UNICODE_STRING *PUNICODE_STRING;
-#define UNICODE_NULL ((WCHAR)0) /* winnt*/
#define IN /* */
#define OUT /* */
#define OPTIONAL /* */
diff --git a/util/ipicmg.c b/util/ipicmg.c
index 7315270..a920f37 100644
--- a/util/ipicmg.c
+++ b/util/ipicmg.c
@@ -81,7 +81,7 @@
/* Global data */
static char * progname = "ipicmg";
-static char * progver = "2.97";
+static char * progver = "2.98";
static char fdebug = 0;
static char fset_mc = 0;
static uint8_t g_bus = PUBLIC_BUS;
diff --git a/util/ipmicmd.c b/util/ipmicmd.c
index d969173..efaadec 100644
--- a/util/ipmicmd.c
+++ b/util/ipmicmd.c
@@ -1058,6 +1058,14 @@ int ipmi_getdeviceid(uchar *presp, int sresp, char fdebug)
i = sresp;
if (i > sizeof(my_devid)) i = sizeof(my_devid);
memcpy(my_devid,presp,i); /* save device id for later use */
+ if (fdebug) {
+ uchar maj,min,iver;
+ int vend, prod;
+ get_devid_ver(&maj,&min,&iver);
+ get_mfgid(&vend, &prod);
+ printf("devid: firmware ver %x.%02x, IPMI v%02x, vendor=%d prod=%d\n",
+ maj,min,iver,vend,prod);
+ }
return(ACCESS_OK); /* success */
}
diff --git a/util/ipmidir.c b/util/ipmidir.c
index 501f47b..2aeb6f3 100644
--- a/util/ipmidir.c
+++ b/util/ipmidir.c
@@ -473,8 +473,10 @@ int ipmi_close_direct(void)
{
int status = 0;
#if defined(BSD) || defined(MACOS) || defined(HPUX)
- close(iofd);
- iofd = -1;
+ if (iofd >= 0) {
+ close(iofd);
+ iofd = -1;
+ }
#endif
/* clear lock for driverless interface */
status = clear_lock_dir();
diff --git a/util/ipmimv.c b/util/ipmimv.c
index 4404beb..accda41 100644
--- a/util/ipmimv.c
+++ b/util/ipmimv.c
@@ -112,7 +112,7 @@ struct timeval {
#endif
int ipmi_timeout_mv = 10; /* 10 seconds, was 5 sec */
-#if defined(BSD) || defined(MACOS) || defined(HPUX)
+#if defined(BSD7)
#pragma pack(1)
#endif
@@ -153,8 +153,10 @@ struct ipmi_cmdspec
unsigned char netfn;
unsigned char cmd;
};
-#if defined(BSD) || defined(MACOS) || defined(HPUX)
+#if defined(BSD7)
#pragma pack()
+#endif
+#if defined(BSD) || defined(MACOS) || defined(HPUX)
/* FreeBSD 7.x ipmi ioctls, use _IOW */
#define IPMI_IOC_MAGIC 'i'
#define IPMICTL_RECEIVE_MSG_TRUNC _IOWR(IPMI_IOC_MAGIC, 11, struct ipmi_recv)
diff --git a/util/ipmiutil.c b/util/ipmiutil.c
index d5ad57d..4c04956 100644
--- a/util/ipmiutil.c
+++ b/util/ipmiutil.c
@@ -57,7 +57,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "ipmiutil.h"
static char *progname = "ipmiutil";
-static char *progver = "2.97";
+static char *progver = "2.98";
// static char fdebug = 0;
/*int ipmiutil(int argc, char **argv); */
diff --git a/util/ireset.c b/util/ireset.c
index 713599d..a796393 100644
--- a/util/ireset.c
+++ b/util/ireset.c
@@ -108,7 +108,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/*
* Global variables
*/
-static char * progver = "2.97";
+static char * progver = "2.98";
static char * progname = "ireset";
static uchar ipmi_maj;
static uchar ipmi_min;
diff --git a/util/isel.c b/util/isel.c
index 3492342..04c7c97 100644
--- a/util/isel.c
+++ b/util/isel.c
@@ -162,7 +162,7 @@ typedef struct
#define RDATA_OFFSET 13 //byte offset to the record event data
static char *progname = "isel";
-static char *progver = "2.97";
+static char *progver = "2.98";
#ifdef WIN32
#define IDXFILE "sel.idx"
static char idxfile[80] = IDXFILE;
diff --git a/util/iseltime.c b/util/iseltime.c
index 0675cce..9b74231 100644
--- a/util/iseltime.c
+++ b/util/iseltime.c
@@ -75,7 +75,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/*
* Global variables
*/
-static char * progver = "2.97";
+static char * progver = "2.98";
static char * progname = "iseltime";
static char fdebug = 0;
static char fset = 0;
diff --git a/util/isensor.c b/util/isensor.c
index 6be2836..6aaf3fb 100644
--- a/util/isensor.c
+++ b/util/isensor.c
@@ -247,7 +247,7 @@ char *decode_entity_id(int id) {
* Global Data
************************/
static char *progname = "isensor";
-static char *progver = "2.97";
+static char *progver = "2.98";
#ifdef WIN32
static char savefile[] = "%ipmiutildir%\\thresholds.cmd";
#else
@@ -1298,6 +1298,7 @@ int GetSDR(int r_id, int *r_next, uchar *recdata, int srecdata, int *rlen)
if (sresp >= 2) thislen = sresp - 2;
else thislen = 0;
reclen = off + thislen; /* truncate, stop reading */
+ fprintf(stderr,"SDR record %x is malformed, length %d is less than minimum %d\n",sresp,thislen+2);
}
/* successful */
memcpy(&resp[off],&respchunk[2],thislen);
diff --git a/util/iserial.c b/util/iserial.c
index 48145ea..d4fd427 100644
--- a/util/iserial.c
+++ b/util/iserial.c
@@ -155,7 +155,7 @@ typedef struct
/*
* Global variables
*/
-static char * progver = "2.97";
+static char * progver = "2.98";
static char * progname = "iserial";
static int vend_id = 0;
static int prod_id = 0;
diff --git a/util/isol.c b/util/isol.c
index c73099a..d141452 100644
--- a/util/isol.c
+++ b/util/isol.c
@@ -165,7 +165,7 @@ void dbglog( char *pattn, ... ); /*local prototype*/
/*
* Global variables
*/
-static char * progver = "2.97";
+static char * progver = "2.98";
static char * progname = "isol";
static char fdebug = 0;
static char fpicmg = 0;
diff --git a/util/itsol.c b/util/itsol.c
index e713982..9aad458 100644
--- a/util/itsol.c
+++ b/util/itsol.c
@@ -98,7 +98,7 @@ int gettimeofday(struct timeval *tv, struct timezone *tz);
extern int verbose;
extern char fdebug; /*from ipmicmd.c*/
static char * progname = "itsol";
-static char * progver = "2.97";
+static char * progver = "2.98";
static uchar g_bus = PUBLIC_BUS;
static uchar g_sa = BMC_SA;
static uchar g_lun = BMC_LUN;
diff --git a/util/iwdt.c b/util/iwdt.c
index 66db234..552867d 100644
--- a/util/iwdt.c
+++ b/util/iwdt.c
@@ -100,7 +100,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/*
* Global variables
*/
-static char * progver = "2.97";
+static char * progver = "2.98";
static char * progname = "iwdt";
static char fdebug = 0;
static char fdontlog = 0;
diff --git a/util/oem_dell.c b/util/oem_dell.c
index 530f16a..e700ebd 100644
--- a/util/oem_dell.c
+++ b/util/oem_dell.c
@@ -132,7 +132,7 @@ char NIC_Selection_Mode_String_12g[] [50] = {
"shared with failover all loms"
};
-static char * progver = "2.97";
+static char * progver = "2.98";
static char * progname = "idelloem";
static int verbose = 0;
static char fdebug = 0;
diff --git a/util/oem_sun.c b/util/oem_sun.c
index fc899bd..7ab480e 100644
--- a/util/oem_sun.c
+++ b/util/oem_sun.c
@@ -109,7 +109,7 @@ static const struct valstr sunoem_led_mode_optvals[] = {
/* global variables */
static char * progname = "isunoem";
-static char * progver = "2.97";
+static char * progver = "2.98";
static char fdebug = 0;
static uchar g_bus = PUBLIC_BUS;
static uchar g_sa = BMC_SA;
diff --git a/util/oem_supermicro.c b/util/oem_supermicro.c
index 35df1bd..0c4a001 100644
--- a/util/oem_supermicro.c
+++ b/util/oem_supermicro.c
@@ -66,7 +66,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
void set_loglevel(int level); /*prototype */
extern char fsm_debug; /*mem_if.c*/
-static char * progver = "2.97";
+static char * progver = "2.98";
static char * progname = "ismcoem";
static int verbose = 0;
static char fdebug = 0;