[ipmiutil/el6] updated to ipmiutil-2.9.4
arcress
arcress at fedoraproject.org
Thu Aug 28 20:11:05 UTC 2014
commit 185f0183047262226abd2289f08ae4cabcd2864c
Author: Andy Cress <arcress at users.sourceforge.net>
Date: Thu Aug 28 16:10:48 2014 -0400
updated to ipmiutil-2.9.4
.gitignore | 1 +
ipmiutil.spec | 259 ++++++++++++++++++++++++++++++---------------------------
sources | 2 +-
3 files changed, 139 insertions(+), 123 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a31d73..40eeb9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/ipmiutil-2.7.8.tar.gz
/ipmiutil-2.7.9.tar.gz
/ipmiutil-2.8.2.tar.gz
+/ipmiutil-2.9.4.tar.gz
diff --git a/ipmiutil.spec b/ipmiutil.spec
index dda084d..c786bfb 100644
--- a/ipmiutil.spec
+++ b/ipmiutil.spec
@@ -1,17 +1,26 @@
-Name: ipmiutil
-Version: 2.8.2
+# spec file for package ipmiutil
+#
+# Copyright (c) 2012 Andy Cress
+#
+Name: ipmiutil
+Version: 2.9.4
Release: 1%{?dist}
-Summary: Easy-to-use IPMI server management utilities
-License: BSD
-Group: System/Management
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-URL: http://ipmiutil.sourceforge.net
+Summary: Easy-to-use IPMI server management utilities
+License: BSD
+Group: System Environment/Base
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+URL: http://ipmiutil.sourceforge.net
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: openssl-devel gcc gcc-c++ libtool
+# Suggests: cron or vixie-cron or cronie or similar
%if 0%{?fedora} >= 15
Requires: systemd-units
%endif
-# Suggests: cron or vixie-cron or cronie or similar
+BuildRequires: openssl-devel gcc gcc-c++ libtool autoconf
+%if 0%{?fedora} == 16
+%define unit_dir /lib/systemd/system
+%else
+%define unit_dir %{_unitdir}
+%endif
%define systemd_fls %{_datadir}/%{name}
%define init_dir %{_initrddir}
@@ -28,9 +37,9 @@ or the Intel IPMI driver (/dev/imb), etc. If used locally and no driver is
detected, ipmiutil will use user-space direct I/Os instead.
%package devel
-Group: Development/Libraries
-Summary: The includes and static libraries from the ipmiutil package
-Requires: ipmiutil
+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
@@ -40,8 +49,11 @@ useful for building custom IPMI applications.
%setup -q
%build
+%if 0%{?fedora} >= 15
+autoconf
+%endif
%configure
-make
+make %{?_smp_mflags}
%install
rm -rf %{buildroot}
@@ -57,6 +69,7 @@ rm -rf %{buildroot}
%{_bindir}/ipmiutil
%{_bindir}/idiscover
%{_bindir}/ievents
+%{_sbindir}/iseltime
%{_sbindir}/ipmi_port
%{_sbindir}/ialarms
%{_sbindir}/iconfig
@@ -79,6 +92,7 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/ipmiutil_asy
%{_datadir}/%{name}/ipmiutil_wdt
%{_datadir}/%{name}/ipmi_port
+%{_datadir}/%{name}/ipmi_info
%{_datadir}/%{name}/checksel
%{systemd_fls}/ipmiutil_evt.service
%{systemd_fls}/ipmiutil_asy.service
@@ -89,6 +103,7 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/ipmiutil.setup
%{_datadir}/%{name}/ipmi_if.sh
%{_datadir}/%{name}/evt.sh
+%{_datadir}/%{name}/ipmi.init.basic
%{_datadir}/%{name}/bmclanpet.mib
%{_mandir}/man8/isel.8*
%{_mandir}/man8/isensor.8*
@@ -113,6 +128,7 @@ rm -rf %{buildroot}
%{_mandir}/man8/ihpm.8*
%{_mandir}/man8/isunoem.8*
%{_mandir}/man8/idelloem.8*
+%{_mandir}/man8/ismcoem.8*
%{_mandir}/man8/iekanalyzer.8*
%{_mandir}/man8/itsol.8*
%{_mandir}/man8/idcmi.8*
@@ -121,15 +137,19 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root)
-%{_datadir}/%{name}/ipmicmd.h
+# %{_datadir}/%{name} is used by both ipmiutil and ipmituil-devel
+%dir %{_datadir}/%{name}
%{_datadir}/%{name}/ipmi_sample.c
+%{_datadir}/%{name}/ipmi_sample_evt.c
+%{_datadir}/%{name}/isensor.c
+%{_datadir}/%{name}/ievents.c
+%{_datadir}/%{name}/isensor.h
+%{_datadir}/%{name}/ievents.h
%{_datadir}/%{name}/Makefile
+%{_includedir}/ipmicmd.h
%{_libdir}/libipmiutil.a
+%{_libdir}/libipmiutil.so
-%post devel
-/sbin/ldconfig
-
-%pre
%post
# POST_INSTALL, $1 = 1 if rpm -i, $1 = 2 if rpm -U
@@ -141,22 +161,22 @@ then
scr_dir=%{_datadir}/%{name}
if [ -x /bin/systemctl ]; then
- systemd_dir=%{_unitdir}
- echo "IINITDIR=%{init_dir}" >>%{_datadir}/%{name}/ipmiutil.env
- cp -f ${scr_dir}/ipmiutil_evt.service ${systemd_dir}
- cp -f ${scr_dir}/ipmiutil_asy.service ${systemd_dir}
- cp -f ${scr_dir}/ipmiutil_wdt.service ${systemd_dir}
- cp -f ${scr_dir}/ipmi_port.service ${systemd_dir}
- # systemctl enable ipmi_port.service >/dev/null 2>&1 || :
+ 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 || :
else
- cp -f ${scr_dir}/ipmiutil_wdt %{init_dir}
- cp -f ${scr_dir}/ipmiutil_asy %{init_dir}
- cp -f ${scr_dir}/ipmiutil_evt %{init_dir}
- cp -f ${scr_dir}/ipmi_port %{init_dir}
+ cp -f ${scr_dir}/ipmiutil_wdt %{init_dir}
+ cp -f ${scr_dir}/ipmiutil_asy %{init_dir}
+ cp -f ${scr_dir}/ipmiutil_evt %{init_dir}
+ cp -f ${scr_dir}/ipmi_port %{init_dir}
+ cp -f ${scr_dir}/ipmi_info %{init_dir}
fi
# Run some ipmiutil command to see if any IPMI interface works.
- %{_bindir}/ipmiutil sel -v >/dev/null 2>&1
+ %{_bindir}/ipmiutil sel -v >/dev/null 2>&1 || :
IPMIret=$?
# If IPMIret==0, the IPMI cmd was successful, and IPMI is enabled locally.
@@ -172,78 +192,132 @@ then
elif [ -x /sbin/chkconfig ]; then
/sbin/chkconfig --add ipmi_port
/sbin/chkconfig --add ipmiutil_wdt
- /sbin/chkconfig --add ipmiutil_asy
/sbin/chkconfig --add ipmiutil_evt
+ /sbin/chkconfig --add ipmi_info
fi
fi
# Capture a snapshot of IPMI sensor data once now for later reuse.
sensorout=$vardir/sensor_out.txt
if [ ! -f $sensorout ]; then
- %{_bindir}/ipmiutil sensor -q >$sensorout
+ %{_bindir}/ipmiutil sensor -q >$sensorout || :
+ if [ $? -ne 0 ]; then
+ # remove file if error, try again in ipmi_port on reboot.
+ rm -f $sensorout
+ fi
+ fi
+ fi
+else
+ # postinstall, doing rpm update
+ %{_bindir}/ipmiutil sel -v >/dev/null 2>&1 || :
+ if [ $? -eq 0 ]; then
+ if [ -d %{_sysconfdir}/cron.daily ]; then
+ cp -f %{_datadir}/%{name}/checksel %{_sysconfdir}/cron.daily
fi
fi
fi
+%if 0%{?fedora} >= 18
+%systemd_post ipmiutil_evt.service
+%systemd_post ipmiutil_asy.service
+%systemd_post ipmiutil_wdt.service
+%systemd_post ipmi_port.service
+%endif
%preun
# before uninstall, $1 = 1 if rpm -U, $1 = 0 if rpm -e
if [ "$1" = "0" ]
then
if [ -x /bin/systemctl ]; then
- systemd_dir=%{_unitdir}
- if [ -f ${systemd_dir}/ipmiutil_evt.service ]; 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 || :
- systemctl disable ipmiutil_wdt.service >/dev/null 2>&1 || :
- systemctl stop ipmiutil_evt.service >/dev/null 2>&1 || :
- 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 || :
- rm -f ${systemd_dir}/ipmiutil_evt.service
- rm -f ${systemd_dir}/ipmiutil_asy.service
- rm -f ${systemd_dir}/ipmiutil_wdt.service
- rm -f ${systemd_dir}/ipmi_port.service
+ if [ -f %{unit_dir}/ipmiutil_evt.service ]; then
+%if 0%{?fedora} >= 18
+%systemd_preun ipmiutil_evt.service
+%systemd_preun ipmiutil_asy.service
+%systemd_preun ipmiutil_wdt.service
+%systemd_preun ipmi_port.service
+%else
+ 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 || :
+ systemctl disable ipmiutil_wdt.service >/dev/null 2>&1 || :
+ systemctl stop ipmiutil_evt.service >/dev/null 2>&1 || :
+ 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 || :
+%endif
fi
else
if [ -x /sbin/service ]; then
- /sbin/service ipmi_port stop >/dev/null 2>&1
- /sbin/service ipmiutil_wdt stop >/dev/null 2>&1
- /sbin/service ipmiutil_asy stop >/dev/null 2>&1
- /sbin/service ipmiutil_evt stop >/dev/null 2>&1
+ /sbin/service ipmi_port stop >/dev/null 2>&1 || :
+ /sbin/service ipmiutil_wdt stop >/dev/null 2>&1 || :
+ /sbin/service ipmiutil_asy stop >/dev/null 2>&1 || :
+ /sbin/service ipmiutil_evt stop >/dev/null 2>&1 || :
fi
if [ -x /sbin/chkconfig ]; then
- /sbin/chkconfig --del ipmi_port >/dev/null 2>&1
- /sbin/chkconfig --del ipmiutil_wdt >/dev/null 2>&1
- /sbin/chkconfig --del ipmiutil_asy >/dev/null 2>&1
- /sbin/chkconfig --del ipmiutil_evt >/dev/null 2>&1
+ /sbin/chkconfig --del ipmi_port >/dev/null 2>&1 || :
+ /sbin/chkconfig --del ipmiutil_wdt >/dev/null 2>&1 || :
+ /sbin/chkconfig --del ipmiutil_asy >/dev/null 2>&1 || :
+ /sbin/chkconfig --del ipmiutil_evt >/dev/null 2>&1 || :
fi
- 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
if [ -f %{_sysconfdir}/cron.daily/checksel ]; then
- rm -f %{_sysconfdir}/cron.daily/checksel
+ rm -f %{_sysconfdir}/cron.daily/checksel
fi
fi
%postun
if [ -x /bin/systemctl ]; then
+%if 0%{?fedora} >= 18
+%systemd_postun_with_restart ipmi_port.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
fi
%changelog
+* Thu Aug 28 2014 Andrew Cress <arcress at users.sourceforge.net> 2.9.4-1
+- Updated to ipmiutil-2.9.4
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Apr 09 2013 Andrew Cress <arcress at users.sourceforge.net> 2.9.0-1
+ Merged with upstream ipmiutil-2.9.0, fix for Fedora bug #925593
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Aug 21 2012 Andrew Cress <arcress at users.sourceforge.net> 2.8.5-2
+ Added F18 systemd macros for RH bug #850163
+* Fri May 04 2012 Andrew Cress <arcress at users.sourceforge.net> 2.8.4-1
+ Fixups for devel rpm (RH bug #818910)
+* Tue Apr 24 2012 Andrew Cress <arcress at users.sourceforge.net> 2.8.3-1
+ Use service_* macros if req_systemd is set
* Thu Mar 08 2012 Andrew Cress <arcress at users.sourceforge.net> 2.8.2-1
-- reworked systemd logic/macros, moved ipmiutil from sbindir to bindir,
+ reworked systemd logic/macros, moved ipmiutil from sbindir to bindir
+* Mon Dec 12 2011 Andrew Cress <arcress at users.sourceforge.net> 2.8.0-1
added devel package files
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
* Fri Nov 11 2011 Andrew Cress <arcress at users.sourceforge.net> 2.7.9-3
fix RH bug #752319 to not copy checksel to cron.daily if IPMI not enabled
* Tue Sep 13 2011 Andrew Cress <arcress at users.sourceforge.net> 2.7.8-1
@@ -276,62 +350,3 @@ fi
moved all progs to sbin, install init/cron scripts via files not post
* Wed Dec 10 2008 Andrew Cress <arcress at users.sourceforge.net> 2.3.2-1
changes for Fedora with ipmiutil-2.3.2
-* Fri Jun 08 2007 Andrew Cress <arcress at users.sourceforge.net>
- rpmlint tweaks for ipmiutil-1.9.8
-* Mon May 21 2007 Andrew Cress <arcress at users.sourceforge.net>
- added isroot flag for chroot cases
-* Mon May 18 2007 Andrew Cress <arcress at users.sourceforge.net>
- added ipmi_port init handling
-* Mon Jul 10 2006 Andrew Cress <arcress at users.sourceforge.net>
- changed to libfreeipmi.so.2, include and run ipmi_if.sh
-* Tue Aug 02 2005 Andrew Cress <arcress at users.sourceforge.net>
- changed not to run pefconfig if already configured
-* Wed Feb 03 2005 Andrew Cress <arcress at users.sourceforge.net>
- changed /usr/man to /usr/share/man,
- fixed postun to recognize rpm -U via arg 1
-* Mon Nov 1 2004 Andrew Cress <arcress at users.sourceforge.net>
- added freeipmi install files and logic
-* Tue Aug 23 2004 Andrew Cress <arcress at users.sourceforge.net>
-- added MIB links to /usr/share/snmp/mibs
-* Tue Aug 10 2004 Andrew Cress <arcress at users.sourceforge.net>
-- added icmd utility to the rpm
-* Thu Aug 05 2004 Andrew Cress <arcress at users.sourceforge.net>
-- added special logic for SuSE snmpd.conf
-* Fri Apr 02 2004 Andrew Cress <arcress at users.sourceforge.net>
-- added checksel cron job
-* Tue Jan 28 2003 Andrew Cress <arcress at users.sourceforge.net>
-- added sensor & fruconfig for ipmiutil 1.2.8
-* Tue Aug 2 2002 Andrew Cress <arcress at users.sourceforge.net>
-- fixed bug 793 (dont need Require:ipmidrvr) for ipmiutil 1.2.2
-* Tue Jul 2 2002 Andrew Cress <arcress at users.sourceforge.net>
-- fixed bug 555 in showsel for ipmiutil 1.2.1
-* Fri May 10 2002 Andrew Cress <arcress at users.sourceforge.net>
-- fixed bug 504 in pefconfig for ipmiutil 1.1.5
-* Thu Apr 11 2002 Andrew Cress <arcress at users.sourceforge.net>
-- updated pathnames for ipmiutil 1.1.4, some cleanup
-* Mon Mar 18 2002 Andrew Cress <arcress at users.sourceforge.net>
-- updated for 1.1.3-2, added checking for grub vs. lilo to .spec
-* Tue Mar 12 2002 Andrew Cress <arcress at users.sourceforge.net>
-- updated for 1.1.3, added source rpm, changed license, etc.
-* Thu Jan 31 2002 Andrew Cress <arcress at users.sourceforge.net>
-- updated for 1.1.0-2, changed selpef to pefconfig
-* Thu Jan 25 2002 Andrew Cress <arcress at users.sourceforge.net>
-- updated for 1.1.0, changed to ipmidrvr rather than isc dependency
-* Thu Jan 16 2002 Andrew Cress <arcress at users.sourceforge.net>
-- updated for 1.1.0, added hwreset utility
-* Thu Dec 14 2001 Andrew Cress <arcress at users.sourceforge.net>
-- updated for 1.0.0, man page updates
-* Thu Nov 19 2001 Andrew Cress <arcress at users.sourceforge.net>
-- updated for 0.9.0, uses new OSS bmc_panic, so don't install module.
-* Thu Nov 13 2001 Andrew Cress <arcress at users.sourceforge.net>
-- updated for 0.8.5, add "Requires: isc" (#32), hide selpef output (#38)
-* Thu Nov 8 2001 Andrew Cress <arcress at users.sourceforge.net>
-- updated for 0.8.4, eliminate "file exists" messages by fixing removal
-* Thu Oct 25 2001 Andrew Cress <arcress at users.sourceforge.net>
-- updated for 0.8.2, run selpef (objdump:applypatch gives bogus warning)
-* Thu Oct 25 2001 Andrew Cress <arcress at users.sourceforge.net>
-- updated for 0.8.2, run selpef (objdump:applypatch gives bogus warning)
-* Wed Oct 24 2001 Andrew Cress <arcress at users.sourceforge.net>
-- created ipmiutil package 0.8.1 without kbuild
-* Tue Oct 23 2001 Andrew Cress <arcress at users.sourceforge.net>
-- created ipmiutil package 0.8.0
diff --git a/sources b/sources
index ef96e1d..f9e6a10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc8e5070b1fddca06c9e66d00da71934 ipmiutil-2.8.2.tar.gz
+9d6435e943d1597469994167a0c7f22c ipmiutil-2.9.4.tar.gz
More information about the scm-commits
mailing list