Merge branch 'release/3.0.7-1'3.0.7-1

3 files changed, 36 insertions, 23 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 0f23c85..381c0dc 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.4/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.0.7/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.0.7/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.0.4/missing --run automake-1.11
+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
 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.4/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.0.7/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.4
+PACKAGE_STRING = ipmiutil 3.0.7
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.0.4
+PACKAGE_VERSION = 3.0.7
 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.4
-abs_builddir = /usr/dev/ipmiutil-3.0.4/doc
-abs_srcdir = /usr/dev/ipmiutil-3.0.4/doc
-abs_top_builddir = /usr/dev/ipmiutil-3.0.4
-abs_top_srcdir = /usr/dev/ipmiutil-3.0.4
+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
 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.4/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.0.7/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/doc/UserGuide b/doc/UserGuide
index eb86edc..e5681f1 100644
--- a/doc/UserGuide
+++ b/doc/UserGuide
@@ -1,6 +1,6 @@
 
                   IPMIUTIL USER GUIDE 
-                     VERSION 3.0.4
+                     VERSION 3.0.7
          An easy-to-use IPMI server management utility
 
 
@@ -5496,14 +5496,27 @@ or
 C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat
 
 
-5.2.7  Run buildwin.cmd
-buildwin.cmd will build all of the Windows EXE and DLL files.
+5.2.7  For Windows builds, run buildwin.cmd
 
-If you are using ipmiutil for a bootable WinPE environment, and do not need
-Serial-Over-LAN functionality, the buildwin2.cmd will build the Windows EXE 
-files without using the openssl libraries, to simplify the process.  The 
-openssl libraries are required for the IPMI LAN 2.0 crypto functions that
-Serial-Over-LAN requires.  
+buildwin.cmd will build all of the Windows EXE and DLL files. It will detect 
+whether the vcvars has been run with 32bit or 64bit.
+
+buildwin32.cmd will build only the 32-bit Windows EXE and DLL files. 
+
+buildwin64.cmd will build only the 64-bit Windows EXE and DLL files. 
+
+5.2.8  For WinPE builds, run buildmin.cmd
+
+If you are using ipmiutil for a bootable WinPE environment, you will not need
+Serial-Over-LAN functionality, the buildmin.cmd will build the Windows ipmiutil
+EXE files without using the openssl libraries, to simplify the process.  
+The openssl libraries are required for the IPMI LANplus 2.0 crypto functions 
+that Serial-Over-LAN uses.  
+
+buildmin.cmd will build the ipmiutil.exe in a minimal standalone configuration.
+
+For WinPE 64-bit, if you do want openssl for some reason, see 
+http://www.indyproject.org/Sockets/fpc/OpenSSLforWin64.en.aspx
 
 ----------------------------------
 5.3  WINDOWS COMMAND USAGE
diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec
index 107d3e1..c6c39c2 100644
--- a/doc/ipmiutil.spec
+++ b/doc/ipmiutil.spec
@@ -3,7 +3,7 @@
 # Copyright (c) 2012 Andy Cress
 #
 Name:      ipmiutil
-Version: 3.0.4
+Version: 3.0.7
 Release: 1%{?dist}
 Summary:   Easy-to-use IPMI server management utilities
 License:   BSD