Update to freeipmi-0.7.16

Remove unnecessary patches

.cvsignore

@@ -1 +1 @@
-freeipmi-0.7.14.tar.gz
+freeipmi-0.7.16.tar.gz

freeipmi-0.4.6-daemon.patch

@@ -1,9 +0,0 @@
-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

@@ -1,24 +0,0 @@
-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

@@ -1,47 +0,0 @@
-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$
- #
--# 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=$?

freeipmi-0.5.1-regex.patch

@@ -1,13 +0,0 @@
-diff -up freeipmi-0.7.5/ipmipower/src/wrappers.c.regex freeipmi-0.7.5/ipmipower/src/wrappers.c
---- freeipmi-0.7.5/ipmipower/src/wrappers.c.regex	2008-08-12 20:14:42.000000000 +0200
-+++ freeipmi-0.7.5/ipmipower/src/wrappers.c	2009-02-24 15:55:47.000000000 +0100
-@@ -74,6 +74,9 @@
- #include <sys/poll.h>
- #include <limits.h>
- 
-+#include <sys/types.h>
-+#include <regex.h>
-+
- #include "wrappers.h"
- 
- #include "freeipmi-portability.h"

freeipmi-0.6.4-argmax.patch

@@ -1,16 +0,0 @@
-diff -up freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h.argmax freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h
---- freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h.argmax	2008-03-28 01:14:49.000000000 +0100
-+++ freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h	2008-07-29 14:00:21.000000000 +0200
-@@ -23,6 +23,12 @@
- extern "C" {
- #endif
- 
-+/* GLIBC >= 2.8 have ARG_MAX replaced by _SC_ARG_MAX. As we need it in an
-+ * array we need to hardwire it with the Posix.1 minimum of 4096 :/ */ 
-+#ifndef ARG_MAX
-+#define ARG_MAX 4096
-+#endif
-+
- #include <freeipmi/api/ipmi-api.h>
- #include <freeipmi/api/ipmi-chassis-cmds-api.h>
- #include <freeipmi/api/ipmi-device-global-cmds-api.h>

freeipmi.spec

@@ -5,16 +5,14 @@
 Release: 1%{?dist}
 
 Name: freeipmi
-Version: 0.7.14
+Version: 0.7.16
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
 Source: ftp://ftp.gluster.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.gz
-Patch1: freeipmi-0.5.1-regex.patch
+Patch1: freeipmi-0.6.4-silent.patch
-Patch2: freeipmi-0.6.4-silent.patch
+Patch2: freeipmi-0.6.4-pathsep.patch
-Patch3: freeipmi-0.6.4-argmax.patch
+Patch3: freeipmi-0.7.12-lsb.patch
-Patch4: freeipmi-0.6.4-pathsep.patch
-Patch5: freeipmi-0.7.12-lsb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel texinfo
 Requires(pre): chkconfig
@@ -65,11 +63,9 @@ Provides a tool and a daemon for IPMI node detection.
 
 %prep
 %setup -q
-%patch1 -p1 -b .regex
+%patch1 -p1 -b .silent
-%patch2 -p1 -b .silent
+%patch2 -p1 -b .pathsep
-%patch3 -p1 -b .argmax
+%patch3 -p1 -b .lsb
-%patch4 -p1 -b .pathsep
-%patch5 -p1 -b .lsb
 
 %build
 export CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS"
@@ -293,6 +289,9 @@ fi
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Tue Dec  1 2009 Jan Safranek <jsafrane@redhat.com> - 0.7.16-1
+- Update to freeipmi-0.7.16
+
 * Mon Oct 26 2009 Jan Safranek <jsafrane@redhat.com> - 0.7.14-1
 - Update to freeipmi-0.7.14
 

sources

@@ -1 +1 @@
-591496e9906a876408983c6e47abfe1f  freeipmi-0.7.14.tar.gz
+8c4349ac302951d6cb2c896f28c6d7b9  freeipmi-0.7.16.tar.gz