From b18f5bf2db0fba2e7e539f68645836036d940d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 29 Apr 2015 15:44:44 +0200 Subject: Imported Upstream version 2.9.6 --- doc/Makefile | 193 ++++++++++++++++++++++++++++++++---------------------- doc/Makefile.in | 157 +++++++++++++++++++++++++++----------------- doc/UserGuide | 9 ++- doc/icmd.8 | 4 +- doc/ilan.8 | 2 + doc/ipmiutil.spec | 60 +++++++++++------ doc/isel.8 | 4 +- doc/isol.8 | 2 + 8 files changed, 269 insertions(+), 162 deletions(-) (limited to 'doc') diff --git a/doc/Makefile b/doc/Makefile index 3c9c43a..97d734d 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # doc/Makefile. Generated from Makefile.in by configure. # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +14,12 @@ # PARTICULAR PURPOSE. -srcdir = . -top_srcdir = .. pkgdatadir = $(datadir)/ipmiutil -pkglibdir = $(libdir)/ipmiutil pkgincludedir = $(includedir)/ipmiutil -top_builddir = .. +pkglibdir = $(libdir)/ipmiutil +pkglibexecdir = $(libexecdir)/ipmiutil am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -44,17 +42,16 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.3/missing --run aclocal-1.9 -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.3/missing --run tar +ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run aclocal-1.11 +AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.6/missing --run tar AR = ar -AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.3/missing --run autoconf -AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.3/missing --run autoheader -AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.3/missing --run automake-1.9 +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 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -63,28 +60,26 @@ CPP = gcc -E CPPFLAGS = CROSS_CFLAGS = CROSS_LFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 CYGPATH_W = echo DEFS = -DHAVE_CONFIG_H DEPDIR = .deps -ECHO = echo +DSYMUTIL = +DUMPBIN = ECHO_C = ECHO_N = -n ECHO_T = -EGREP = grep -E +EGREP = /bin/grep -E EXEEXT = -F77 = f95 -FFLAGS = -g -O2 +FGREP = /bin/grep -F GPL_CFLAGS = +GREP = /bin/grep IA64_CFLAGS = INIT_DIR = /etc//rc.d/init.d +INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s INS_LIB = LANDESK_CFLAGS = LANDESK_LDADD = @@ -93,46 +88,52 @@ LANPLUS_CRYPTO = -lcrypto LANPLUS_LDADD = -L../lib -lipmi_lanplus -L/usr/local/lib -lcrypto LANPLUS_LIB = ../lib/libipmi_lanplus.a LANPLUS_SAM = yes +LD = /usr/bin/ld -m elf_x86_64 LDFLAGS = LD_SAMX = ../lib/libipmi_lanplus.a -lcrypto LIBOBJS = LIBS = +LIBSENSORS = LIBTOOL = $(SHELL) $(top_builddir)/libtool LIB_DIR = /usr/lib64 +LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.3/missing --run makeinfo +MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.6/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_DRIVERS = imbapi.c ipmimv.c ipmild.c ipmidir.c OS_LFLAGS = +OTOOL = +OTOOL64 = PACKAGE = ipmiutil PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = +PACKAGE_NAME = ipmiutil +PACKAGE_STRING = ipmiutil 2.9.6 +PACKAGE_TARNAME = ipmiutil +PACKAGE_VERSION = 2.9.6 PATH_SEPARATOR = : -PKG_DIR = /usr/src/redhat +PKG_DIR = /root/rpmbuild RANLIB = ranlib -SED = /bin/sed +SAM2OBJ = isensor2.o ievents2.o +SED = sed SET_MAKE = SHELL = /bin/sh SHR_LINK = libipmiutil.so STRIP = strip SUBDIR_S = doc scripts lib util SYSTEMD_DIR = /usr/share/ipmiutil -VERSION = 2.9.3 -ac_ct_AR = ar +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 ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_F77 = f95 -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = +ac_ct_DUMPBIN = am__include = include am__leading_dot = . am__quote = @@ -144,28 +145,42 @@ build_alias = build_cpu = x86_64 build_os = linux-gnu build_vendor = redhat +builddir = . datadir = ${prefix}/share +datarootdir = ${prefix}/share +docdir = ${prefix}/share/doc/ipmiutil-${version} +dvidir = ${docdir} exec_prefix = ${prefix} host = x86_64-redhat-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu host_vendor = redhat +htmldir = ${docdir} includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /usr/dev/ipmiutil-2.9.3/install-sh +infodir = ${datarootdir}/info +install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.6/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec +localedir = ${datarootdir}/locale localstatedir = ${prefix}/var +lt_ECHO = echo mandir = ${prefix}/share/man -mkdir_p = mkdir -p -- +mkdir_p = /bin/mkdir -p oldincludedir = /usr/include +pdfdir = ${docdir} +pkgconfigdir = ${libdir}/pkgconfig prefix = /usr program_transform_name = s,x,x, +psdir = ${docdir} sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com +srcdir = . sysconfdir = ${prefix}/etc target_alias = +top_build_prefix = ../ +top_builddir = .. +top_srcdir = .. #!/bin/sh # Makefile to build/install doc files @@ -173,7 +188,6 @@ target_alias = MKDIR = sh ../mkinstalldirs INSTALL_SH = sh ../install-sh -c INSTALL_DATA_SH = ${INSTALL_SH} -m 644 -docdir = ${prefix}/share/doc/ipmiutil-${version} etcdir = /etc datato = ${DESTDIR}${datadir}/ipmiutil cronto = ${DESTDIR}${etcdir}/cron.daily @@ -186,14 +200,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -211,16 +225,13 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -229,29 +240,32 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -278,13 +292,14 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." clean-am: clean-generic clean-libtool mostlyclean-am -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -292,18 +307,38 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: install-data-am: +install-dvi: install-dvi-am + +install-dvi-am: + install-exec-am: +install-html: install-html-am + +install-html-am: + install-info: install-info-am +install-info-am: + install-man: +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -322,17 +357,20 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am all: @@ -378,6 +416,7 @@ install: ${INSTALL_DATA_SH} ismcoem.8 ${manto} ${INSTALL_DATA_SH} bmclanpet.mib ${datato} cd ${manto}; gzip -f *.8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/Makefile.in b/doc/Makefile.in index a6825ce..7afa686 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +14,12 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -44,12 +42,11 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -63,24 +60,22 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CROSS_CFLAGS = @CROSS_CFLAGS@ CROSS_LFLAGS = @CROSS_LFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GPL_CFLAGS = @GPL_CFLAGS@ +GREP = @GREP@ IA64_CFLAGS = @IA64_CFLAGS@ INIT_DIR = @INIT_DIR@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -93,19 +88,28 @@ LANPLUS_CRYPTO = @LANPLUS_CRYPTO@ LANPLUS_LDADD = @LANPLUS_LDADD@ LANPLUS_LIB = @LANPLUS_LIB@ LANPLUS_SAM = @LANPLUS_SAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LD_SAMX = @LD_SAMX@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSENSORS = @LIBSENSORS@ LIBTOOL = @LIBTOOL@ LIB_DIR = @LIB_DIR@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OS_CFLAGS = @OS_CFLAGS@ OS_DRIVERS = @OS_DRIVERS@ OS_LFLAGS = @OS_LFLAGS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -115,6 +119,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_DIR = @PKG_DIR@ RANLIB = @RANLIB@ +SAM2OBJ = @SAM2OBJ@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -123,16 +128,12 @@ STRIP = @STRIP@ SUBDIR_S = @SUBDIR_S@ SYSTEMD_DIR = @SYSTEMD_DIR@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -144,28 +145,42 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = ${prefix}/share +datarootdir = @datarootdir@ +docdir = ${prefix}/share/doc/ipmiutil-${version} +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = ${prefix}/share/man mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgconfigdir = @pkgconfigdir@ prefix = /usr program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ #!/bin/sh # Makefile to build/install doc files @@ -173,7 +188,6 @@ target_alias = @target_alias@ MKDIR = sh ../mkinstalldirs INSTALL_SH = sh ../install-sh -c INSTALL_DATA_SH = ${INSTALL_SH} -m 644 -docdir = ${prefix}/share/doc/ipmiutil-${version} etcdir = /etc datato = ${DESTDIR}${datadir}/ipmiutil cronto = ${DESTDIR}${etcdir}/cron.daily @@ -186,14 +200,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -211,16 +225,13 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -229,29 +240,32 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -278,13 +292,14 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." clean-am: clean-generic clean-libtool mostlyclean-am -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -292,18 +307,38 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: install-data-am: +install-dvi: install-dvi-am + +install-dvi-am: + install-exec-am: +install-html: install-html-am + +install-html-am: + install-info: install-info-am +install-info-am: + install-man: +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -322,17 +357,20 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am all: @@ -378,6 +416,7 @@ install: ${INSTALL_DATA_SH} ismcoem.8 ${manto} ${INSTALL_DATA_SH} bmclanpet.mib ${datato} cd ${manto}; gzip -f *.8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/UserGuide b/doc/UserGuide index d1b1090..213b367 100644 --- a/doc/UserGuide +++ b/doc/UserGuide @@ -1,6 +1,6 @@ IPMIUTIL USER GUIDE - VERSION 2.9.3 + VERSION 2.9.6 An easy-to-use IPMI server management utility @@ -5263,6 +5263,12 @@ 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 ---------------------------------- @@ -6161,6 +6167,7 @@ The make rpm produces a binary rpm, and a source rpm, which can be installed with "rpm -i *.rpm". To build and install a Debian package, do this: +# mv debpkg debian # dpkg-buildpackage then install it with "dpkg -i *.deb". diff --git a/doc/icmd.8 b/doc/icmd.8 index f786528..eb98ba8 100644 --- a/doc/icmd.8 +++ b/doc/icmd.8 @@ -3,7 +3,7 @@ ipmiutil_cmd \- a tool to send specific IPMI commands via the command line. .SH SYNOPSIS -.B "ipmiutil cmd [-qsx -NUPREFJTVY] bus rsSa netFn/lun cmd [data bytes]" +.B "ipmiutil cmd [-pqsx -NUPREFJTVY] bus rsSa netFn/lun cmd [data bytes]" .SH DESCRIPTION This @@ -26,6 +26,8 @@ specification, or you have specific pre-written commands to send. .SH OPTIONS Command line options are described below. +.IP "-p" +Port to use. Defaults to RMCP port 623. .IP "-q" Quiet mode. Show only minimal header information. .IP "-s" diff --git a/doc/ilan.8 b/doc/ilan.8 index 31b26ae..533f5cf 100644 --- a/doc/ilan.8 +++ b/doc/ilan.8 @@ -185,6 +185,8 @@ The default is to automatically obtain this from the Linux ifconfig. Nodename or IP address of the remote target system. If a nodename is specified, IPMI LAN interface is used. Otherwise the local system management interface is used. +.IP "-O" +Observe security. Disables the default null user and disable cipher 0. .IP "-P rmt_pswd" Remote password for the nodename given. The default is a null password. Same as \-R below. diff --git a/doc/ipmiutil.spec b/doc/ipmiutil.spec index cd849f2..7cae79d 100644 --- a/doc/ipmiutil.spec +++ b/doc/ipmiutil.spec @@ -3,7 +3,7 @@ # Copyright (c) 2012 Andy Cress # Name: ipmiutil -Version: 2.9.3 +Version: 2.9.6 Release: 1%{?dist} Summary: Easy-to-use IPMI server management utilities License: BSD @@ -13,19 +13,24 @@ 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 +BuildRequires: systemd autoconf automake Requires: systemd-units %endif %if 0%{?suse_version} >= 1210 %define req_systemd 1 %endif +%if 0%{?sles_version} >= 10 +BuildRequires: libopenssl-devel +%else +BuildRequires: openssl-devel +%endif %if 0%{?req_systemd} -BuildRequires: openssl-devel gcc gcc-c++ libtool systemd +BuildRequires: gcc gcc-c++ libtool systemd %define unit_dir %{_unitdir} %define systemd_fls %{unit_dir} # Requires: %{?systemd_requires} %else -BuildRequires: openssl-devel gcc gcc-c++ libtool +BuildRequires: gcc gcc-c++ libtool %if 0%{?fedora} == 16 %define unit_dir /lib/systemd/system %else @@ -50,12 +55,19 @@ detected, ipmiutil will use user-space direct I/Os instead. %package devel Group: Development/Libraries Summary: Includes libraries and headers for the ipmiutil package -Provides: ipmiutil-static = %{version}-%{release} %description devel The ipmiutil-devel package contains headers and libraries which are useful for building custom IPMI applications. +%package static +Group: Development/Libraries +Summary: Includes static libraries for the ipmiutil package + +%description static +The ipmiutil-static package contains static libraries which are +useful for building custom IPMI applications. + %prep %setup -q @@ -162,9 +174,11 @@ rm -rf %{buildroot} %{_datadir}/%{name}/ievents.h %{_datadir}/%{name}/Makefile %{_includedir}/ipmicmd.h -%{_libdir}/libipmiutil.a %{_libdir}/libipmiutil.so +%files static +%defattr(-,root,root) +%{_libdir}/libipmiutil.a %pre %if 0%{?req_systemd} @@ -182,13 +196,13 @@ then %if 0%{?req_systemd} %service_add_post ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service %else - if [ -x /bin/systemctl ]; then + 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} @@ -321,6 +335,10 @@ fi %endif %changelog +* Mon Nov 03 2014 Andrew Cress 2.9.5-1 +- separate libipmiutil.a into ipmiutil-static package +* Thu Aug 28 2014 Andrew Cress 2.9.4-1 +- Updated to ipmiutil-2.9.4 * Tue Aug 21 2012 Andrew Cress 2.8.5-2 Added F18 systemd macros for RH bug #850163 * Fri May 04 2012 Andrew Cress 2.8.4-1 @@ -367,18 +385,18 @@ fi rpmlint tweaks for ipmiutil-1.9.8 * Mon May 21 2007 Andrew Cress added isroot flag for chroot cases -* Mon May 18 2007 Andrew Cress +* Fri May 18 2007 Andrew Cress added ipmi_port init handling * Mon Jul 10 2006 Andrew Cress changed to libfreeipmi.so.2, include and run ipmi_if.sh * Tue Aug 02 2005 Andrew Cress changed not to run pefconfig if already configured -* Wed Feb 03 2005 Andrew Cress +* Thu Feb 03 2005 Andrew Cress changed /usr/man to /usr/share/man, fixed postun to recognize rpm -U via arg 1 * Mon Nov 1 2004 Andrew Cress added freeipmi install files and logic -* Tue Aug 23 2004 Andrew Cress +* Mon Aug 23 2004 Andrew Cress - added MIB links to /usr/share/snmp/mibs * Tue Aug 10 2004 Andrew Cress - added icmd utility to the rpm @@ -388,7 +406,7 @@ fi - added checksel cron job * Tue Jan 28 2003 Andrew Cress - added sensor & fruconfig for ipmiutil 1.2.8 -* Tue Aug 2 2002 Andrew Cress +* Fri Aug 2 2002 Andrew Cress - fixed bug 793 (dont need Require:ipmidrvr) for ipmiutil 1.2.2 * Tue Jul 2 2002 Andrew Cress - fixed bug 555 in showsel for ipmiutil 1.2.1 @@ -402,15 +420,15 @@ fi - updated for 1.1.3, added source rpm, changed license, etc. * Thu Jan 31 2002 Andrew Cress - updated for 1.1.0-2, changed selpef to pefconfig -* Thu Jan 25 2002 Andrew Cress +* Fri Jan 25 2002 Andrew Cress - updated for 1.1.0, changed to ipmidrvr rather than isc dependency -* Thu Jan 16 2002 Andrew Cress +* Wed Jan 16 2002 Andrew Cress - updated for 1.1.0, added hwreset utility -* Thu Dec 14 2001 Andrew Cress +* Fri Dec 14 2001 Andrew Cress - updated for 1.0.0, man page updates -* Thu Nov 19 2001 Andrew Cress +* Mon Nov 19 2001 Andrew Cress - updated for 0.9.0, uses new OSS bmc_panic, so don't install module. -* Thu Nov 13 2001 Andrew Cress +* Tue Nov 13 2001 Andrew Cress - updated for 0.8.5, add "Requires: isc" (#32), hide selpef output (#38) * Thu Nov 8 2001 Andrew Cress - updated for 0.8.4, eliminate "file exists" messages by fixing removal diff --git a/doc/isel.8 b/doc/isel.8 index a765e32..62180bb 100644 --- a/doc/isel.8 +++ b/doc/isel.8 @@ -65,9 +65,7 @@ Show output in a nominal/canonical format, with a default delimiter of '|'. Show the 16 raw hex bytes for each SEL entry. The default is to display interpreted entries, and include relevant hex event bytes. .IP "-p" -By default, all SEL records are displayed. This option -causes only the Panic events with sensor_type = 0x20 (OS Critical Stop) -to be displayed. +Port to use. Defaults to RMCP port 623. .IP "-s N" Show only SEL events with severity N or greater. Severity 0=INF, 1=MIN, 2=MAJ, 3=CRT. The default is to show all SEL events. diff --git a/doc/isol.8 b/doc/isol.8 index 7048f64..d2e594c 100644 --- a/doc/isol.8 +++ b/doc/isol.8 @@ -55,6 +55,8 @@ Use a Trace log. The output_file is created and all SOL screen output is written to the file, including VT100 escape sequences. If the output_file exists, the output is appended to it. This can be used to log what the user has done in an SOL session. +.IP "-p" +Port to use. Defaults to RMCP port 623. .IP "-r" Use Raw terminal I/O instead of custom VT100 to ANSI translation (in Windows). Use this option if the server is configured in BIOS and BMC for ANSI and -- cgit v1.2.3