From 596189b7b38b9869fa632f9f15fe76652c4d6a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Sun, 22 Dec 2019 16:44:47 +0100
Subject: New upstream version 3.1.5
---
ChangeLog | 11 +++++++++++
Makefile.in | 2 +-
TODO | 18 +++++++++--------
buildmin.cmd | 9 +++++++--
buildwin.cmd | 13 +++++++++----
buildwin32.cmd | 50 ------------------------------------------------
buildwin64.cmd | 50 ------------------------------------------------
buildwinARM64.cmd | 49 +++++++++++++++++++++++++++++++++++++++++++++++
configure | 20 +++++++++----------
configure.ac | 2 +-
debpkg/changelog | 6 ++++++
doc/Makefile | 30 ++++++++++++++---------------
doc/UserGuide | 2 +-
doc/ipmiutil.spec | 2 +-
lib/Makefile | 30 ++++++++++++++---------------
lib/lanplus/ipmiplus.mak | 6 +++++-
lib/libipmiutil.pc | 2 +-
scripts/Makefile | 30 ++++++++++++++---------------
setver | 2 +-
util/ievents.c | 2 +-
util/ipmiutil.c | 2 +-
util/ipmiutil.mak | 2 +-
util/ipmiutil64.mak | 2 --
util/isensor.c | 16 ++++++++++------
24 files changed, 171 insertions(+), 187 deletions(-)
delete mode 100644 buildwin32.cmd
delete mode 100644 buildwin64.cmd
create mode 100644 buildwinARM64.cmd
diff --git a/ChangeLog b/ChangeLog
index 602ce6b..dc4b5a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4357,3 +4357,14 @@ wdt.8 iwdt.8 (ipmiutil wdt)
util/isel.c - resolve compile warnings
util/iconfig.c - resolve compile warnings
+11/01/2019 ARCress ipmiutil-3.1.5 changes (iver 3.15)
+ Windows EXEs built with openssl 1.0.2
+ util/isensor.c - workaround for Pigeon Point bad sa in SDR
+ buildwinARM64.cmd - new for ARM64 build (SF ticket# 38),
+ Contributed by Hozefa Karachiwala
+ util/ipmiutil64.mak - changed for ARM64,
+ Contributed by Hozefa Karachiwala
+ lib/lanplus/ipmiplus.mak - changed for ARM64,
+ Contributed by Hozefa Karachiwala
+ buildwin.cmd - detect/set MARCH=IA86 or X64 from vcvars
+ buildmin.cmd - detect/set MARCH=IA86 or X64 for minimal
diff --git a/Makefile.in b/Makefile.in
index 790eecf..c7737d5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -567,7 +567,7 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
diff --git a/TODO b/TODO
index eab5ca2..3b50338 100644
--- a/TODO
+++ b/TODO
@@ -1,17 +1,10 @@
IPMIUTIL PROJECT TODO LIST:
-Add subcommand to consolidate user functions
- user list (shows max,enabled, lists all users)
- user enable <user_id> [chan]
- user disable <user_id>
- user set name <user_id> <username>
- user set password <user_id> [<password>]
- user set priv <user_id> <priv_level> [chan]
-
IPV6 for IPMI LAN on Windows:
Currently support IPV6 on Linux, but need to implement for Windows also
. implement IPV6 for Windows (#ifdef WIN32 case)
+ PARTIAL in ipmiutil-3.1.4 07/18/2019 with HAVE_IPV6, not fully enabled
Thread-safe changes for IPMI LAN:
Change ipmicmd.c/ipmilan.c to be thread-safe if accessing multiple nodes.
@@ -76,6 +69,15 @@ Add a function to send ctl-alt-del through SOL console
------------------------------------------------------------------------------
IPMIUTIL COMPLETED TODO TASKS:
+Add subcommand to consolidate user functions
+ user list (shows max,enabled, lists all users)
+ user enable <user_id> [chan]
+ user disable <user_id>
+ user set name <user_id> <username>
+ user set password <user_id> [<password>]
+ user set priv <user_id> <priv_level> [chan]
+ COMPLETE in ipmiutil-3.0.3 03/24/2017
+
Test SuperMicro DIMM event logic (pending bad DIMM)
COMPLETE in ipmiutil-2.9.9, revised code implemented
diff --git a/buildmin.cmd b/buildmin.cmd
index bf40503..5b22b6f 100644
--- a/buildmin.cmd
+++ b/buildmin.cmd
@@ -13,9 +13,14 @@ REM check for getopt.c,h
set | findstr VCINSTALLDIR
if %errorlevel% EQU 1 goto vcerror
-set UTMAKE=ipmiutil2.mak
echo %LIBPATH% |findstr /C:64 >NUL
-if %errorlevel% EQU 0 set UTMAKE=ipmiutil2-64.mak
+if %errorlevel% EQU 0 (
+ set MARCH=X64
+ set UTMAKE=ipmiutil2-64.mak
+) else (
+ set MARCH=IX86
+ set UTMAKE=ipmiutil2.mak
+)
cd util
nmake /nologo -f %UTMAKE% all
diff --git a/buildwin.cmd b/buildwin.cmd
index 4a6eb8d..f503984 100644
--- a/buildwin.cmd
+++ b/buildwin.cmd
@@ -1,6 +1,6 @@
@echo off
REM # buildwin.cmd
-REM # build ipmiutil for windows
+REM # build ipmiutil for windows, detecting 32-bit/64-bit from LIBPATH
REM #
REM # First download a copy of getopt.c getopt.h.
REM # copy getopt.* util
@@ -21,9 +21,15 @@ REM check for ssl libs
REM check for ssl includes
REM call mkssl
-set UTMAKE=ipmiutil.mak
+
echo %LIBPATH% |findstr /C:64 >NUL
-if %errorlevel% EQU 0 set UTMAKE=ipmiutil64.mak
+if %errorlevel% EQU 0 (
+ set MARCH=X64
+ set UTMAKE=ipmiutil64.mak
+) else (
+ set MARCH=IX86
+ set UTMAKE=ipmiutil.mak
+)
cd lib
nmake /nologo -f ipmilib.mak all
@@ -43,4 +49,3 @@ echo First need to run vcvars.bat
echo Check that VCINSTALLDIR and LIBPATH are correct
:done
-
diff --git a/buildwin32.cmd b/buildwin32.cmd
deleted file mode 100644
index adc427b..0000000
--- a/buildwin32.cmd
+++ /dev/null
@@ -1,50 +0,0 @@
-@echo off
-REM # buildwin32.cmd
-REM # build ipmiutil for windows
-REM #
-REM # First download a copy of getopt.c getopt.h.
-REM # copy getopt.* util
-REM # Then download and build a copy of openssl for Windows,
-REM # and copy the built openssl files needed to lib & inc.
-REM # copy libeay32.lib ssleay32.lib lib
-REM # copy libeay32.dll ssleay32.dll util
-REM # copy include\openssl\*.h lib\lanplus\inc\openssl
-REM #
-REM # You should either run this from the Visual Studio Command Line,
-REM # or first run the appropriate vcvars.bat script.
-set | findstr VCINSTALLDIR
-if %errorlevel% EQU 1 goto vcerror
-
-call vcvars32.bat
-
-REM TODO, prebuild checking:
-REM check for getopt.c,h
-REM check for ssl libs
-REM check for ssl includes
-REM call mkssl
-
-set UTMAKE=ipmiutil.mak
-echo %LIBPATH% |findstr /C:64 >NUL
-if %errorlevel% EQU 0 goto vcerror
-
-call cleanwin.cmd
-
-cd lib
-nmake /nologo -f ipmilib.mak all
-cd ..
-REM # echo make lib done
-
-cd util
-nmake /nologo -f %UTMAKE% all
-cd ..
-REM # echo make util done
-
-echo buildwin32 ipmiutil done
-goto done
-
-:vcerror
-echo Either VCINSTALLDIR is missing or LIBPATH includes 64bit
-echo Need to run vcvars32.bat for 32bit from a fresh session
-
-:done
-
diff --git a/buildwin64.cmd b/buildwin64.cmd
deleted file mode 100644
index ae61fbf..0000000
--- a/buildwin64.cmd
+++ /dev/null
@@ -1,50 +0,0 @@
-@echo off
-REM # buildwin.cmd
-REM # build ipmiutil for windows
-REM #
-REM # First download a copy of getopt.c getopt.h.
-REM # copy getopt.* util
-REM # Then download and build a copy of openssl for Windows,
-REM # and copy the built openssl files needed to lib & inc.
-REM # copy libeay32.lib ssleay32.lib lib
-REM # copy libeay32.dll ssleay32.dll util
-REM # copy include\openssl\*.h lib\lanplus\inc\openssl
-REM #
-REM # You should either run this from the Visual Studio Command Line,
-REM # or first run the appropriate vcvars.bat script.
-set | findstr VCINSTALLDIR
-if %errorlevel% EQU 1 goto vcerror
-
-call vcvars64.bat
-
-REM TODO, prebuild checking:
-REM check for getopt.c,h
-REM check for ssl libs
-REM check for ssl includes
-REM call mkssl
-
-set UTMAKE=ipmiutil64.mak
-echo %LIBPATH% |findstr /C:64 >NUL
-if %errorlevel% EQU 1 goto vcerror
-
-call cleanwin.cmd
-
-cd lib
-nmake /nologo -f ipmilib.mak all
-cd ..
-REM # echo make lib done
-
-cd util
-nmake /nologo -f %UTMAKE% all
-cd ..
-REM # echo make util done
-
-echo buildwin64 ipmiutil done
-goto done
-
-:vcerror
-echo Either VCINSTALLDIR is missing or LIBPATH does not include 64bit
-echo Need to run vcvars64.bat for 64bit from a fresh session
-
-:done
-
diff --git a/buildwinARM64.cmd b/buildwinARM64.cmd
new file mode 100644
index 0000000..aa9dc1e
--- /dev/null
+++ b/buildwinARM64.cmd
@@ -0,0 +1,49 @@
+@echo off
+REM # buildwin.cmd
+REM # build ipmiutil for windows
+REM #
+REM # First download a copy of getopt.c getopt.h.
+REM # copy getopt.* util
+REM # Then download and build a copy of openssl for Windows,
+REM # and copy the built openssl files needed to lib & inc.
+REM # copy libeay32.lib ssleay32.lib lib
+REM # copy libeay32.dll ssleay32.dll util
+REM # copy include\openssl\*.h lib\lanplus\inc\openssl
+REM #
+REM # You should either run this from the Visual Studio Command Line,
+REM # or first run the appropriate vcvars.bat script.
+set | findstr VCINSTALLDIR
+if %errorlevel% EQU 1 goto vcerror
+
+REM TODO, prebuild checking:
+REM check for getopt.c,h
+REM check for ssl libs
+REM check for ssl includes
+REM call mkssl
+
+set MARCH=ARM64
+set DSSL11=TRUE
+set UTMAKE=ipmiutil.mak
+echo %LIBPATH% |findstr /C:64 >NUL
+if %errorlevel% EQU 0 set UTMAKE=ipmiutil64.mak
+
+cd lib
+nmake /nologo -f ipmilib.mak all
+cd ..
+REM # echo make lib done
+
+cd util
+nmake /nologo -f %UTMAKE% all
+cd ..
+REM # echo make util done
+
+echo buildwin %UTMAKE% done
+goto done
+
+:vcerror
+echo First need to run vcvars.bat
+echo Check that VCINSTALLDIR and LIBPATH are correct
+
+:done
+set MARCH=
+set DSSL11=
\ No newline at end of file
diff --git a/configure b/configure
index efb787b..cbf8536 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.1.4.
+# Generated by GNU Autoconf 2.63 for ipmiutil 3.1.5.
#
# 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.1.4'
-PACKAGE_STRING='ipmiutil 3.1.4'
+PACKAGE_VERSION='3.1.5'
+PACKAGE_STRING='ipmiutil 3.1.5'
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.1.4 to adapt to many kinds of systems.
+\`configure' configures ipmiutil 3.1.5 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.1.4:";;
+ short | recursive ) echo "Configuration of ipmiutil 3.1.5:";;
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.1.4
+ipmiutil configure 3.1.5
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.1.4, which was
+It was created by ipmiutil $as_me 3.1.5, 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.1.4'
+ VERSION='3.1.5'
cat >>confdefs.h <<_ACEOF
@@ -13958,7 +13958,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.1.4, which was
+This file was extended by ipmiutil $as_me 3.1.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14021,7 +14021,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-ipmiutil config.status 3.1.4
+ipmiutil config.status 3.1.5
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 41f5e55..92a953a 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,3.1.4)
+AC_INIT(ipmiutil,3.1.5)
AC_CONFIG_SRCDIR(util/ipmiutil.c)
echo "ipmiutil version ${PACKAGE_VERSION}"
AC_CONFIG_HEADERS(config.h)
diff --git a/debpkg/changelog b/debpkg/changelog
index 34e6dfb..4676191 100644
--- a/debpkg/changelog
+++ b/debpkg/changelog
@@ -1,3 +1,9 @@
+ipmiutil (3.1.5-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Andy Cress <arcress@users.sourceforge.net> Tue, 29 Oct 2019 16:27:57 -0400
+
ipmiutil (3.1.4-1) unstable; urgency=low
* New upstream version.
diff --git a/doc/Makefile b/doc/Makefile
index 616d3b1..615da92 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} /home/public/cress/ipmiutil/src/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/public/cress/ipmiutil/src/missing --run tar
+ACLOCAL = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run aclocal-1.11
+AMTAR = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/public/cress/ipmiutil/src/missing --run automake-1.11
+AUTOCONF = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run autoconf
+AUTOHEADER = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run autoheader
+AUTOMAKE = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run automake-1.11
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -99,13 +99,13 @@ LIB_DIR = /usr/lib64
LIPO =
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/public/cress/ipmiutil/src/missing --run makeinfo
+MAKEINFO = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
OBJDUMP = objdump
OBJEXT = o
-OS_CFLAGS = -DLINUX -fPIC -Wno-pointer-sign -Wno-sign-conversion -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
+OS_CFLAGS = -DLINUX -DSKIP_MD2 -fPIC -Wno-pointer-sign -Wno-sign-conversion -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
OS_DRIVERS = imbapi.c ipmimv.c ipmild.c ipmidir.c
OS_LFLAGS =
OTOOL =
@@ -113,9 +113,9 @@ OTOOL64 =
PACKAGE = ipmiutil
PACKAGE_BUGREPORT =
PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 3.1.4
+PACKAGE_STRING = ipmiutil 3.1.5
PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.1.4
+PACKAGE_VERSION = 3.1.5
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 = 3.1.4
-abs_builddir = /home/public/cress/ipmiutil/src/doc
-abs_srcdir = /home/public/cress/ipmiutil/src/doc
-abs_top_builddir = /home/public/cress/ipmiutil/src
-abs_top_srcdir = /home/public/cress/ipmiutil/src
+VERSION = 3.1.5
+abs_builddir = /root/ipmiutil/dev/ipmiutil-3.1.5/doc
+abs_srcdir = /root/ipmiutil/dev/ipmiutil-3.1.5/doc
+abs_top_builddir = /root/ipmiutil/dev/ipmiutil-3.1.5
+abs_top_srcdir = /root/ipmiutil/dev/ipmiutil-3.1.5
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} /home/public/cress/ipmiutil/src/install-sh
+install_sh = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
diff --git a/doc/UserGuide b/doc/UserGuide
index a09f884..da88938 100644
--- a/doc/UserGuide
+++ b/doc/UserGuide
@@ -1,6 +1,6 @@
IPMIUTIL USER GUIDE
- VERSION 3.1.4
+ VERSION 3.1.5
An easy-to-use IPMI server management utility
diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec
index 5d80dab..3e8eddd 100644
--- a/doc/ipmiutil.spec
+++ b/doc/ipmiutil.spec
@@ -3,7 +3,7 @@
# Copyright (c) 2012 Andy Cress
#
Name: ipmiutil
-Version: 3.1.4
+Version: 3.1.5
Release: 1%{?dist}
Summary: Easy-to-use IPMI server management utilities
License: BSD
diff --git a/lib/Makefile b/lib/Makefile
index aced884..5a7a85d 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} /home/public/cress/ipmiutil/src/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/public/cress/ipmiutil/src/missing --run tar
+ACLOCAL = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run aclocal-1.11
+AMTAR = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/public/cress/ipmiutil/src/missing --run automake-1.11
+AUTOCONF = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run autoconf
+AUTOHEADER = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run autoheader
+AUTOMAKE = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run automake-1.11
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -101,13 +101,13 @@ LIB_DIR = /usr/lib64
LIPO =
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/public/cress/ipmiutil/src/missing --run makeinfo
+MAKEINFO = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
OBJDUMP = objdump
OBJEXT = o
-OS_CFLAGS = -DLINUX -fPIC -Wno-pointer-sign -Wno-sign-conversion -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
+OS_CFLAGS = -DLINUX -DSKIP_MD2 -fPIC -Wno-pointer-sign -Wno-sign-conversion -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
OS_DRIVERS = imbapi.c ipmimv.c ipmild.c ipmidir.c
OS_LFLAGS =
OTOOL =
@@ -115,9 +115,9 @@ OTOOL64 =
PACKAGE = ipmiutil
PACKAGE_BUGREPORT =
PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 3.1.4
+PACKAGE_STRING = ipmiutil 3.1.5
PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.1.4
+PACKAGE_VERSION = 3.1.5
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 = 3.1.4
-abs_builddir = /home/public/cress/ipmiutil/src/lib
-abs_srcdir = /home/public/cress/ipmiutil/src/lib
-abs_top_builddir = /home/public/cress/ipmiutil/src
-abs_top_srcdir = /home/public/cress/ipmiutil/src
+VERSION = 3.1.5
+abs_builddir = /root/ipmiutil/dev/ipmiutil-3.1.5/lib
+abs_srcdir = /root/ipmiutil/dev/ipmiutil-3.1.5/lib
+abs_top_builddir = /root/ipmiutil/dev/ipmiutil-3.1.5
+abs_top_srcdir = /root/ipmiutil/dev/ipmiutil-3.1.5
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} /home/public/cress/ipmiutil/src/install-sh
+install_sh = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/install-sh
libdir = $(iprefix)/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
diff --git a/lib/lanplus/ipmiplus.mak b/lib/lanplus/ipmiplus.mak
index 5c851c2..4e02d0f 100644
--- a/lib/lanplus/ipmiplus.mak
+++ b/lib/lanplus/ipmiplus.mak
@@ -11,7 +11,11 @@ O_LIB=lanplus.lib
# Set your compiler options
CC=cl
-CF_EX=/DWIN32 $(INC) /D_CONSOLE /DNDEBUG /D_CRT_SECURE_NO_DEPRECATE
+!ifndef DSSL11
+CF_EX=/DWIN32 $(INC) /D_CONSOLE /DNDEBUG /D_CRT_SECURE_NO_DEPRECATE
+!else
+CF_EX=/DWIN32 $(INC) /D_CONSOLE /DNDEBUG /D_CRT_SECURE_NO_DEPRECATE /DSSL11
+!endif
# CFLAGS= /MD /W3 /WX /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo $(CF_EX)
# CFLAGS= /W3 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo $(CF_EX)
# CFLAGS= /W3 /O2 /Zi /MD /GF /Gy /nologo $(CF_EX)
diff --git a/lib/libipmiutil.pc b/lib/libipmiutil.pc
index 4fe6772..15a6c15 100644
--- a/lib/libipmiutil.pc
+++ b/lib/libipmiutil.pc
@@ -8,6 +8,6 @@ nutuser=@RUN_AS_USER@
Name: libipmiutil
Description: Library for ipmiutil
-Version: 3.1.4
+Version: 3.1.5
Libs: -L${libdir} -lipmi_lanplus
Cflags: -I${includedir}
diff --git a/scripts/Makefile b/scripts/Makefile
index 3091d53..c1e3f39 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} /home/public/cress/ipmiutil/src/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/public/cress/ipmiutil/src/missing --run tar
+ACLOCAL = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run aclocal-1.11
+AMTAR = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/public/cress/ipmiutil/src/missing --run automake-1.11
+AUTOCONF = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run autoconf
+AUTOHEADER = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run autoheader
+AUTOMAKE = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run automake-1.11
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -99,13 +99,13 @@ LIB_DIR = /usr/lib64
LIPO =
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/public/cress/ipmiutil/src/missing --run makeinfo
+MAKEINFO = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
OBJDUMP = objdump
OBJEXT = o
-OS_CFLAGS = -DLINUX -fPIC -Wno-pointer-sign -Wno-sign-conversion -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
+OS_CFLAGS = -DLINUX -DSKIP_MD2 -fPIC -Wno-pointer-sign -Wno-sign-conversion -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
OS_DRIVERS = imbapi.c ipmimv.c ipmild.c ipmidir.c
OS_LFLAGS =
OTOOL =
@@ -113,9 +113,9 @@ OTOOL64 =
PACKAGE = ipmiutil
PACKAGE_BUGREPORT =
PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 3.1.4
+PACKAGE_STRING = ipmiutil 3.1.5
PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.1.4
+PACKAGE_VERSION = 3.1.5
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 = 3.1.4
-abs_builddir = /home/public/cress/ipmiutil/src/scripts
-abs_srcdir = /home/public/cress/ipmiutil/src/scripts
-abs_top_builddir = /home/public/cress/ipmiutil/src
-abs_top_srcdir = /home/public/cress/ipmiutil/src
+VERSION = 3.1.5
+abs_builddir = /root/ipmiutil/dev/ipmiutil-3.1.5/scripts
+abs_srcdir = /root/ipmiutil/dev/ipmiutil-3.1.5/scripts
+abs_top_builddir = /root/ipmiutil/dev/ipmiutil-3.1.5
+abs_top_srcdir = /root/ipmiutil/dev/ipmiutil-3.1.5
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} /home/public/cress/ipmiutil/src/install-sh
+install_sh = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
diff --git a/setver b/setver
index 0ca500c..0dc4408 100755
--- a/setver
+++ b/setver
@@ -6,7 +6,7 @@
# [doinc?] is 'n'.
# if [doinc?] is 'r', reverse increment (decrement).
#
-ver=3.1.4
+ver=3.1.5
rel=1
tmped=/tmp/edver.tmp
tmpspec=/tmp/edspec.tmp
diff --git a/util/ievents.c b/util/ievents.c
index 4f14516..c384b59 100644
--- a/util/ievents.c
+++ b/util/ievents.c
@@ -80,7 +80,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
extern char *progver; /*from ipmiutil.c*/
static char * progname = "ipmiutil events";
#else
-static char *progver = "3.14";
+static char *progver = "3.15";
static char *progname = "ievents";
#endif
static char fsensdesc = 0; /* 1= get extended sensor descriptions*/
diff --git a/util/ipmiutil.c b/util/ipmiutil.c
index f43deb1..82c7506 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";
-char *progver = "3.14";
+char *progver = "3.15";
// static char fdebug = 0;
/*int ipmiutil(int argc, char **argv); */
diff --git a/util/ipmiutil.mak b/util/ipmiutil.mak
index 7595067..ba1e23c 100644
--- a/util/ipmiutil.mak
+++ b/util/ipmiutil.mak
@@ -27,7 +27,7 @@ L2_OBJ = $(L2_D)\helper.obj $(L2_D)\ipmi_strings.obj $(L2_D)\lanplus.obj \
$(L2_D)\lanplus_crypt_impl.obj $(L2_D)\lanplus_dump.obj \
$(L2_D)\lanplus_strings.obj $(L2_D)\lanplus_crypt.obj
LF_LANPLUS=/LIBPATH:$(LIB_D) /LIBPATH:$(L2_D) $(L2_OBJ) ssleay32.lib libeay32.lib
-CF_LANPLUS=/D HAVE_LANPLUS
+CF_LANPLUS=/DHAVE_LANPLUS /DHAVE_IPV6
# Set your compiler options
# To remove any GPL dependencies, use the CF_EX line with NON_GPL
diff --git a/util/ipmiutil64.mak b/util/ipmiutil64.mak
index cfd1719..4c27198 100644
--- a/util/ipmiutil64.mak
+++ b/util/ipmiutil64.mak
@@ -6,8 +6,6 @@
LIBC_RT=libcmt.lib /NODEFAULTLIB:"msvcirt.lib"
# LIBC_RT=msvcrt.lib /NODEFAULTLIB:"msvcirt.lib"
-#MARCH=IX86
-MARCH=X64
# The ipmiutil directory
SRC_D=.
LIB_D=..\lib
diff --git a/util/isensor.c b/util/isensor.c
index df4a911..48755b7 100644
--- a/util/isensor.c
+++ b/util/isensor.c
@@ -80,6 +80,7 @@
* fixup in decoding Proc,PS Comp readings
* 01/25/08 ARCress v2.7 allow float input with -u thresholds,
* add -p persist logic for -u thresholds.
+ * 09/20/19 ARCress v3.15 workaround for Pigeon Point bad sa in SDR
*/
/*M*
Copyright (c) 2002-2006 Intel Corporation.
@@ -259,7 +260,7 @@ char *decode_entity_id(int id) {
extern char * progver; /*from ipmiutil.c*/
static char * progname = "ipmiutil sensor";
#else
-static char * progver = "3.08";
+static char * progver = "3.15";
static char * progname = "isensor";
#endif
#ifdef WIN32
@@ -284,6 +285,7 @@ static int fdoloop = 0; /* =1 if user specified number of loops */
static int fpicmg = 0;
static int fchild = 0; /* =1 show child SDRs */
static int fset_mc = 0; /* =1 -m to set_mc */
+static int fbadsdr = 0; /* =1 to ignore bad SDR mc */
static int fdump = 0;
static int frestore = 0;
static int fjumpstart = 0;
@@ -1034,7 +1036,7 @@ GetSensorReading(uchar sens_num, void *psdr, uchar *sens_data)
uchar lun = 0;
uchar chan = 0;
- if (psdr != NULL) {
+ if (psdr != NULL && fbadsdr == 0) {
sdr = (SDR02REC *)psdr;
mc = sdr->sens_ownid;
if (mc != BMC_SA) { /* not BMC, e.g. HSC or ME sensor */
@@ -2760,7 +2762,7 @@ ShowSDR(char *tag, uchar *sdr)
idstr[ilen] = 0; /* stringify */
if ((sdr02->sens_capab & 0x40) == 0) brearm = 'm'; /*manual rearm*/
else brearm = 'a'; /*automatic rearm*/
- if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%lu, s0=%x\n",
+ if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%zu, s0=%x\n",
ilen,idstr[0],sizeof(SDR02REC),sdr[ioff]);
memset(sens,0,sizeof(sens));
rc = GetSensorReading(sdr02->sens_num,sdr02,sens);
@@ -2936,7 +2938,7 @@ ShowSDR(char *tag, uchar *sdr)
if (ilen >= sizeof(idstr)) ilen = sizeof(idstr) - 1;
memcpy(idstr,&sdr[ioff],ilen);
idstr[ilen] = 0; /* stringify */
- if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%lu, s0=%x\n",
+ if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%zu, s0=%x\n",
ilen,idstr[0],sizeof(SDR11REC),sdr[ioff]);
printf("%s", tag);
if (fsimple)
@@ -2966,7 +2968,7 @@ ShowSDR(char *tag, uchar *sdr)
if (ilen >= sizeof(idstr)) ilen = sizeof(idstr) - 1;
memcpy(idstr,&sdr[ioff],ilen);
idstr[ilen] = 0; /* stringify */
- if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%lu, s0=%x\n",
+ if (fdebug) printf("ilen=%d, istr0=%c, sizeof=%zu, s0=%x\n",
ilen,idstr[0],sizeof(SDR12REC),sdr[ioff]);
printf("%s", tag);
if (fsimple)
@@ -3484,9 +3486,11 @@ int i_sensor(int argc, char **argv)
if (is_grantley(vend_id,prod_id)) fGrantley = 1;
if (prod_id == 0x003E || fRomley || fGrantley) /*Urbanna,CG2100*/
set_max_kcs_loops(URNLOOPS); /*longer KCS timeout*/
- } else if ((vend_id == VENDOR_SUPERMICRO)
+ } else if ((vend_id == VENDOR_SUPERMICRO)
|| (vend_id == VENDOR_SUPERMICROX)) {
set_max_kcs_loops(URNLOOPS); /*longer KCS timeout*/
+ } else if (vend_id == 16394) { /*Pigeon Point*/
+ fbadsdr = 1; /* SDR has bad sa/mc value, so ignore it */
} else { /* Other products */
pstr = "BMC";
fmBMC = 0;
--
cgit v1.2.3