Merge tag 'upstream/3.0.1'

Upstream version 3.0.1

4 files changed, 57 insertions, 48 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 1c9e94e..f1c35d4 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.0/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.0/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.1/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.1/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.0/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.0/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.0/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.1/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.1/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.1/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-3.0.0/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.1/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 3.0.0
+PACKAGE_STRING = ipmiutil 3.0.1
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.0.0
+PACKAGE_VERSION = 3.0.1
 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.0
-abs_builddir = /usr/dev/ipmiutil-3.0.0/doc
-abs_srcdir = /usr/dev/ipmiutil-3.0.0/doc
-abs_top_builddir = /usr/dev/ipmiutil-3.0.0
-abs_top_srcdir = /usr/dev/ipmiutil-3.0.0
+VERSION = 3.0.1
+abs_builddir = /usr/dev/ipmiutil-3.0.1/doc
+abs_srcdir = /usr/dev/ipmiutil-3.0.1/doc
+abs_top_builddir = /usr/dev/ipmiutil-3.0.1
+abs_top_srcdir = /usr/dev/ipmiutil-3.0.1
 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.0/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.1/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/doc/UserGuide b/doc/UserGuide
index 8205c46..6f46cd7 100644
--- a/doc/UserGuide
+++ b/doc/UserGuide
@@ -1,6 +1,6 @@
 
                   IPMIUTIL USER GUIDE 
-                     VERSION 3.0.0
+                     VERSION 3.0.1
          An easy-to-use IPMI server management utility
 
 
@@ -191,14 +191,15 @@ Key Strengths = supports any IPMI server platforms,
                 detection, portability,
                 incorporates fixes and new features quickly
 Target Market = Administrators, Developers, and OEMs
-OS Support    = Linux, Windows, Solaris, and FreeBSD
-                (supports Windows natively for remote or local interface)
+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 & SSIF 
+                      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
 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
@@ -4764,16 +4765,17 @@ ipmiutil lan, completed successfully
 ----------------------------------------------------------------
 
 Suppose there are a number of IPMI servers that need to have their
-BMC LAN interface configured.  Shell access to the servers 
+IPMI LAN interface configured.  Shell access to the servers 
 (via ssh or similar) is assumed.  
 
-BMC LAN, Simple case, password is not changed:
+IPMI LAN, Simple case, password is not changed, default user:
 [ssh connection]
 # ipmiutil lan -e
 [ssh exit]
 
-BMC LAN, Complex case, assuming that a password needs to be set and
+IPMI LAN, Complex case, assuming that a password needs to be set and
 that the session text (or script) must encrypt the password.  
+Assumes that we are setting a non-default user named 'admin' below.
 So, using the gnupg.org utilities with public/private keys 
 would look something like this:
 [ Set up list (or db) of encrypted passwords & key by nodename.
@@ -4784,7 +4786,7 @@ would look something like this:
 # gpg --import mykey.file
 # mynode=`uname -n`
 # my_enc_psw=`grep $mynode mylist.file |cut -f2`
-# ipmiutil lan -e -p `gpg --decrypt $my_enc_psw`
+# ipmiutil lan -e -u admin -p `gpg --decrypt $my_enc_psw`
 [ssh exit]
 
 ----------------------------------------------------------------
diff --git a/doc/ilan.8 b/doc/ilan.8
index 533f5cf..87784ef 100644
--- a/doc/ilan.8
+++ b/doc/ilan.8
@@ -1,7 +1,7 @@
 .TH ILAN 8 "Version 1.8: 17 Feb 2010"
 .SH NAME
-ipmiutil_lan \- show and configure BMC LAN parameters and
-set up a PEF entry to send BMC LAN Alerts for OS Critical Stop log events
+ipmiutil_lan \- show and configure IPMI LAN parameters, users, and
+set up a PEF rule to send BMC LAN Alerts for OS Critical Stop log events
 .SH SYNOPSIS
 .B "ipmiutil lan [-abcdefghijklmnopq#rstuvwxyzBDQK -i eth1 ]"
          [\-I ipadr \-M macadr \-S subnet \-B baud_sol ]
@@ -13,12 +13,12 @@ set up a PEF entry to send BMC LAN Alerts for OS Critical Stop log events
 
 .SH DESCRIPTION
 .I ipmiutil lan
-shows or sets all of the IPMI LAN Parameters to enable
+shows or sets all of the IPMI LAN Parameters and users to enable
 remote LAN sessions or BMC LAN Alerts.  The IP address and MAC address of
 the local system, the default gateway, and the alert destination
 can be defaulted to those specified in Linux, or can be overridden
-by user parameters.
-It also creates a new Platform Event Filter table entry for an OS Critical
+by specific parameters.
+It also creates a new Platform Event Filter table rule for an OS Critical
 Stop (0x20) SEL firmware log event, so that it will be enabled to send a
 BMC LAN Alert.  This utility will skip the PEF records if the system does
 not support IPMI 1.5 or greater.
diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec
index 47d1e14..4f95a86 100644
--- a/doc/ipmiutil.spec
+++ b/doc/ipmiutil.spec
@@ -3,7 +3,7 @@
 # Copyright (c) 2012 Andy Cress
 #
 Name:      ipmiutil
-Version: 3.0.0
+Version: 3.0.1
 Release: 1%{?dist}
 Summary:   Easy-to-use IPMI server management utilities
 License:   BSD
@@ -12,34 +12,36 @@ 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%{?fedora} >= 15
-BuildRequires: systemd autoconf automake systemd-units
-Requires: systemd-units
-%endif
 %if 0%{?sles_version} >= 10
-BuildRequires: libopenssl-devel 
+%define bldreq0 libopenssl-devel 
 %else
-BuildRequires: openssl-devel 
+%define bldreq0 openssl-devel 
+%endif
+%if 0%{?fedora} >= 15
+%define bldreq_extra systemd autoconf automake systemd-units
+Requires:  systemd-units
+Group:     System Environment/Base
+%endif
+%if 0%{?rhel} >= 7
+%define bldreq_extra autoconf automake systemd-units
 %endif
 %if 0%{?suse_version} >= 1210
-BuildRequires: gcc gcc-c++ libtool systemd
+%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
-BuildRequires: gcc gcc-c++ libtool 
+%define bldreq_extra gcc gcc-c++ libtool 
 %define systemd_fls %{_datadir}/%{name}
 %if 0%{?fedora} == 16
 %define unit_dir  /lib/systemd/system
 %else
-%if 0%{?rhel} >= 7
-BuildRequires: systemd-units
-%endif
 %{!?_unitdir: %define _unitdir  /usr/lib/systemd/system}
 %define unit_dir  %{_unitdir}
 %endif
 %endif
+BuildRequires: %{bldreq0} %{bldreq_extra}
 %define init_dir  %{_initrddir}
 
 %description
@@ -82,7 +84,11 @@ autoconf
 %else
 %configure
 %endif
+%if 0%{?fedora} >= 15
+make %{?_smp_mflags}
+%else
 make 
+%endif
 
 %install
 rm -rf %{buildroot}
@@ -205,11 +211,11 @@ then
 %else
    if [ -x /bin/systemctl ] && [ -d %{unit_dir} ]; then
       echo "IINITDIR=%{init_dir}" >>%{_datadir}/%{name}/ipmiutil.env
-         cp -f ${scr_dir}/ipmiutil_evt.service %{unit_dir}
-         cp -f ${scr_dir}/ipmiutil_asy.service %{unit_dir}
-         cp -f ${scr_dir}/ipmiutil_wdt.service %{unit_dir}
-         cp -f ${scr_dir}/ipmi_port.service    %{unit_dir}
-         # systemctl enable ipmi_port.service >/dev/null 2>&1 || :
+      cp -f ${scr_dir}/ipmiutil_evt.service %{unit_dir}
+      cp -f ${scr_dir}/ipmiutil_asy.service %{unit_dir}
+      cp -f ${scr_dir}/ipmiutil_wdt.service %{unit_dir}
+      cp -f ${scr_dir}/ipmi_port.service    %{unit_dir}
+      # systemctl enable ipmi_port.service >/dev/null 2>&1 || :
    else 
       cp -f ${scr_dir}/ipmiutil_wdt %{init_dir}
       cp -f ${scr_dir}/ipmiutil_asy %{init_dir}
@@ -250,10 +256,10 @@ then
       sensorout=$vardir/sensor_out.txt
       if [ ! -f $sensorout ]; then
          %{_bindir}/ipmiutil sensor -q >$sensorout || :
-	 if [ $? -ne 0 ]; then
-	    # remove file if error, try again in ipmi_port on reboot.
-	    rm -f $sensorout
-	 fi
+         if [ $? -ne 0 ]; then
+           # remove file if error, try again in ipmi_port on reboot.
+           rm -f $sensorout
+         fi
       fi
    fi
 else
@@ -319,6 +325,7 @@ then
 fi
 
 %postun
+# after uninstall,  $1 = 1 if update, $1 = 0 if rpm -e
 /sbin/ldconfig
 %if 0%{?req_systemd}
 %service_del_postun ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service