Merge tag 'upstream/2.9.7'

Upstream version 2.9.7

4 files changed, 116 insertions, 36 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 97d734d..34948f8 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.6/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run automake-1.11
+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
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -99,13 +99,13 @@ LIB_DIR = /usr/lib64
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
-OS_CFLAGS = -DLINUX  -fPIC  -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
+OS_CFLAGS = -DLINUX  -fPIC   -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 2.9.6
+PACKAGE_STRING = ipmiutil 2.9.7
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 2.9.6
+PACKAGE_VERSION = 2.9.7
 PATH_SEPARATOR = :
 PKG_DIR = /root/rpmbuild
 RANLIB = ranlib
@@ -123,15 +123,15 @@ SAM2OBJ = isensor2.o ievents2.o
 SED = sed
 SET_MAKE = 
 SHELL = /bin/sh
-SHR_LINK = libipmiutil.so
+SHR_LINK = libipmiutil.so.1
 STRIP = strip
 SUBDIR_S = doc scripts lib util
 SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 2.9.6
-abs_builddir = /usr/dev/ipmiutil-2.9.6/doc
-abs_srcdir = /usr/dev/ipmiutil-2.9.6/doc
-abs_top_builddir = /usr/dev/ipmiutil-2.9.6
-abs_top_srcdir = /usr/dev/ipmiutil-2.9.6
+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
 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.6/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.7/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/doc/UserGuide b/doc/UserGuide
index 213b367..5d25330 100644
--- a/doc/UserGuide
+++ b/doc/UserGuide
@@ -1,6 +1,6 @@
 
                   IPMIUTIL USER GUIDE 
-                     VERSION 2.9.6
+                     VERSION 2.9.7
          An easy-to-use IPMI server management utility
 
 
@@ -5227,10 +5227,20 @@ exception of drivers:
    or cached at http://ipmiutil.sf.net/kern/imbdrv130.zip 
  * The Microsoft IPMI driver (ipmidrv.sys), which comes with Windows 2003 R2
    and later, is also supported.
-
 It should be noted that the two IPMI drivers should not be installed at the
 same time, since they will interfere with each other.
-So, for some systems or applications, you may need to uninstall the Microsoft
+
+Note that there are several outstanding bug reports against the Microsoft ipmidrv.sys driver which may affect its usage:
+ * ipmidrv.sys does not support systems with 4-byte register spacing
+   https://social.technet.microsoft.com/forums/windowsserver/en-US/223e3a0d-3daa-4141-9c13-3169f766a7d5/win2008-ipmidrvsys-does-not-load-if-register-spacing-4
+ * ipmidrv.sys WBEM access memory leak
+   https://sourceforge.net/p/ipmiutil/support-requests/11/
+   https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/ca4df181-7fd4-4912-83a0-5896b030e3ca/latest-version-of-microsoft-ipmi-driver-ipmidrvsys?forum=wdk
+ * ipmidrv.sys with Windows 2012 does not work on many IPMI systems
+   This version is more broken than the Win2008 version. 
+If you are affected by any of these issues, you can download and install the imbdrv.sys as described below, but you must also disable the MS ipmidrv.sys.
+
+For some systems or applications, you may need to uninstall the Microsoft
 IPMI driver, like this:
  * start Control Panel/System app
  * go to Hardware tab, start Device Manager
@@ -5240,6 +5250,12 @@ IPMI driver, like this:
  * select Properties
  * on driver tab, click "Uninstall"
  * then reboot.
+If you are running Windows 2012, the Device Manager does not support this,
+so use these steps to disable the Microsoft IPMIDRV:
+ * Start a command prompt with 'Run as administrator'
+ * cd \windows\system32\drivers
+ * move ipmidrv.sys ipmidrv.old
+ * then reboot
 
 How to install Intel IPMI driver from the cached copy at http://ipmiutil.sf.net/kern/imbdrv130.zip 
   Extract imbdrv130.zip to c:\temp or similar
@@ -5263,13 +5279,6 @@ make sure that the Microsoft VC++ Redistributable package is installed
 See http://www.microsoft.com/downloads/details.aspx?familyid=200B2FD9-AE1A-4A14-984D-389C36F85647&displaylang=en
 to download this if needed.
 
-Note that there are two outstanding bug reports against the Microsoft ipmidrv.sys driver which may affect its usage:
- * ipmidrv.sys does not support systems with 4-byte register spacing
-   https://social.technet.microsoft.com/forums/windowsserver/en-US/223e3a0d-3daa-4141-9c13-3169f766a7d5/win2008-ipmidrvsys-does-not-load-if-register-spacing-4
- * ipmidrv.sys WBEM access memory leak
-   https://sourceforge.net/p/ipmiutil/support-requests/11/
-   https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/ca4df181-7fd4-4912-83a0-5896b030e3ca/latest-version-of-microsoft-ipmi-driver-ipmidrvsys?forum=wdk
-
 
 ----------------------------------
 5.2  WINDOWS BUILD INSTRUCTIONS
@@ -5294,14 +5303,14 @@ A copy of these files is available from
    http://ipmiutil.sf.net/FILES/ipmiutil-contrib.zip
 The above zip contains all of the contributed source used.
 Refer to getopt.c from one of these
-   BSD getopt.c:
+   BSD getopt.c (used by default in ipmiutil.exe):
      http://www.openmash.org/lxr/source/src/getopt.c?c=gsm
    public domain getopt.c:
      http://www.koders.com/c/fid034963469B932D9D87F91C86680EB08DB4DE9AA3.aspx
    GNU LGPL getopt.c:
      http://svn.xiph.org/trunk/ogg-tools/oggsplit/
 Refer to openssl from this link (Apache-style license, not gpl)
-     http://www.openssl.org/source/openssl-0.9.7l.tar.gz.
+     http://www.openssl.org/source/openssl-0.9.8x.tar.gz (used by default)
 
 5.2.3  Copy initial contrib files into ipmiutil
 Below are sample directories where ipmiutil*.tar.gz was unpacked, 
@@ -5356,8 +5365,9 @@ Serial-Over-LAN requires.
 5.3  WINDOWS COMMAND USAGE
 ----------------------------------
  
-Because of the differences in Linux getopt and the getopt used in  
-the Windows build, the order of parameters is more important in Windows. 
+Because of the differences in Linux getopt and the BSD getopt.c used by
+default in  the Windows build, the order of parameters is more important 
+in Windows. 
  
 For example in Linux, the following command usages work, but not in Windows: 
   # ipmiutil cmd 00 20 18 01 -N 192.168.1.154  
diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec
index 7cae79d..fdb25c3 100644
--- a/doc/ipmiutil.spec
+++ b/doc/ipmiutil.spec
@@ -3,7 +3,7 @@
 # Copyright (c) 2012 Andy Cress
 #
 Name:      ipmiutil
-Version: 2.9.6
+Version: 2.9.7
 Release: 1%{?dist}
 Summary:   Easy-to-use IPMI server management utilities
 License:   BSD
@@ -115,6 +115,7 @@ rm -rf %{buildroot}
 %{_sbindir}/ifirewall 
 %{_sbindir}/ifwum 
 %{_sbindir}/ihpm 
+%{_libdir}/libipmiutil.so*
 %{_datadir}/%{name}/ipmiutil_evt
 %{_datadir}/%{name}/ipmiutil_asy
 %{_datadir}/%{name}/ipmiutil_wdt
@@ -174,7 +175,6 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/ievents.h
 %{_datadir}/%{name}/Makefile
 %{_includedir}/ipmicmd.h
-%{_libdir}/libipmiutil.so
 
 %files static
 %defattr(-,root,root)
@@ -186,6 +186,7 @@ rm -rf %{buildroot}
 %endif
 
 %post
+/sbin/ldconfig
 # POST_INSTALL, $1 = 1 if rpm -i, $1 = 2 if rpm -U
 if [ "$1" = "1" ]
 then
@@ -213,8 +214,8 @@ then
 %endif
 
    # Run some ipmiutil command to see if any IPMI interface works.
-   %{_bindir}/ipmiutil sel -v >/dev/null 2>&1 || : 
-   IPMIret=$?
+   IPMIret=0
+   %{_bindir}/ipmiutil sel -v >/dev/null 2>&1  || IPMIret=1
    # If IPMIret==0, the IPMI cmd was successful, and IPMI is enabled locally.
    if [ $IPMIret -eq 0 ]; then
       # If IPMI is enabled, automate managing the IPMI SEL
@@ -245,8 +246,9 @@ then
    fi
 else
    # postinstall, doing rpm update
-   %{_bindir}/ipmiutil sel -v >/dev/null 2>&1 || :
-   if [ $? -eq 0 ]; then
+   IPMIret=0
+   %{_bindir}/ipmiutil sel -v >/dev/null 2>&1  || IPMIret=1
+   if [ $IPMIret -eq 0 ]; then
       if [ -d %{_sysconfdir}/cron.daily ]; then
          cp -f %{_datadir}/%{name}/checksel %{_sysconfdir}/cron.daily
       fi
@@ -305,6 +307,7 @@ then
 fi
 
 %postun
+/sbin/ldconfig
 %if 0%{?req_systemd}
 %service_del_postun ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service
 %else
@@ -335,6 +338,8 @@ fi
 %endif
 
 %changelog
+* Mon Jun 29 2015 Andrew Cress <arcress at users.sourceforge.net> 2.9.7-1
+- move libipmiutil.so from devel into ipmiutil base package (RH#1177213)
 * Mon Nov 03 2014 Andrew Cress <arcress at users.sourceforge.net> 2.9.5-1
 - separate libipmiutil.a into ipmiutil-static package
 * Thu Aug 28 2014 Andrew Cress <arcress at users.sourceforge.net> 2.9.4-1
diff --git a/doc/isol.8 b/doc/isol.8
index d2e594c..8aacbe0 100644
--- a/doc/isol.8
+++ b/doc/isol.8
@@ -113,6 +113,71 @@ ipmiutil sol \-a \-N nodename \-U username \-P password  \-Flan2
 Starts an SOL console session to the nodename.  Force lan protocol to 2.0.
 .PP
 
+.SH "PLATFORM SERIAL PORT CONFIGURATION EXAMPLES"
+
+First, enter BIOS Setup for Serial Console Redirection parameters:
+(these vary by platform)
+.br
+  Console Redirection = Serial Port B
+.br
+  ACPI Redirection = Disabled
+.br
+  Baud Rate = 115.2K
+.br
+  Flow Control = CTS/RTS
+.br
+  Terminal Type = VT100
+.br
+  Legacy Redirection = Enabled
+.br
+Note that the Baud Rate can vary, but it must match in all
+locations where it is used (BIOS, IPMI, and Linux).
+.br
+For some non-Intel platforms, the serial console would be
+COM1 instead of COM2, but should be enabled in BIOS.
+.br
+From Linux, run "ipmiutil serial \-c" for Terminal Mode shared configuration.
+.br
+Or, on older Intel TSRLT2 platforms:
+From Linux, run "ipmiutil serial \-s" for Basic Mode Shared configuration.
+
+.SH "LINUX CONFIGURATION FOR SERIAL CONSOLE"
+
+If using lilo, in /etc/lilo.conf, add
+.br
+  append="console=ttyS1,19200n8 console=tty0"
+.br
+(and comment out the "message=" line because it includes graphics)
+.br
+Note that the append line can be placed in the global section
+and removed from each kernel section if there are no other differences.
+
+.PP
+Or, if using grub, edit /boot/grub/grub.conf as follows:
+.br
+  #Omit the splashimage or gfxmenu
+.br
+  # splashimage=(hd0,0)/grub/splash.xpm.gz
+.br
+  #The serial and terminal lines are not usually needed
+.br
+  # serial \-\-unit=1 \-\-speed=19200 \-\-word=8 \-\-parity=no \-\-stop=1
+.br
+  # terminal \-\-timeout=10 serial console
+.br
+  #Add the console=ttyS* parameter to the kernel line
+.br
+    kernel (hd0,0) /vmlinuz root=/dev/sda2 console=ttyS1,19200n8
+
+.PP
+Add this line to /etc/initab, if ttyS1 is not already there:
+.br
+  co:2345:respawn:/sbin/agetty ttyS1 19200 vt100
+.PP
+Add this line to /etc/securetty, if ttyS1 is not already there:
+.br
+  ttyS1
+
 .SH "SEE ALSO"
 ipmiutil(8) ialarms(8) iconfig(8) icmd(8) idiscover(8) ievents(8) ifru(8) igetevent(8) ihealth(8) ilan(8) ireset(8) isel(8) isensor(8) iserial(8) iwdt(8)