diff options
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 31 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | debpkg/changelog | 6 | ||||
| -rw-r--r-- | doc/Makefile | 28 | ||||
| -rw-r--r-- | doc/UserGuide | 2 | ||||
| -rw-r--r-- | doc/ipmiutil.spec | 87 | ||||
| -rw-r--r-- | lib/Makefile | 28 | ||||
| -rw-r--r-- | lib/lanplus/ipmiplus.mak | 3 | ||||
| -rw-r--r-- | lib/lanplus/lanplus.c | 47 | ||||
| -rw-r--r-- | lib/libipmiutil.pc | 2 | ||||
| -rw-r--r-- | scripts/Makefile | 28 | ||||
| -rwxr-xr-x | setver | 2 | ||||
| -rw-r--r-- | util/ievents.c | 2 | ||||
| -rw-r--r-- | util/ipmiutil.c | 2 | ||||
| -rwxr-xr-x | vcvars32.bat | 4 | ||||
| -rwxr-xr-x | vcvars64.bat | 4 |
18 files changed, 186 insertions, 123 deletions
@@ -4334,3 +4334,26 @@ wdt.8 iwdt.8 (ipmiutil wdt) 09/13/2018 ARCress ipmiutil-3.1.3 changes (iver 3.13) util/oem_hp.c - handle analog readings in HP discrete Fan sensors (SF_Feat#9) + +07/18/2019 ARCress ipmiutil-3.1.4 changes (iver 3.14) + doc/ipmiutil.spec - systemd changes contributed from Aska Wu (1/10/19) + configure.ac - change disable-lanplus to enable-lanplus + util/ievents.c - added more SuperMicro boot events + util/ipmicmd.c - if WIN IPv6 use lan2 protocol + util/ipmilan.c - changes for WIN IPv6 + util/itsol.c - changes for WIN IPv6 + lib/lanplus/lanplus.c - changes for WIN IPv6 + lib/lanplus/ipmiplus.mak - added /DHAVE_IPV6, but not enabled yet + util/ipmiutil64.mak - set /DHAVE_IPV6 + util/ipmiutil.mak - set /DHAVE_IPV6 + util/ipmiutil.c - ver 3.14 + util/ifru.c - skip overflow message if len=0 (SF_SR#35), + handle X11DPT crash w do_sysinfo=0 + util/ilan.c - handle detecting NIC if default devnum is not 0, + resolve compile warnings + util/ihealth.c - decode SuperMicro X11DPT-B + util/igetevent.c - resolve compile warnings + util/isensor.c - resolve compile warnings + util/isel.c - resolve compile warnings + util/iconfig.c - resolve compile warnings + 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) @@ -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.3. +# Generated by GNU Autoconf 2.63 for ipmiutil 3.1.4. # # 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.3' -PACKAGE_STRING='ipmiutil 3.1.3' +PACKAGE_VERSION='3.1.4' +PACKAGE_STRING='ipmiutil 3.1.4' 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.3 to adapt to many kinds of systems. +\`configure' configures ipmiutil 3.1.4 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.3:";; + short | recursive ) echo "Configuration of ipmiutil 3.1.4:";; esac cat <<\_ACEOF @@ -1589,7 +1589,7 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --enable-landesk adds landesk library support [default=no] - --disable-lanplus disable lanplus support [default=enabled] + --enable-lanplus enable lanplus support (default=yes) --enable-sha256 build with SHA256 support, requires later openssl. --enable-ekanalyzer build with ekanalyzer function enabled. --enable-useflags include environment CFLAGS and LDFLAGS. @@ -1683,7 +1683,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ipmiutil configure 3.1.3 +ipmiutil configure 3.1.4 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.3, which was +It was created by ipmiutil $as_me 3.1.4, 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.3' + VERSION='3.1.4' cat >>confdefs.h <<_ACEOF @@ -13037,10 +13037,9 @@ fi # Check whether --enable-lanplus was given. if test "${enable_lanplus+set}" = set; then - enableval=$enable_lanplus; -fi - -if test "x$enable_lanplus" = "xno"; then + enableval=$enable_lanplus; default=yes +else + if test "x$enableval" = "xno"; then drv_lanplus="" LANPLUS_CFLAGS="" LANPLUS_LDADD="" @@ -13059,6 +13058,8 @@ else LANPLUS_SAM="yes" LD_SAMX="../lib/libipmi_lanplus.a -lcrypto" fi +fi + #AC_ARG_ENABLE([liblanplus], # [ --enable-liblanplus build libipmiutil.a with lanplus [[default=disabled]]],) @@ -13957,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.3, which was +This file was extended by ipmiutil $as_me 3.1.4, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14020,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.3 +ipmiutil config.status 3.1.4 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 139004e..41f5e55 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.3) +AC_INIT(ipmiutil,3.1.4) AC_CONFIG_SRCDIR(util/ipmiutil.c) echo "ipmiutil version ${PACKAGE_VERSION}" AC_CONFIG_HEADERS(config.h) @@ -94,8 +94,8 @@ AC_ARG_ENABLE([landesk], dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes) AC_ARG_ENABLE([lanplus], - [ --disable-lanplus disable lanplus support [[default=enabled]]],) -if test "x$enable_lanplus" = "xno"; then + [ --enable-lanplus enable lanplus support (default=yes)],[default=yes], +[if test "x$enableval" = "xno"; then drv_lanplus="" LANPLUS_CFLAGS="" LANPLUS_LDADD="" @@ -113,7 +113,7 @@ else LANPLUS_CRYPTO="-lcrypto" LANPLUS_SAM="yes" LD_SAMX="../lib/libipmi_lanplus.a -lcrypto" -fi +fi ]) dnl Configure libipmiutil.a for lanplus or not dnl Only SOL requires lanplus, so usually build libipmiutil.a without lanplus diff --git a/debpkg/changelog b/debpkg/changelog index 42171a0..34e6dfb 100644 --- a/debpkg/changelog +++ b/debpkg/changelog @@ -1,3 +1,9 @@ +ipmiutil (3.1.4-1) unstable; urgency=low + + * New upstream version. + + -- Andy Cress <arcress@users.sourceforge.net> Tue, 06 Aug 2019 22:09:55 -0400 + ipmiutil (3.1.3-1) unstable; urgency=low * New upstream version. diff --git a/doc/Makefile b/doc/Makefile index ec426c2..616d3b1 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.1.3/missing --run aclocal-1.11 -AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run tar +ACLOCAL = ${SHELL} /home/public/cress/ipmiutil/src/missing --run aclocal-1.11 +AMTAR = ${SHELL} /home/public/cress/ipmiutil/src/missing --run tar AR = ar -AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run autoconf -AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run autoheader -AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run automake-1.11 +AUTOCONF = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoconf +AUTOHEADER = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoheader +AUTOMAKE = ${SHELL} /home/public/cress/ipmiutil/src/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.1.3/missing --run makeinfo +MAKEINFO = ${SHELL} /home/public/cress/ipmiutil/src/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.1.3 +PACKAGE_STRING = ipmiutil 3.1.4 PACKAGE_TARNAME = ipmiutil -PACKAGE_VERSION = 3.1.3 +PACKAGE_VERSION = 3.1.4 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.3 -abs_builddir = /usr/dev/ipmiutil-3.1.3/doc -abs_srcdir = /usr/dev/ipmiutil-3.1.3/doc -abs_top_builddir = /usr/dev/ipmiutil-3.1.3 -abs_top_srcdir = /usr/dev/ipmiutil-3.1.3 +VERSION = 3.1.4 +abs_builddir = /home/public/cress/ipmiutil/src/doc +abs_srcdir = /home/public/cress/ipmiutil/src/doc +abs_top_builddir = /home/public/cress/ipmiutil/src +abs_top_srcdir = /home/public/cress/ipmiutil/src 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.1.3/install-sh +install_sh = ${SHELL} /home/public/cress/ipmiutil/src/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/doc/UserGuide b/doc/UserGuide index 5c35b6b..a09f884 100644 --- a/doc/UserGuide +++ b/doc/UserGuide @@ -1,6 +1,6 @@ IPMIUTIL USER GUIDE - VERSION 3.1.3 + VERSION 3.1.4 An easy-to-use IPMI server management utility diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec index 3587484..5d80dab 100644 --- a/doc/ipmiutil.spec +++ b/doc/ipmiutil.spec @@ -3,7 +3,7 @@ # Copyright (c) 2012 Andy Cress # Name: ipmiutil -Version: 3.1.3 +Version: 3.1.4 Release: 1%{?dist} Summary: Easy-to-use IPMI server management utilities License: BSD @@ -207,17 +207,19 @@ rm -rf %{buildroot} %post /sbin/ldconfig # POST_INSTALL, $1 = 1 if rpm -i, $1 = 2 if rpm -U -if [ "$1" = "1" ] -then - # doing rpm -i, first time - vardir=%{_var}/lib/%{name} - scr_dir=%{_datadir}/%{name} +vardir=%{_var}/lib/%{name} +scr_dir=%{_datadir}/%{name} +# Install right scripts/service files no matter install or upgrade %if 0%{?req_systemd} %service_add_post ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service %else if [ -x /bin/systemctl ] && [ -d %{unit_dir} ]; then - echo "IINITDIR=%{init_dir}" >>%{_datadir}/%{name}/ipmiutil.env + # Replace if exists, append if not. + # Use # as the sed delimiter to prevent handling slash in the path. + 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 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} @@ -232,6 +234,8 @@ then fi %endif +if [ "$1" = "1" ] +then # Test whether an IPMI interface is known to the motherboard IPMIret=1 which dmidecode >/dev/null 2>&1 && IPMIret=0 @@ -290,7 +294,7 @@ else fi fi fi -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %systemd_post ipmiutil_evt.service %systemd_post ipmiutil_asy.service %systemd_post ipmiutil_wdt.service @@ -306,12 +310,15 @@ then %else if [ -x /bin/systemctl ]; then if [ -f %{unit_dir}/ipmiutil_evt.service ]; then -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %systemd_preun ipmiutil_evt.service %systemd_preun ipmiutil_asy.service %systemd_preun ipmiutil_wdt.service %systemd_preun ipmi_port.service %else + ret=1 + which systemctl >/dev/null 2>&1 && ret=0 + if [ $ret -eq 0 ]; then systemctl disable ipmi_port.service >/dev/null 2>&1 || : systemctl disable ipmiutil_evt.service >/dev/null 2>&1 || : systemctl disable ipmiutil_asy.service >/dev/null 2>&1 || : @@ -320,6 +327,7 @@ then systemctl stop ipmiutil_asy.service >/dev/null 2>&1 || : systemctl stop ipmiutil_wdt.service >/dev/null 2>&1 || : systemctl stop ipmi_port.service >/dev/null 2>&1 || : + fi %endif fi else @@ -345,36 +353,53 @@ fi %postun # after uninstall, $1 = 1 if update, $1 = 0 if rpm -e /sbin/ldconfig +# Remove files from scr_dir only when uninstall +if [ "$1" = "0" ] +then + if [ -x /bin/systemctl ] && [ -d %{unit_dir} ]; then + if [ -f %{unit_dir}/ipmiutil_evt.service ]; then + rm -f %{unit_dir}/ipmiutil_evt.service 2>/dev/null || : + rm -f %{unit_dir}/ipmiutil_asy.service 2>/dev/null || : + rm -f %{unit_dir}/ipmiutil_wdt.service 2>/dev/null || : + rm -f %{unit_dir}/ipmi_port.service 2>/dev/null || : + fi + else + if [ -f %{init_dir}/ipmiutil_evt.service ]; then + rm -f %{init_dir}/ipmiutil_wdt 2>/dev/null || : + rm -f %{init_dir}/ipmiutil_asy 2>/dev/null || : + rm -f %{init_dir}/ipmiutil_evt 2>/dev/null || : + rm -f %{init_dir}/ipmi_port 2>/dev/null || : + fi + fi +fi + %if 0%{?req_systemd} %service_del_postun ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service %else -if [ -x /bin/systemctl ]; then -%if 0%{?fedora} >= 18 -%systemd_postun_with_restart ipmi_port.service +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +%systemd_postun_with_restart ipmi_port.service +%systemd_postun_with_restart ipmiutil_evt.service +%systemd_postun_with_restart ipmiutil_asy.service +%systemd_postun_with_restart ipmiutil_wdt.service %else - systemctl daemon-reload || : - if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - systemctl try-restart ipmi_port.service || : - fi -%endif - if [ -f %{unit_dir}/ipmiutil_evt.service ]; then - rm -f %{unit_dir}/ipmiutil_evt.service 2>/dev/null || : - rm -f %{unit_dir}/ipmiutil_asy.service 2>/dev/null || : - rm -f %{unit_dir}/ipmiutil_wdt.service 2>/dev/null || : - rm -f %{unit_dir}/ipmi_port.service 2>/dev/null || : - fi -else - if [ -f %{init_dir}/ipmiutil_evt.service ]; then - rm -f %{init_dir}/ipmiutil_wdt 2>/dev/null || : - rm -f %{init_dir}/ipmiutil_asy 2>/dev/null || : - rm -f %{init_dir}/ipmiutil_evt 2>/dev/null || : - rm -f %{init_dir}/ipmi_port 2>/dev/null || : - fi +ret=1 +which systemctl >/dev/null 2>&1 && ret=0 +if [ $ret -eq 0 ]; then + systemctl daemon-reload || : + if [ $1 -ge 1 ]; then + # Package upgrade, not uninstall + systemctl try-restart ipmi_port.service || : + systemctl try-restart ipmiutil_evt.service || : + systemctl try-restart ipmiutil_asy.service || : + systemctl try-restart ipmiutil_wdt.service || : + fi fi %endif +%endif %changelog +* Mon Oct 29 2018 Andrew Cress <arcress at users.sourceforge.net> 3.1.3-1 +- clean up systemd scripts with macros, fix update for systemd (Aska Wu) * Fri Jul 20 2018 Andrew Cress <arcress at users.sourceforge.net> 3.1.2-1 - resolve doubly-defined Group for Fedora * Mon Jun 29 2015 Andrew Cress <arcress at users.sourceforge.net> 2.9.7-1 diff --git a/lib/Makefile b/lib/Makefile index b21e936..aced884 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} /usr/dev/ipmiutil-3.1.3/missing --run aclocal-1.11 -AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run tar +ACLOCAL = ${SHELL} /home/public/cress/ipmiutil/src/missing --run aclocal-1.11 +AMTAR = ${SHELL} /home/public/cress/ipmiutil/src/missing --run tar AR = ar -AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run autoconf -AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run autoheader -AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run automake-1.11 +AUTOCONF = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoconf +AUTOHEADER = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoheader +AUTOMAKE = ${SHELL} /home/public/cress/ipmiutil/src/missing --run automake-1.11 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -101,7 +101,7 @@ LIB_DIR = /usr/lib64 LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run makeinfo +MAKEINFO = ${SHELL} /home/public/cress/ipmiutil/src/missing --run makeinfo MKDIR_P = /bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = @@ -115,9 +115,9 @@ OTOOL64 = PACKAGE = ipmiutil PACKAGE_BUGREPORT = PACKAGE_NAME = ipmiutil -PACKAGE_STRING = ipmiutil 3.1.3 +PACKAGE_STRING = ipmiutil 3.1.4 PACKAGE_TARNAME = ipmiutil -PACKAGE_VERSION = 3.1.3 +PACKAGE_VERSION = 3.1.4 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.3 -abs_builddir = /usr/dev/ipmiutil-3.1.3/lib -abs_srcdir = /usr/dev/ipmiutil-3.1.3/lib -abs_top_builddir = /usr/dev/ipmiutil-3.1.3 -abs_top_srcdir = /usr/dev/ipmiutil-3.1.3 +VERSION = 3.1.4 +abs_builddir = /home/public/cress/ipmiutil/src/lib +abs_srcdir = /home/public/cress/ipmiutil/src/lib +abs_top_builddir = /home/public/cress/ipmiutil/src +abs_top_srcdir = /home/public/cress/ipmiutil/src 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} /usr/dev/ipmiutil-3.1.3/install-sh +install_sh = ${SHELL} /home/public/cress/ipmiutil/src/install-sh libdir = $(iprefix)/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/lib/lanplus/ipmiplus.mak b/lib/lanplus/ipmiplus.mak index 9a1435a..5c851c2 100644 --- a/lib/lanplus/ipmiplus.mak +++ b/lib/lanplus/ipmiplus.mak @@ -16,7 +16,8 @@ CF_EX=/DWIN32 $(INC) /D_CONSOLE /DNDEBUG /D_CRT_SECURE_NO_DEPRECATE # CFLAGS= /W3 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo $(CF_EX)
# CFLAGS= /W3 /O2 /Zi /MD /GF /Gy /nologo $(CF_EX)
# CFLAGS= /W3 /O2 /Zi /MD /nologo $(CF_EX)
-CFLAGS= /W3 /O2 /Zi /MT /nologo $(CF_EX)
+#CFLAGS= /W3 /O2 /Zi /MT /nologo $(CF_EX) /DHAVE_IPV6
+CFLAGS= /W3 /O2 /Zi /MT /nologo $(CF_EX)
MKLIB=lib
RM=del
diff --git a/lib/lanplus/lanplus.c b/lib/lanplus/lanplus.c index e423ede..c910b85 100644 --- a/lib/lanplus/lanplus.c +++ b/lib/lanplus/lanplus.c @@ -32,19 +32,18 @@ /* ARCress, TODO: improve error handling and remove all assert() calls here. */ #ifdef WIN32 -#include <windows.h> -#include <stdio.h> -#include <stdlib.h> -#include <inttypes-win.h> -#include <io.h> -#include <signal.h> -//#define HAVE_IPV6 1 #ifdef HAVE_IPV6 #include <winsock2.h> //#include <ws2tcpip.h> #else #include <winsock.h> #endif +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> +#include <inttypes-win.h> +#include <io.h> +#include <signal.h> #include <time.h> #else #include <stdlib.h> @@ -103,7 +102,11 @@ static int my_ai_flags = AI_NUMERICSERV; /*0x0400 Dont use name resolution NEW*/ #undef HAVE_IPV6 #endif #ifdef HAVE_IPV6 +#ifdef WIN32 +#define SOCKADDR_T SOCKADDR_STORAGE +#else #define SOCKADDR_T struct sockaddr_storage +#endif #else #define SOCKADDR_T struct sockaddr_in #endif @@ -3703,7 +3706,7 @@ ipmi_lanplus_open(struct ipmi_intf * intf) #endif #ifdef HAVE_IPV6 - session->addrlen = 0; + session->addrlen = 0; memset(&session->addr, 0, sizeof(session->addr)); memset(&addr, 0, sizeof(addr)); sprintf(service, "%d", session->port); @@ -3714,10 +3717,10 @@ ipmi_lanplus_open(struct ipmi_intf * intf) hints.ai_flags = my_ai_flags; hints.ai_protocol = IPPROTO_UDP; /* */ - rc = getaddrinfo((char *)session->hostname, service, &hints, &result); + rc = getaddrinfo((char *)session->hostname, service, &hints, &result); if (rc != 0) { - lprintf(LOG_ERR, "Address lookup for %s failed with %d", - session->hostname,rc); + lprintf(LOG_ERR, "Address lookup for %s failed with %d, %s", + session->hostname,rc,gai_strerror(rc)); return -1; } @@ -3725,24 +3728,24 @@ ipmi_lanplus_open(struct ipmi_intf * intf) * Try each address until we successfully connect(2). */ for (rp = result; rp != NULL; rp = rp->ai_next) { - intf->fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); - if (intf->fd == -1) continue; + intf->fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + if (intf->fd == -1) continue; /* valid protocols are IPPROTO_UDP, IPPROTO_IPV6 */ if (rp->ai_protocol == IPPROTO_TCP) continue; /*IPMI != TCP*/ lprintf(LOG_DEBUG, "lanplus socket(%d,%d,%d), connect(%d)", rp->ai_family, rp->ai_socktype, rp->ai_protocol, intf->fd ); - if (connect(intf->fd, rp->ai_addr, rp->ai_addrlen) != -1) { + if (connect(intf->fd, rp->ai_addr, rp->ai_addrlen) != -1) { lprintf(LOG_DEBUG, "lanplus connect ok, addrlen=%d size=%d", rp->ai_addrlen,sizeof(addr)); - addrlen = rp->ai_addrlen; - memcpy(&addr, rp->ai_addr, addrlen); - // memcpy(&session->addr, rp->ai_addr, rp->ai_addrlen); - session->addrlen = rp->ai_addrlen; - break; /* Success */ - } - close(intf->fd); - intf->fd = -1; + addrlen = rp->ai_addrlen; + memcpy(&addr, rp->ai_addr, addrlen); + // memcpy(&session->addr, rp->ai_addr, rp->ai_addrlen); + session->addrlen = rp->ai_addrlen; + break; /* Success */ + } + close(intf->fd); + intf->fd = -1; } freeaddrinfo(result); /* Done with addrinfo */ if (intf->fd < 0) { diff --git a/lib/libipmiutil.pc b/lib/libipmiutil.pc index e0c50a2..4fe6772 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.3 +Version: 3.1.4 Libs: -L${libdir} -lipmi_lanplus Cflags: -I${includedir} diff --git a/scripts/Makefile b/scripts/Makefile index 269da3c..3091d53 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} /usr/dev/ipmiutil-3.1.3/missing --run aclocal-1.11 -AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run tar +ACLOCAL = ${SHELL} /home/public/cress/ipmiutil/src/missing --run aclocal-1.11 +AMTAR = ${SHELL} /home/public/cress/ipmiutil/src/missing --run tar AR = ar -AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run autoconf -AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run autoheader -AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.3/missing --run automake-1.11 +AUTOCONF = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoconf +AUTOHEADER = ${SHELL} /home/public/cress/ipmiutil/src/missing --run autoheader +AUTOMAKE = ${SHELL} /home/public/cress/ipmiutil/src/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.1.3/missing --run makeinfo +MAKEINFO = ${SHELL} /home/public/cress/ipmiutil/src/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.1.3 +PACKAGE_STRING = ipmiutil 3.1.4 PACKAGE_TARNAME = ipmiutil -PACKAGE_VERSION = 3.1.3 +PACKAGE_VERSION = 3.1.4 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.3 -abs_builddir = /usr/dev/ipmiutil-3.1.3/scripts -abs_srcdir = /usr/dev/ipmiutil-3.1.3/scripts -abs_top_builddir = /usr/dev/ipmiutil-3.1.3 -abs_top_srcdir = /usr/dev/ipmiutil-3.1.3 +VERSION = 3.1.4 +abs_builddir = /home/public/cress/ipmiutil/src/scripts +abs_srcdir = /home/public/cress/ipmiutil/src/scripts +abs_top_builddir = /home/public/cress/ipmiutil/src +abs_top_srcdir = /home/public/cress/ipmiutil/src 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.1.3/install-sh +install_sh = ${SHELL} /home/public/cress/ipmiutil/src/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale @@ -6,7 +6,7 @@ # [doinc?] is 'n'. # if [doinc?] is 'r', reverse increment (decrement). # -ver=3.1.3 +ver=3.1.4 rel=1 tmped=/tmp/edver.tmp tmpspec=/tmp/edspec.tmp diff --git a/util/ievents.c b/util/ievents.c index 4053eab..4f14516 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.13"; +static char *progver = "3.14"; 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 6cbdf76..f43deb1 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.13"; +char *progver = "3.14"; // static char fdebug = 0; /*int ipmiutil(int argc, char **argv); */ diff --git a/vcvars32.bat b/vcvars32.bat index 3a2b316..31b132e 100755 --- a/vcvars32.bat +++ b/vcvars32.bat @@ -2,7 +2,7 @@ REM Copy saved 32bit libraries into place, if present
REM iphlpapi.lib libeay32.dll libeay32.lib ssleay32.dll ssleay32.lib
REM Modify SAVLIB32 to a directory where these libs are saved.
-set SAVLIB32=lib\x32
+set SAVLIB32=lib32
IF NOT EXIST %SAVLIB32% GOTO NOSAVLIB
copy /Y %SAVLIB32%\*.lib lib
copy /Y %SAVLIB32%\*.dll util
@@ -20,6 +20,8 @@ set VCDIR=%VCINSTALLDIR% :HAVEDEF
REM Run MS 32bit vcvars
set VCBAT="%VCDIR%\bin\vcvars32.bat"
+set VCBATDIR="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build"
+set VCBAT=%VCBATDIR%\vcvars32.bat
IF EXIST %VCBAT% GOTO RUNVC
echo "Cannot locate vcvars32.bat, please run it manually."
GOTO DONE
diff --git a/vcvars64.bat b/vcvars64.bat index 1e5f125..2d52742 100755 --- a/vcvars64.bat +++ b/vcvars64.bat @@ -2,7 +2,7 @@ REM Copy saved 64bit libraries into place, if present
REM iphlpapi.lib libeay32.dll libeay32.lib ssleay32.dll ssleay32.lib
REM Modify SAVLIB64 to a directory where these libs are saved.
-set SAVLIB64=lib\x64
+set SAVLIB64=lib64
IF NOT EXIST %SAVLIB64% GOTO NOSAVLIB
copy /Y %SAVLIB64%\*.lib lib
copy /Y %SAVLIB64%\*.dll util
@@ -20,6 +20,8 @@ set VCDIR=%VCINSTALLDIR% :HAVEDEF
REM Run MS 64bit vcvars
set VCBAT="%VCDIR%\bin\x86_amd64\vcvarsx86_amd64.bat"
+set VCBATDIR="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build"
+set VCBAT=%VCBATDIR%\vcvarsx86_amd64.bat
IF EXIST %VCBAT% GOTO RUNVC
echo "Cannot locate vcvars for amd64, please run it manually."
GOTO DONE
|