Merge branch 'feature/upstream' into develop

21 files changed, 95 insertions, 71 deletions

diff --git a/ChangeLog b/ChangeLog
index dc4b5a0..b93d73e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4368,3 +4368,16 @@ wdt.8          iwdt.8       (ipmiutil wdt)
 			    Contributed by Hozefa Karachiwala
   buildwin.cmd            - detect/set MARCH=IA86 or X64 from vcvars
   buildmin.cmd            - detect/set MARCH=IA86 or X64 for minimal
+  Windows EXEs built with openssl 1.0.2
+
+03/12/2020 ARCress ipmiutil-3.1.6  changes (iver 3.16)
+  util/iconfig.c          - fix Fedora bug 1811462 [abrt] ipmiutil config -a
+  util/ipmiutil.c         - show version with usage in -h case
+  scripts/ipmiutil.env.template - renamed env as template
+			    (contributed by mwilliams<at>illuminate.solutions)
+  scripts/Makefile.am     - renamed env as template 
+  scripts/checksel	  - also rm -f $ddir/sel.idx after isel -d
+			    (contributed by eguzovsky<at>gmail.com)
+  doc/Makefile.am     	  - change gzip -f to gzip -nf for man pages
+			    (SR#40 patch from Jeremy Puhlman)
+
diff --git a/Makefile.in b/Makefile.in
index c7737d5..790eecf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -567,7 +567,7 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
diff --git a/configure b/configure
index cbf8536..8b47048 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.5.
+# Generated by GNU Autoconf 2.63 for ipmiutil 3.1.6.
 #
 # 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.5'
-PACKAGE_STRING='ipmiutil 3.1.5'
+PACKAGE_VERSION='3.1.6'
+PACKAGE_STRING='ipmiutil 3.1.6'
 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.5 to adapt to many kinds of systems.
+\`configure' configures ipmiutil 3.1.6 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.5:";;
+     short | recursive ) echo "Configuration of ipmiutil 3.1.6:";;
    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.5
+ipmiutil configure 3.1.6
 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.5, which was
+It was created by ipmiutil $as_me 3.1.6, 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.5'
+ VERSION='3.1.6'
 
 
 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.5, which was
+This file was extended by ipmiutil $as_me 3.1.6, 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.5
+ipmiutil config.status 3.1.6
 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 92a953a..7493f0e 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.5)
+AC_INIT(ipmiutil,3.1.6)
 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 4676191..a588f38 100644
--- a/debpkg/changelog
+++ b/debpkg/changelog
@@ -1,3 +1,9 @@
+ipmiutil (3.1.6-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Andy Cress <arcress@users.sourceforge.net>  Fri, 13 Mar 2020 17:12:16 -0400
+
 ipmiutil (3.1.5-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/doc/Makefile b/doc/Makefile
index 615da92..ce8be1a 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} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run aclocal-1.11
-AMTAR = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run tar
 AR = ar
-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
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.6/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} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
-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_CFLAGS = -DLINUX  -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.5
+PACKAGE_STRING = ipmiutil 3.1.6
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.1.5
+PACKAGE_VERSION = 3.1.6
 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.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
+VERSION = 3.1.6
+abs_builddir = /usr/dev/ipmiutil-3.1.6/doc
+abs_srcdir = /usr/dev/ipmiutil-3.1.6/doc
+abs_top_builddir = /usr/dev/ipmiutil-3.1.6
+abs_top_srcdir = /usr/dev/ipmiutil-3.1.6
 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} /root/ipmiutil/dev/ipmiutil-3.1.5/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.1.6/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -417,7 +417,7 @@ install:
 	${INSTALL_DATA_SH} iuser.8 	 ${manto}
 	${INSTALL_DATA_SH} iseltime.8 	 ${manto}
 	${INSTALL_DATA_SH} bmclanpet.mib ${datato}
-	cd ${manto}; gzip -f *.8
+	cd ${manto}; gzip -nf *.8
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b792762..0b782bb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -59,5 +59,5 @@ install:
 	${INSTALL_DATA_SH} iuser.8 	 ${manto}
 	${INSTALL_DATA_SH} iseltime.8 	 ${manto}
 	${INSTALL_DATA_SH} bmclanpet.mib ${datato}
-	cd ${manto}; gzip -f *.8
+	cd ${manto}; gzip -nf *.8
 	
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3b9d20d..7f334af 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -417,7 +417,7 @@ install:
 	${INSTALL_DATA_SH} iuser.8 	 ${manto}
 	${INSTALL_DATA_SH} iseltime.8 	 ${manto}
 	${INSTALL_DATA_SH} bmclanpet.mib ${datato}
-	cd ${manto}; gzip -f *.8
+	cd ${manto}; gzip -nf *.8
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/UserGuide b/doc/UserGuide
index da88938..ba6f086 100644
--- a/doc/UserGuide
+++ b/doc/UserGuide
@@ -1,6 +1,6 @@
 
                   IPMIUTIL USER GUIDE 
-                     VERSION 3.1.5
+                     VERSION 3.1.6
          An easy-to-use IPMI server management utility
 
 
diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec
index 3e8eddd..9de2886 100644
--- a/doc/ipmiutil.spec
+++ b/doc/ipmiutil.spec
@@ -3,7 +3,7 @@
 # Copyright (c) 2012 Andy Cress
 #
 Name:      ipmiutil
-Version: 3.1.5
+Version: 3.1.6
 Release: 1%{?dist}
 Summary:   Easy-to-use IPMI server management utilities
 License:   BSD
@@ -136,7 +136,7 @@ rm -rf %{buildroot}
 %{systemd_fls}/ipmiutil_asy.service
 %{systemd_fls}/ipmiutil_wdt.service
 %{systemd_fls}/ipmi_port.service
-%{_datadir}/%{name}/ipmiutil.env
+%{_datadir}/%{name}/ipmiutil.env.template
 %{_datadir}/%{name}/ipmiutil.pre
 %{_datadir}/%{name}/ipmiutil.setup
 %{_datadir}/%{name}/ipmi_if.sh
@@ -217,6 +217,9 @@ scr_dir=%{_datadir}/%{name}
    if [ -x /bin/systemctl ] && [ -d %{unit_dir} ]; then
       # Replace if exists, append if not.
       # Use # as the sed delimiter to prevent handling slash in the path.
+      if [ ! -f %{_datadir}/%{name}/ipmiutil.env ]; then
+         cp %{_datadir}/%{name}/ipmiutil.env.template %{_datadir}/%{name}/ipmiutil.env
+      fi
       grep -q 'IINITDIR' %{_datadir}/%{name}/ipmiutil.env \
          && sed -i 's#^IINITDIR=.*#IINITDIR=%{init_dir}#' %{_datadir}/%{name}/ipmiutil.env \
          || echo "IINITDIR=%{init_dir}" >> %{_datadir}/%{name}/ipmiutil.env
diff --git a/lib/Makefile b/lib/Makefile
index 5a7a85d..0e95036 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} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run aclocal-1.11
-AMTAR = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run tar
 AR = ar
-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
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.6/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} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
-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_CFLAGS = -DLINUX  -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.5
+PACKAGE_STRING = ipmiutil 3.1.6
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.1.5
+PACKAGE_VERSION = 3.1.6
 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.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
+VERSION = 3.1.6
+abs_builddir = /usr/dev/ipmiutil-3.1.6/lib
+abs_srcdir = /usr/dev/ipmiutil-3.1.6/lib
+abs_top_builddir = /usr/dev/ipmiutil-3.1.6
+abs_top_srcdir = /usr/dev/ipmiutil-3.1.6
 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} /root/ipmiutil/dev/ipmiutil-3.1.5/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.1.6/install-sh
 libdir = $(iprefix)/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/lib/libipmiutil.pc b/lib/libipmiutil.pc
index 15a6c15..234af32 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.5
+Version: 3.1.6
 Libs: -L${libdir} -lipmi_lanplus
 Cflags: -I${includedir}
diff --git a/scripts/Makefile b/scripts/Makefile
index c1e3f39..2961c6d 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} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run aclocal-1.11
-AMTAR = ${SHELL} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run tar
 AR = ar
-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
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.6/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} /root/ipmiutil/dev/ipmiutil-3.1.5/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.6/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
-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_CFLAGS = -DLINUX  -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.5
+PACKAGE_STRING = ipmiutil 3.1.6
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.1.5
+PACKAGE_VERSION = 3.1.6
 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.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
+VERSION = 3.1.6
+abs_builddir = /usr/dev/ipmiutil-3.1.6/scripts
+abs_srcdir = /usr/dev/ipmiutil-3.1.6/scripts
+abs_top_builddir = /usr/dev/ipmiutil-3.1.6
+abs_top_srcdir = /usr/dev/ipmiutil-3.1.6
 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} /root/ipmiutil/dev/ipmiutil-3.1.5/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.1.6/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -408,7 +408,7 @@ install:
 	${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto}
 	${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto}
 	${INSTALL_DATA_SH} ipmi_port.service    ${sysdto}
-	${INSTALL_SCRIPT_SH} ipmiutil.env     ${datato}
+	${INSTALL_SCRIPT_SH} ipmiutil.env.template    ${datato}
 	${INSTALL_SCRIPT_SH} ipmiutil.pre     ${datato}
 	${INSTALL_SCRIPT_SH} ipmiutil.setup   ${datato}
 	${INSTALL_SCRIPT_SH} ipmi.init.basic  ${datato}
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 0c7779b..9a89e3b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -51,7 +51,7 @@ install:
 	${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto}
 	${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto}
 	${INSTALL_DATA_SH} ipmi_port.service    ${sysdto}
-	${INSTALL_SCRIPT_SH} ipmiutil.env     ${datato}
+	${INSTALL_SCRIPT_SH} ipmiutil.env.template    ${datato}
 	${INSTALL_SCRIPT_SH} ipmiutil.pre     ${datato}
 	${INSTALL_SCRIPT_SH} ipmiutil.setup   ${datato}
 	${INSTALL_SCRIPT_SH} ipmi.init.basic  ${datato}
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 9e05d9e..f7dfcd3 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -408,7 +408,7 @@ install:
 	${INSTALL_DATA_SH} ipmiutil_asy.service ${sysdto}
 	${INSTALL_DATA_SH} ipmiutil_evt.service ${sysdto}
 	${INSTALL_DATA_SH} ipmi_port.service    ${sysdto}
-	${INSTALL_SCRIPT_SH} ipmiutil.env     ${datato}
+	${INSTALL_SCRIPT_SH} ipmiutil.env.template    ${datato}
 	${INSTALL_SCRIPT_SH} ipmiutil.pre     ${datato}
 	${INSTALL_SCRIPT_SH} ipmiutil.setup   ${datato}
 	${INSTALL_SCRIPT_SH} ipmi.init.basic  ${datato}
diff --git a/scripts/checksel b/scripts/checksel
index 63ea9a9..11a047e 100755
--- a/scripts/checksel
+++ b/scripts/checksel
@@ -26,5 +26,6 @@ if [ $? -eq 0 ]; then
      $pdir/ipmiutil sel -e >$ddir/ipmisel_${today}.txt
      # Clear the IPMI SEL
      $pdir/ipmiutil sel -d
+     /bin/rm -f $ddir/sel.idx
   fi
 fi
diff --git a/scripts/ipmiutil.env b/scripts/ipmiutil.env.template
index e06bdda..e06bdda 100644
--- a/scripts/ipmiutil.env
+++ b/scripts/ipmiutil.env.template
diff --git a/setver b/setver
index 0dc4408..9635f87 100755
--- a/setver
+++ b/setver
@@ -6,7 +6,7 @@
 #    [doinc?] is 'n'.
 #    if [doinc?] is 'r', reverse increment (decrement).
 #
-ver=3.1.5
+ver=3.1.6
 rel=1
 tmped=/tmp/edver.tmp
 tmpspec=/tmp/edspec.tmp
diff --git a/util/iconfig.c b/util/iconfig.c
index 25e0c67..49d690f 100644
--- a/util/iconfig.c
+++ b/util/iconfig.c
@@ -2681,7 +2681,7 @@ main(int argc, char **argv)
    }  /*endif not readonly*/
 
 do_exit:
-   if (fd_bmc != stdout) fclose(fd_bmc);
+   if (fd_bmc != NULL && fd_bmc != stdout) fclose(fd_bmc);
    ipmi_close_();
    if (nerrs > 0) {
 	printf("Warning: %d ok, %d errors occurred, last error = %d\n",ngood,nerrs,lasterr);
diff --git a/util/ievents.c b/util/ievents.c
index c384b59..bf8f7fb 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.15";
+static char *progver   = "3.16";
 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 82c7506..9d3a3dc 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.15";
+char *progver   = "3.16";
 // static char fdebug = 0;
 /*int ipmiutil(int argc, char **argv); */
 
@@ -215,6 +215,7 @@ main(int argc, char **argv)
       } else 
 #endif
       {
+         printf("%s ver %s\n", progname,progver); 
          show_usage();
          ret = ERR_USAGE;
       }