rpms/freeipmi/F-8 freeipmi-0.4.6-daemon.patch, NONE, 1.1 freeipmi-0.4.6-open.patch, NONE, 1.1 freeipmi-0.4.6-rpmlint.patch, NONE, 1.1 freeipmi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Phil Knirsch (pknirsch) fedora-extras-commits at redhat.com
Wed Nov 7 15:28:58 UTC 2007


Author: pknirsch

Update of /cvs/pkgs/rpms/freeipmi/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25014/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	freeipmi-0.4.6-daemon.patch freeipmi-0.4.6-open.patch 
	freeipmi-0.4.6-rpmlint.patch freeipmi.spec 
Log Message:
- Initial import of FreeIPMI for F-8.


freeipmi-0.4.6-daemon.patch:

--- NEW FILE freeipmi-0.4.6-daemon.patch ---
diff -up freeipmi-0.4.6/bmc-watchdog/freeipmi-bmc-watchdog.sysconfig.daemon freeipmi-0.4.6/bmc-watchdog/freeipmi-bmc-watchdog.sysconfig
--- freeipmi-0.4.6/bmc-watchdog/freeipmi-bmc-watchdog.sysconfig.daemon	2007-11-06 17:53:16.000000000 +0100
+++ freeipmi-0.4.6/bmc-watchdog/freeipmi-bmc-watchdog.sysconfig	2007-11-06 17:53:26.000000000 +0100
@@ -41,4 +41,4 @@
 #
 # For the remaining options, consult man bmc-watchdog
 #
-OPTIONS="-u 4 -p 0 -a 1 -F -P -L -S -O -i 900 -e 60"
+OPTIONS="-d -u 4 -p 0 -a 1 -F -P -L -S -O -i 900 -e 60"

freeipmi-0.4.6-open.patch:

--- NEW FILE freeipmi-0.4.6-open.patch ---
diff -up freeipmi-0.4.6/bmc-config/src/bmc-config-argp.c.open freeipmi-0.4.6/bmc-config/src/bmc-config-argp.c
--- freeipmi-0.4.6/bmc-config/src/bmc-config-argp.c.open	2007-11-06 17:00:11.000000000 +0100
+++ freeipmi-0.4.6/bmc-config/src/bmc-config-argp.c	2007-11-06 17:01:34.000000000 +0100
@@ -323,7 +323,7 @@ bmc_config_args_validate (struct bmc_con
           else 
             {
               int fd;
-              fd = open (args->filename, O_CREAT);
+              fd = open (args->filename, O_CREAT, 0644);
               if (fd == -1) 
                 {
                   perror (args->filename);
diff -up freeipmi-0.4.6/pef-config/src/pef-config-argp.c.open freeipmi-0.4.6/pef-config/src/pef-config-argp.c
--- freeipmi-0.4.6/pef-config/src/pef-config-argp.c.open	2007-11-06 17:07:29.000000000 +0100
+++ freeipmi-0.4.6/pef-config/src/pef-config-argp.c	2007-11-06 17:07:43.000000000 +0100
@@ -225,7 +225,7 @@ pef_config_args_validate (struct pef_con
           else
             {
               int fd;
-              fd = open (args->filename, O_CREAT);
+              fd = open (args->filename, O_CREAT, 0644);
               if (fd == -1)
                 {
                   perror (args->filename);

freeipmi-0.4.6-rpmlint.patch:

--- NEW FILE freeipmi-0.4.6-rpmlint.patch ---
diff -up freeipmi-0.4.6/ipmidetect/freeipmi-ipmidetectd.init.rpmlint freeipmi-0.4.6/ipmidetect/freeipmi-ipmidetectd.init
--- freeipmi-0.4.6/ipmidetect/freeipmi-ipmidetectd.init.rpmlint	2007-03-02 01:56:26.000000000 +0100
+++ freeipmi-0.4.6/ipmidetect/freeipmi-ipmidetectd.init	2007-11-06 16:11:46.000000000 +0100
@@ -1,16 +1,16 @@
 #!/bin/sh
 # $Id: freeipmi-ipmidetectd.init,v 1.1 2007/03/02 00:56:26 chu11 Exp $
 #
-# chkconfig: 2345 70 40
+# chkconfig: - 70 40
 # description: ipmidetectd startup script
 #
 ### BEGIN INIT INFO
 # Provides: ipmidetectd
 # Required-Start: $network $remote_fs $syslog
 # Required-Stop:  $network $remote_fs $syslog
-# Default-Start:  3 5
 # Default-Stop:   0 1 2 6
-# Description:    Start ipmidetectd-
+# Short-Description: Start and stop ipmidetectd
+# Description: IPMI node detection monitoring daemon
 ### END INIT INFO
 
 IPMIDETECTD=/usr/sbin/ipmidetectd
@@ -24,20 +24,20 @@ if [ -f /etc/rc.d/init.d/functions ] ; t
         daemon $IPMIDETECTD
         RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ipmidetectd
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/freeipmi-ipmidetectd
     }
     Xstop() {
         killproc ipmidetectd -TERM
         RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ipmidetectd
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/freeipmi-ipmidetectd
     }
     Xstatus() {
         status ipmidetectd
 	RETVAL=$?
     }
     Xcondrestart() {
-        if test -e /var/lock/subsys/ipmidetectd; then
+        if test -e /var/lock/subsys/freeipmi-ipmidetectd; then
 	    $0 stop
 	    $0 start
    	    RETVAL=$?


--- NEW FILE freeipmi.spec ---
#
# Copyright (c) 2003 FreeIPMI Core Team
#

%define name freeipmi
%define version 0.4.6
%if %{?_with_debug:1}%{!?_with_debug:0}
%define release 3.debug%{?dist}
%else
%define release 3%{?dist}
%endif

Name: %{name}
Version: %{version}
Release: %{release}
License: GPLv2+
Group: Applications/System
URL: http://www.gnu.org/software/freeipmi/
Source: ftp://ftp.zresearch.com/pub/freeipmi/0.4.6/%{name}-%{version}.tar.gz
Patch0: freeipmi-0.4.6-rpmlint.patch
Patch1: freeipmi-0.4.6-open.patch
Patch2: freeipmi-0.4.6-daemon.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgcrypt-devel
Requires(post): info
Requires(preun): info
# Necessary as only those archs implement iopl and friends (#368541)
ExclusiveArch: %{ix86} x86_64 ia64 alpha
Summary: FreeIPMI
%description
The FreeIPMI project provides "Remote-Console" (out-of-band) and
"System Management Software" (in-band) based on Intelligent
Platform Management Interface specification.

%package devel
Summary: Development package for FreeIPMI
Group: Development/System
Requires: freeipmi = %{version}-%{release}
%description devel
Development package for FreeIPMI.  This package includes the FreeIPMI
header files and static libraries.

%package bmc-watchdog
Summary: FreeIPMI BMC watchdog
Group: Applications/System
Requires: freeipmi = %{version}-%{release}
Requires(post): chkconfig
Requires(preun): chkconfig
Requires: logrotate
%description bmc-watchdog
Provides a watchdog daemon for OS monitoring and recovery.

%package ipmimonitoring
Summary: Ipmimonitoring library
Group: Applications/System
Requires: freeipmi = %{version}-%{release}
%description ipmimonitoring
Provides library for IPMI host monitoring.

%package ipmidetectd
Summary: IPMI node detection monitoring daemon
Group: Applications/System
Requires: freeipmi = %{version}-%{release}
Requires(post): chkconfig
Requires(preun): chkconfig
%description ipmidetectd
Provides a tool and a daemon for IPMI node detection.

%if %{?_with_debug:1}%{!?_with_debug:0}
  %define _enable_debug --enable-debug --enable-trace --enable-syslog
%endif

%prep
%setup -q
%patch0 -p1 -b .rpmlint
%patch1 -p1 -b .open
%patch2 -p1 -b .daemon

%build
%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
           %{?_enable_debug} --disable-static
CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
DESTDIR="$RPM_BUILD_ROOT" make install
# fix coherance problems with associated script filenames
mkdir -p $RPM_BUILD_ROOT/%{_initrddir}/
# if check needed for SLES systems
if [[ "%{_sysconfdir}/init.d" != "%{_initrddir}" ]]
then
mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/freeipmi-bmc-watchdog $RPM_BUILD_ROOT/%{_initrddir}/freeipmi-bmc-watchdog
mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/freeipmi-ipmidetectd $RPM_BUILD_ROOT/%{_initrddir}/freeipmi-ipmidetectd
fi
rm -f %{buildroot}%{_infodir}/dir
# kludge to get around rpmlint complaining about 0 length semephore file
echo freeipmi > %{buildroot}%{_localstatedir}/lib/freeipmi/ipckey
# Remove .la files
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ -x /sbin/install-info ]; then
   #/sbin/install-info %{_infodir}/freeipmi.info.gz %{_infodir}/dir
   /sbin/install-info %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir
fi
/sbin/ldconfig

%preun
if [ $1 = 0 ]; then
   if [ -x /sbin/install-info ]; then
      #/sbin/install-info --delete %{_infodir}/freeipmi.info.gz %{_infodir}/dir
      /sbin/install-info --delete %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir
   fi
fi

%postun -p /sbin/ldconfig

%post bmc-watchdog
if [ "$1" = 1 ]; then
   if [ -x %{_initrddir}/freeipmi-bmc-watchdog ]; then
      /sbin/chkconfig --add freeipmi-bmc-watchdog
      /sbin/chkconfig freeipmi-bmc-watchdog off
   fi
fi
if [ $1 -ge 1 ]; then
   if [ -x %{_initrddir}/freeipmi-bmc-watchdog ]; then
      if %{_initrddir}/freeipmi-bmc-watchdog status | grep -q running; then
         %{_initrddir}/freeipmi-bmc-watchdog restart
      else
         %{_initrddir}/freeipmi-bmc-watchdog condrestart
      fi
   fi
fi

%preun bmc-watchdog
#
# Stop bmc-watchdog if it is running 
#
if [ "$1" = 0 ]; then
    if [ -x %{_initrddir}/freeipmi-bmc-watchdog ]; then
       if %{_initrddir}/freeipmi-bmc-watchdog status | grep -q running; then
          %{_initrddir}/freeipmi-bmc-watchdog stop
       fi
       /sbin/chkconfig --del freeipmi-bmc-watchdog
    fi
fi

%post ipmimonitoring -p /sbin/ldconfig

%postun ipmimonitoring -p /sbin/ldconfig

%post ipmidetectd
if [ "$1" = 1 ]; then
   if [ -x %{_initrddir}/freeipmi-ipmidetectd ]; then
      /sbin/chkconfig --add freeipmi-ipmidetectd
      /sbin/chkconfig freeipmi-ipmidetectd off
   fi
fi
if [ $1 -ge 1 ]; then
   if [ -x %{_initrddir}/freeipmi-ipmidetectd ]; then
      if %{_initrddir}/freeipmi-ipmidetectd status | grep -q running; then
         %{_initrddir}/freeipmi-ipmidetectd restart
      else
         %{_initrddir}/freeipmi-ipmidetectd condrestart
      fi
   fi
fi

%preun ipmidetectd
#
# Stop ipmidetectd if it is running 
#
if [ "$1" = 0 ]; then
    if [ -x %{_initrddir}/freeipmi-ipmidetectd ]; then
       if %{_initrddir}/freeipmi-ipmidetectd status | grep -q running; then
          %{_initrddir}/freeipmi-ipmidetectd stop
       fi
       /sbin/chkconfig --del freeipmi-ipmidetectd
    fi
fi

%files
%defattr(-,root,root)
%doc %{_datadir}/doc/%{name}/AUTHORS
%doc %{_datadir}/doc/%{name}/COPYING
%doc %{_datadir}/doc/%{name}/ChangeLog
%doc %{_datadir}/doc/%{name}/ChangeLog.0
%doc %{_datadir}/doc/%{name}/INSTALL
%doc %{_datadir}/doc/%{name}/NEWS
%doc %{_datadir}/doc/%{name}/README
%doc %{_datadir}/doc/%{name}/TODO
%doc %{_infodir}/*
%doc %{_datadir}/doc/%{name}/COPYING.ipmiping
%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiping
%doc %{_datadir}/doc/%{name}/COPYING.ipmipower
%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmipower
%doc %{_datadir}/doc/%{name}/COPYING.rmcpping
%doc %{_datadir}/doc/%{name}/DISCLAIMER.rmcpping
%doc %{_datadir}/doc/%{name}/COPYING.ipmiconsole
%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiconsole
%doc %{_datadir}/doc/%{name}/COPYING.pstdout
%doc %{_datadir}/doc/%{name}/DISCLAIMER.pstdout
%doc %{_datadir}/doc/%{name}/COPYING.ipmidetect
%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmidetect
%doc %{_datadir}/doc/%{name}/COPYING.ipmi-fru
%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmi-fru
%doc %{_datadir}/doc/%{name}/COPYING.ZRESEARCH
%doc %{_datadir}/doc/%{name}/freeipmi-coding.txt
%doc %{_datadir}/doc/%{name}/freeipmi-hostrange.txt
%doc %{_datadir}/doc/%{name}/freeipmi-libraries.txt
%dir %{_datadir}/doc/%{name}
%{_libdir}/libipmiconsole*so.*
%{_libdir}/libfreeipmi*so.*
%{_libdir}/libipmidetect*so.*
%{_localstatedir}/lib/*
%{_sbindir}/bmc-autoconfig
%{_sbindir}/bmc-config
%{_sbindir}/bmc-info
%{_sbindir}/ipmi-fru
%{_sbindir}/ipmi-locate
%{_sbindir}/pef-config
%{_sbindir}/ipmi-raw
%{_sbindir}/ipmi-sel
%{_sbindir}/ipmi-sensors
%{_sbindir}/ipmiping
%{_sbindir}/ipmipower
%{_sbindir}/rmcpping
%{_sbindir}/ipmiconsole
%{_sbindir}/ipmi-chassis
%{_sbindir}/ipmidetect
%{_mandir}/man8/bmc-autoconfig.8*
%{_mandir}/man8/bmc-config.8*
%{_mandir}/man5/bmc-config.conf.5*
%{_mandir}/man8/bmc-info.8*
%{_mandir}/man8/ipmi-fru.8*
%{_mandir}/man8/ipmi-locate.8*
%{_mandir}/man8/pef-config.8*
%{_mandir}/man8/ipmi-raw.8*
%{_mandir}/man8/ipmi-sel.8*
%{_mandir}/man8/ipmi-sensors.8*
%{_mandir}/man8/ipmiping.8*
%{_mandir}/man8/ipmipower.8*
%{_mandir}/man5/ipmipower.conf.5*
%{_mandir}/man8/rmcpping.8*
%{_mandir}/man8/ipmiconsole.8*
%{_mandir}/man5/ipmiconsole.conf.5*
%{_mandir}/man8/ipmi-chassis.8*
%{_mandir}/man3/libipmidetect.3*
%{_mandir}/man8/ipmidetect.8*
%{_mandir}/man5/ipmidetect.conf.5*

%files devel
%defattr(-,root,root)
%{_libdir}/libipmiconsole.so
%{_libdir}/libfreeipmi.so
%{_libdir}/libipmidetect.so
%{_libdir}/libipmimonitoring.so
%dir %{_includedir}/freeipmi
%dir %{_includedir}/freeipmi/udm
%{_includedir}/ipmiconsole.h
%{_includedir}/ipmidetect.h
%{_includedir}/ipmi_monitoring.h
%{_includedir}/freeipmi/*.h
%{_includedir}/freeipmi/udm/*.h
%{_mandir}/man3/*

%files bmc-watchdog
%defattr(-,root,root)
%doc %{_datadir}/doc/%{name}/COPYING.bmc-watchdog
%doc %{_datadir}/doc/%{name}/DISCLAIMER.bmc-watchdog
%{_initrddir}/freeipmi-bmc-watchdog
%config(noreplace) %{_sysconfdir}/sysconfig/freeipmi-bmc-watchdog
%config(noreplace) %{_sysconfdir}/logrotate.d/freeipmi-bmc-watchdog
%{_sbindir}/bmc-watchdog
%{_mandir}/man8/bmc-watchdog.8*
%dir %{_localstatedir}/log/freeipmi

%files ipmimonitoring
%defattr(-,root,root)
%doc %{_datadir}/doc/%{name}/COPYING.ipmimonitoring
%doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmimonitoring
%attr(0444,root,root) %config(noreplace) %{_sysconfdir}/ipmi_monitoring_sensors.conf
%{_libdir}/libipmimonitoring.so.*
%{_sbindir}/ipmimonitoring
%{_mandir}/man8/ipmimonitoring.8*
%dir %{_localstatedir}/cache/ipmimonitoringsdrcache

%files ipmidetectd
%defattr(-,root,root)
%{_initrddir}/freeipmi-ipmidetectd
%{_sbindir}/ipmidetectd
%{_mandir}/man5/ipmidetectd.conf.5*
%{_mandir}/man8/ipmidetectd.8*

%changelog
* Wed Nov 07 2007 Phil Knirsch <pknirsch at redhat.com> 0.4.6-3.fc7
- More fixes for Fedora Review:
 o Added ExclusiveArch due to missing lopl (#368541)

* Tue Nov 06 2007 Phil Knirsch <pknirsch at redhat.com> 0.4.6-2.fc7
- Several fixes due to Fedora package review:
 o Fixed Group for all subpackages
 o Added missng Requires(Post|Preun) for several packages
 o Removed static libraries and .la files
 o Fixed open bug (missing mode for O_CREATE)
 o Fixed incorrect options for bmc-watchdog daemon

* Mon Nov 05 2007 Phil Knirsch <pknirsch at redhat.com> 0.4.6-1.fc7
- Specfile cleanup for Fedora inclusion
- Fixed several rpmlint warnings and errors:
 o Moved all devel libs to proper package

* Wed Aug 01 2007 Troy Telford <ttelford at lnxi.com> 0.4.0
- Some package cleanup so it builds on SLES

* Wed Jun 13 2007 Phil Knirsch <pknirsch at redhat.com> 0.4.beta0-1
- Some package cleanup and split of configuration and initscript

* Fri Feb 28 2007 Albert Chu <chu11 at llnl.gov> 0.4.beta0-1
- Add ipmidetectd subpackage.

* Fri Feb 16 2007 Albert Chu <chu11 at llnl.gov> 0.4.beta0-1
- Add ipmimonitoring subpackage.

* Sun Jul 30 2006 Albert Chu <chu11 at llnl.gov> 0.3.beta0-1
- Re-architect for 0.3.X

* Mon May 15 2006 Albert Chu <chu11 at llnl.gov> 0.3.beta0-1
- Fixed up spec file to pass rpmlint


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Nov 2007 14:53:36 -0000	1.1
+++ .cvsignore	7 Nov 2007 15:28:26 -0000	1.2
@@ -0,0 +1 @@
+freeipmi-0.4.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freeipmi/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Nov 2007 14:53:36 -0000	1.1
+++ sources	7 Nov 2007 15:28:26 -0000	1.2
@@ -0,0 +1 @@
+cf7f0ea413b833e77775501dfd97d4c5  freeipmi-0.4.6.tar.gz




More information about the fedora-extras-commits mailing list