Merge branch 'release/3.0.8-1'3.0.8-1

3 files changed, 81 insertions, 58 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 381c0dc..5b0b4b1 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-3.0.7/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.7/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.8/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.8/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.7/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.7/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.7/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.8/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.8/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.8/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-3.0.7/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.8/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  -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.0.7
+PACKAGE_STRING = ipmiutil 3.0.8
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.0.7
+PACKAGE_VERSION = 3.0.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 = 3.0.7
-abs_builddir = /usr/dev/ipmiutil-3.0.7/doc
-abs_srcdir = /usr/dev/ipmiutil-3.0.7/doc
-abs_top_builddir = /usr/dev/ipmiutil-3.0.7
-abs_top_srcdir = /usr/dev/ipmiutil-3.0.7
+VERSION = 3.0.8
+abs_builddir = /usr/dev/ipmiutil-3.0.8/doc
+abs_srcdir = /usr/dev/ipmiutil-3.0.8/doc
+abs_top_builddir = /usr/dev/ipmiutil-3.0.8
+abs_top_srcdir = /usr/dev/ipmiutil-3.0.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-3.0.7/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.8/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/doc/UserGuide b/doc/UserGuide
index e5681f1..105a4bd 100644
--- a/doc/UserGuide
+++ b/doc/UserGuide
@@ -1,6 +1,6 @@
 
                   IPMIUTIL USER GUIDE 
-                     VERSION 3.0.7
+                     VERSION 3.0.8
          An easy-to-use IPMI server management utility
 
 
@@ -189,18 +189,20 @@ supported by ipmiutil.
 
 Key Strengths = supports any IPMI server platforms, 
                 top-down user-friendly IPMI functions, 
+                only IPMI project to support Windows natively,
                 detection, portability,
                 incorporates fixes and new features quickly
 Target Market = Administrators, Developers, and OEMs
+License       = BSD   (supports open or proprietary use)
 OS Support    = Linux, Windows, Solaris, FreeBSD, and MacOSX
                 (supports Windows natively for local or remote interface)
-License       = BSD
 Drivers       = For Linux: openipmi, imb, valinux ipmikcs, lan, lanplus,
                       landesk, and driverless direct KCS or SSIF 
-		For Windows: Intel IMB and Microsoft IPMI drivers
-		For Solaris: bmc 
-		For FreeBSD: openipmi, driverless KCS or SSIF 
-		For MacOSX:  remote only
+                For Windows: Intel IMB and Microsoft IPMI drivers
+                For Solaris: bmc 
+                For FreeBSD: openipmi, driverless KCS or SSIF 
+                For MacOSX:  remote only
+Discrete sensors = Show interpreted meaning or raw value instead of 'na'
 LEDs          = Show/set ATCA LEDs, set identify LED, Intel Telco Alarm LEDs
 health        = show overall health and product information
 discovery     = find all IPMI LAN servers on a given subnet
@@ -208,14 +210,14 @@ fru           = Display all FRU and SPD inventory data, also
                 Set some FRU product fields (asset tag, serial number)
 sensor        = Show SDRs and sensor readings, also set sensor thresholds
 getevent      = Receive any IPMI events and decode them,
-		The IPMI event monitoring service is automated in Linux via 
-		the ipmiutil_evt init script.
+                The IPMI event monitoring service is automated in Linux via 
+                the ipmiutil_evt init script.
 reset         = IPMI local and remote reset/power-control,
                 IPMI boot device selection.
-remote IPMI   = Perform an OS shutdown/restart request via IPMI LAN,
-soft-shutdown   using ipmiutil getevt -a and invoking ipmiutil reset -o.
-		This async bridge service is automated in Linux via the
-		ipmiutil_asy init script.
+remote soft-boot = Perform a remote OS shutdown/restart request, soft-shutdown
+                using ipmiutil getevt -a and invoking ipmiutil reset -o.
+                This async bridge service is automated in Linux via the
+                ipmiutil_asy init script, without requiring acpid.
 cmd           = Execute raw IPMI commands locally or remotely
 lan           = Show/set IPMI LAN and PEF configuration parameters,
                 adds more PEF rules, or can add a custom PEF rule
@@ -224,12 +226,12 @@ sel           = Show decoded System Event Log records, clear SEL,
                 see the checksel cron script to automate SEL management.
 sol console   = Start/stop an SOL console session
 watchdog      = Show, set, and reset the IPMI watchdog timer and its actions,
-		The watchdog timer service can be automated in Linux via the
-		ipmiutil_wdt init script.
+                The watchdog timer service can be automated in Linux via the
+                ipmiutil_wdt init script.
 save/restore  = save and restore all BMC configuration parameters
 ievents       = Standalone app to decode IPMI or PET event data,
                 especially useful at the management station for interpreting
-	        IPMI PET SNMP traps.  See also SNMP PET MIB (bmclanpet.mib).
+                IPMI PET SNMP traps.  See also SNMP PET MIB (bmclanpet.mib).
 picmg         = Support IPMI PICMG functions
 firewall      = Support IPMI firmware firewall functions
 
@@ -238,12 +240,12 @@ IPMI tasks:
 ipmi_port     = Automatically prevent Linux port mapper from stealing 
                 the RMCP port 623 used by IPMI LAN firmware.
 checksel      = a cron script to daily write new SEL records to syslog, and
-		clear the SEL if nearly full.
+                clear the SEL if nearly full.
 ipmiutil_asy  = A Linux init script using the ipmiutil getevt -a service to
-		enable receiving soft-shutdown requests from ipmiutil reset -o
+                enable receiving soft-shutdown requests from ipmiutil reset -o
 ipmiutil_wdt  = A Linux init script to reset the watchdog timer every 60 sec.
 ipmiutil_evt  = A Linux init script using the ipmiutil getevt -s service to
-		monitor IPMI events, log them, and optionally run a script.
+                monitor IPMI events, log them, and optionally run a script.
 
 
 
@@ -5534,6 +5536,17 @@ The Windows equivalent would have to put the -N option immediately after
 the subfunction, as shown below: 
   > ipmiutil cmd -N 192.168.1.154 00 20 18 01 
 
+
+For Serial-Over-Lan console usage from a Windows client, ipmiutil provides:
+- Full ANSI (VT100) Support
+- Full Support for PC Keyboard
+- Unicode (UTF-8) support
+- Full support for Line Drawing Characters 
+  (VT100 Special Graphics, Unicode Box Characters and OEM CP Characters)
+- Full Screen works for BIOS and Unix (using vt100 terminfo setting)
+
+For proper operation during BIOS setup the Windows console window size must be set to 80x25.  The Windows console buffer size can be set to the desired scroll back size.  For proper operation when logged on to Unix the windows size can be set to anything but the OS must be told of the proper size using "stty rows <height> cols <width>".
+
 
 --------------------------
 6.0  SAMPLE OUTPUT
diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec
index c6c39c2..7551bb2 100644
--- a/doc/ipmiutil.spec
+++ b/doc/ipmiutil.spec
@@ -3,7 +3,7 @@
 # Copyright (c) 2012 Andy Cress
 #
 Name:      ipmiutil
-Version: 3.0.7
+Version: 3.0.8
 Release: 1%{?dist}
 Summary:   Easy-to-use IPMI server management utilities
 License:   BSD
@@ -12,37 +12,33 @@ Source:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 URL:       http://ipmiutil.sourceforge.net
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 # Suggests: cron or vixie-cron or cronie or similar
-%if 0%{?sles_version} >= 10
-%define bldreq0 libopenssl-devel 
-%else
-%define bldreq0 openssl-devel 
-%endif
+%{!?_unitdir: %define _unitdir  /usr/lib/systemd/system}
+%define unit_dir  %{_unitdir}
+%define init_dir  %{_initrddir}
+%define systemd_fls %{_datadir}/%{name}
+%define bldreq0   openssl-devel 
+%define bldreq_extra gcc gcc-c++ libtool 
 %if 0%{?fedora} >= 15
 %define bldreq_extra systemd autoconf automake systemd-units
 Requires:  systemd-units
 Group:     System Environment/Base
+%if 0%{?fedora} == 16
+%define unit_dir  /lib/systemd/system
+%endif
 %endif
 %if 0%{?rhel} >= 7
 %define bldreq_extra autoconf automake systemd-units
 %endif
+%if 0%{?sles_version} > 10
+%define bldreq0 libopenssl-devel 
+%endif
 %if 0%{?suse_version} >= 1210
 %define bldreq_extra gcc gcc-c++ libtool systemd
 %define req_systemd 1
-%define unit_dir  %{_unitdir}
 %define systemd_fls %{unit_dir}
 # Requires: %{?systemd_requires}
-%else
-%define bldreq_extra gcc gcc-c++ libtool 
-%define systemd_fls %{_datadir}/%{name}
-%if 0%{?fedora} == 16
-%define unit_dir  /lib/systemd/system
-%else
-%{!?_unitdir: %define _unitdir  /usr/lib/systemd/system}
-%define unit_dir  %{_unitdir}
-%endif
 %endif
 BuildRequires: %{bldreq0} %{bldreq_extra}
-%define init_dir  %{_initrddir}
 
 %description
 The ipmiutil package provides easy-to-use utilities to view the SEL,
@@ -59,6 +55,7 @@ detected, ipmiutil will use user-space direct I/Os instead.
 %package devel
 Group:    Development/Libraries
 Summary:  Includes libraries and headers for the ipmiutil package
+Requires: ipmiutil
 
 %description devel
 The ipmiutil-devel package contains headers and libraries which are
@@ -194,6 +191,9 @@ rm -rf %{buildroot}
 %post devel
 /sbin/ldconfig
 
+%postun devel
+/sbin/ldconfig
+
 %pre
 %if 0%{?req_systemd}
 %service_add_pre ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service
@@ -229,14 +229,19 @@ then
 
    # Test whether an IPMI interface is known to the motherboard
    IPMIret=1
-   %{_sbindir}/dmidecode |grep -q IPMI && IPMIret=0
-   # Run some ipmiutil command to see if any IPMI interface works.
-   # Some may not have IPMI on the motherboard, so need to check, but
-   # some kernels may have IPMI driver partially loaded, which breaks this
-   %{_bindir}/ipmiutil sel -v >/dev/null 2>&1 && IPMIret=0
+   which dmidecode >/dev/null 2>&1 && IPMIret=0
    if [ $IPMIret -eq 0 ]; then
+    IPMIret=1
+    %{_sbindir}/dmidecode |grep -q IPMI && IPMIret=0
+    if [ $IPMIret -eq 0 ]; then
+     # Run some ipmiutil command to see if any IPMI interface works.
+     # Some may not have IPMI on the motherboard, so need to check, but
+     # some kernels may have IPMI driver partially loaded, which breaks this
+     IPMIret=1
+     %{_bindir}/ipmiutil sel -v >/dev/null 2>&1 && IPMIret=0
+     if [ $IPMIret -eq 0 ]; then
       if [ ! -x %{init_dir}/ipmi ]; then
-         cp -f %{scr_dir}/ipmi.init.basic  %{init_dir}/ipmi
+         cp -f ${scr_dir}/ipmi.init.basic  %{init_dir}/ipmi
       fi
       # If IPMI is enabled, automate managing the IPMI SEL
       if [ -d %{_sysconfdir}/cron.daily ]; then
@@ -263,15 +268,20 @@ then
            rm -f $sensorout
          fi
       fi
+     fi
+    fi
    fi
 else
    # postinstall, doing rpm update
-   IPMIret=0
-   %{_bindir}/ipmiutil sel -v >/dev/null 2>&1  || IPMIret=1
+   IPMIret=1
+   which dmidecode >/dev/null 2>&1 && IPMIret=0
    if [ $IPMIret -eq 0 ]; then
+    %{_sbindir}/dmidecode |grep -q IPMI && IPMIret=0
+    if [ $IPMIret -eq 0 ]; then
       if [ -d %{_sysconfdir}/cron.daily ]; then
          cp -f %{_datadir}/%{name}/checksel %{_sysconfdir}/cron.daily
       fi
+    fi
    fi
 fi
 %if 0%{?fedora} >= 18