From d602f4fb516292c297072bd924289eea37b45fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 15 Mar 2023 20:36:27 +0100 Subject: New upstream version 3.1.9 --- scripts/Makefile | 69 ++++++++++++++++++++++++++------------------------- scripts/Makefile.in | 5 ++-- scripts/ipmiutil_wdt | 14 +++++------ scripts/uninstall.vbs | 4 +-- 4 files changed, 47 insertions(+), 45 deletions(-) (limited to 'scripts') diff --git a/scripts/Makefile b/scripts/Makefile index 1fe1d5d..45f074c 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # scripts/Makefile. Generated from Makefile.in by configure. -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -85,8 +85,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-redhat-linux-gnu -host_triplet = x86_64-redhat-linux-gnu +build_triplet = x86_64-pc-linux-gnu +host_triplet = x86_64-pc-linux-gnu subdir = scripts ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -119,17 +119,17 @@ am__can_run_installinfo = \ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /root/rpmbuild/BUILD/ipmiutil-3.1.8/missing aclocal-1.16 +ACLOCAL = ${SHELL} /root/ipmiutil-3.1.9/missing aclocal-1.16 AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 1 AR = ar -AUTOCONF = ${SHELL} /root/rpmbuild/BUILD/ipmiutil-3.1.8/missing autoconf -AUTOHEADER = ${SHELL} /root/rpmbuild/BUILD/ipmiutil-3.1.8/missing autoheader -AUTOMAKE = ${SHELL} /root/rpmbuild/BUILD/ipmiutil-3.1.8/missing automake-1.16 +AUTOCONF = ${SHELL} /root/ipmiutil-3.1.9/missing autoconf +AUTOHEADER = ${SHELL} /root/ipmiutil-3.1.9/missing autoheader +AUTOMAKE = ${SHELL} /root/ipmiutil-3.1.9/missing automake-1.16 AWK = gawk CC = gcc -CCDEPMODE = depmode=none -CFLAGS = -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection +CCDEPMODE = depmode=gcc3 +CFLAGS = -g -O2 CPP = gcc -E CPPFLAGS = CROSS_CFLAGS = @@ -164,7 +164,7 @@ 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 = -Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld +LDFLAGS = LD_SAMX = ../lib/libipmi_lanplus.a -lcrypto LIBOBJS = LIBS = @@ -175,7 +175,7 @@ LIPO = LN_S = ln -s LTLIBOBJS = LT_SYS_LIBRARY_PATH = -MAKEINFO = ${SHELL} /root/rpmbuild/BUILD/ipmiutil-3.1.8/missing makeinfo +MAKEINFO = ${SHELL} /root/ipmiutil-3.1.9/missing makeinfo MANIFEST_TOOL = : MKDIR_P = /usr/bin/mkdir -p NM = /usr/bin/nm -B @@ -190,10 +190,10 @@ OTOOL64 = PACKAGE = ipmiutil PACKAGE_BUGREPORT = PACKAGE_NAME = ipmiutil -PACKAGE_STRING = ipmiutil 3.1.8 +PACKAGE_STRING = ipmiutil 3.1.9 PACKAGE_TARNAME = ipmiutil PACKAGE_URL = -PACKAGE_VERSION = 3.1.8 +PACKAGE_VERSION = 3.1.9 PATH_SEPARATOR = : PKG_DIR = /root/rpmbuild RANLIB = ranlib @@ -205,11 +205,11 @@ SHR_LINK = libipmiutil.so.1 STRIP = strip SUBDIR_S = scripts lib util doc SYSTEMD_DIR = /usr/share/ipmiutil -VERSION = 3.1.8 -abs_builddir = /root/rpmbuild/BUILD/ipmiutil-3.1.8/scripts -abs_srcdir = /root/rpmbuild/BUILD/ipmiutil-3.1.8/scripts -abs_top_builddir = /root/rpmbuild/BUILD/ipmiutil-3.1.8 -abs_top_srcdir = /root/rpmbuild/BUILD/ipmiutil-3.1.8 +VERSION = 3.1.9 +abs_builddir = /root/ipmiutil-3.1.9/scripts +abs_srcdir = /root/ipmiutil-3.1.9/scripts +abs_top_builddir = /root/ipmiutil-3.1.9 +abs_top_srcdir = /root/ipmiutil-3.1.9 ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -218,29 +218,29 @@ am__leading_dot = . am__quote = am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - -bindir = /usr/bin -build = x86_64-redhat-linux-gnu -build_alias = x86_64-redhat-linux-gnu +bindir = ${exec_prefix}/bin +build = x86_64-pc-linux-gnu +build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = redhat +build_vendor = pc builddir = . datadir = ${prefix}/share datarootdir = ${prefix}/share docdir = ${prefix}/share/doc/ipmiutil-${version} dvidir = ${docdir} -exec_prefix = /usr -host = x86_64-redhat-linux-gnu -host_alias = x86_64-redhat-linux-gnu +exec_prefix = ${prefix} +host = x86_64-pc-linux-gnu +host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = redhat +host_vendor = pc htmldir = ${docdir} -includedir = /usr/include -infodir = /usr/share/info -install_sh = ${SHELL} /root/rpmbuild/BUILD/ipmiutil-3.1.8/install-sh -libdir = /usr/lib64 -libexecdir = /usr/libexec +includedir = ${prefix}/include +infodir = ${datarootdir}/info +install_sh = ${SHELL} /root/ipmiutil-3.1.9/install-sh +libdir = ${exec_prefix}/lib64 +libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale localstatedir = /var mandir = ${prefix}/share/man @@ -249,10 +249,11 @@ oldincludedir = /usr/include pdfdir = ${docdir} pkgconfigdir = ${libdir}/pkgconfig prefix = /usr -program_transform_name = s&^&& +program_transform_name = s,x,x, psdir = ${docdir} +runstatedir = ${localstatedir}/run sbindir = ${prefix}/sbin -sharedstatedir = /var/lib +sharedstatedir = /var srcdir = . sysconfdir = /etc target_alias = diff --git a/scripts/Makefile.in b/scripts/Makefile.in index b5aac39..e586150 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -251,6 +251,7 @@ pkgconfigdir = @pkgconfigdir@ prefix = /usr program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = ${prefix}/sbin sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/scripts/ipmiutil_wdt b/scripts/ipmiutil_wdt index d253ec3..eecbf54 100644 --- a/scripts/ipmiutil_wdt +++ b/scripts/ipmiutil_wdt @@ -22,14 +22,14 @@ # name=ipmiutil_wdt -prog="/usr/bin/ipmiutil wdt" +progn="/usr/bin/ipmiutil wdt" wdtcron=/etc/cron.d/wdt LOCKFILE=/var/lock/subsys/$name wdtlog=/var/log/$name wdtsec=150 # default 150 seconds for watchdog timeout (2*60 + 30) start() { - echo -n "Starting $prog: " + echo -n "Starting $progn: " echo # do not start if in driverless mode ipmiutil cmd -k |grep "driverless" >/dev/null 2>&1 @@ -44,12 +44,12 @@ start() { RETVAL=1 else # configure the watchdog for a 150 second timeout - $prog -e -t $wdtsec >$wdtlog + $progn -e -t $wdtsec >$wdtlog RETVAL=$? if [ $RETVAL -eq 0 ]; then # restart the watchdog every 60 seconds via /etc/cron.d cat - <<%%% >$wdtcron -* * * * * root $prog -r >/dev/null +* * * * * root $progn -r >/dev/null %%% # make crond re-read the /etc/cron.d $restart_cron >>$wdtlog @@ -61,10 +61,10 @@ start() { } stop() { - echo -n "Stopping $prog: " + echo -n "Stopping $progn: " echo # first disable the watchdog - $prog -d >>$wdtlog + $progn -d >>$wdtlog RETVAL=$? # now remove the wdt cron job rm -f $wdtcron @@ -81,7 +81,7 @@ restart() { } get_status() { - $prog + $progn if [ -f ${LOCKFILE} ]; then if [ -f $wdtcron ]; then echo "$name is running..." diff --git a/scripts/uninstall.vbs b/scripts/uninstall.vbs index b392a46..ea02045 100644 --- a/scripts/uninstall.vbs +++ b/scripts/uninstall.vbs @@ -39,7 +39,7 @@ EnvPath = sh.RegRead(key3) ' wscript.echo "EnvPath= " & EnvPath ' Calculates strStartAt which cuts the strSearchFor value from the path -' strSearchFor = ";C:\program files\intel\ipmirastools" +' strSearchFor = ";C:\program files\sourceforge\ipmiutil" strSearchFor = ";" & InstallLoc newPath = EnvPath iStartAt = "0" @@ -54,7 +54,7 @@ If (strStartAt > "0") then strTotalLen=len(newPath) newPathLeft=left(newPath,iStartAt) newPathRight=right(newPath, (strTotalLen-strSearchForLen-iStartAt)) - newPath=newPathLeft + newPathRight + newPath=newPathLeft + ";" + newPathRight end if ' wscript.echo "newPath= " & newPath -- cgit v1.2.3