packages: watchdog/watchdog.spec, watchdog/watchdog_5.6-6.diff (NEW) - rel ...

[arekm]

Author: arekm                        Date: Tue Aug 25 13:53:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; fixes from debian added

---- Files affected:
packages/watchdog:
   watchdog.spec (1.43 -> 1.44) , watchdog_5.6-6.diff (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/watchdog/watchdog.spec
diff -u packages/watchdog/watchdog.spec:1.43 packages/watchdog/watchdog.spec:1.44
--- packages/watchdog/watchdog.spec:1.43	Sun Jun 28 15:44:52 2009
+++ packages/watchdog/watchdog.spec	Tue Aug 25 15:53:05 2009
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Programowy strażnik
 Name:		watchdog
 Version:	5.6
-Release:	2
+Release:	3
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://ftp.debian.org/debian/pool/main/w/watchdog/%{name}_%{version}.orig.tar.gz
@@ -19,6 +19,7 @@
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-foreground.patch
 Patch1:		%{name}-config.patch
+Patch2:		%{name}_5.6-6.diff
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -42,6 +43,7 @@
 %setup -q
 #%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -88,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2009/08/25 13:53:05  arekm
+- rel 3; fixes from debian added
+
 Revision 1.43  2009/06/28 13:44:52  arekm
 - rel 2; preload ipmi_si/ipmi_devintf when using ipmi_watchdog
 

================================================================
Index: packages/watchdog/watchdog_5.6-6.diff
diff -u /dev/null packages/watchdog/watchdog_5.6-6.diff:1.1
--- /dev/null	Tue Aug 25 15:53:10 2009
+++ packages/watchdog/watchdog_5.6-6.diff	Tue Aug 25 15:53:05 2009
@@ -0,0 +1,48 @@
+--- watchdog-5.6.orig/src/wd_keepalive.c
++++ watchdog-5.6/src/wd_keepalive.c
+@@ -138,9 +138,10 @@
+     }
+ 
+     while ( !feof(wc) ) {
+-        char line[CONFIG_LINE_LEN];
++	char *line = NULL;
++	size_t n;
+ 
+-        if ( fgets(line, CONFIG_LINE_LEN, wc) == NULL ) {
++	if (getline(&line, &n, wc) == -1) {
+             if ( !ferror(wc) )
+                 break;
+             else {
+--- watchdog-5.6.orig/src/watchdog.c
++++ watchdog-5.6/src/watchdog.c
+@@ -25,6 +25,7 @@
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/ioctl.h>
+ #include <linux/watchdog.h>
+ #define __USE_GNU
+ #include <string.h>
+@@ -253,9 +254,10 @@
+     }
+ 
+     while (!feof(wc)) {
+-	char line[CONFIG_LINE_LEN];
++	char *line = NULL;
++	size_t n;
+ 
+-	if (fgets(line, CONFIG_LINE_LEN, wc) == NULL) {
++	if (getline(&line, &n, wc) == -1) {
+ 	    if (!ferror(wc))
+ 		break;
+ 	    else {
+@@ -690,7 +692,7 @@
+ 	       driver default) */
+ 	    if (ioctl(watchdog, WDIOC_SETTIMEOUT, &devtimeout) < 0) {
+ #if USE_SYSLOG
+-            	syslog(LOG_ERR, "cannot set timeout %s (errno = %d = '%m')", strerror(errno), devtimeout, errno);
++                syslog(LOG_ERR, "cannot set timeout %d (errno = %d = '%m')", devtimeout, errno);
+ #else				
+             	perror(progname);
+ #endif			   
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/watchdog/watchdog.spec?r1=1.43&r2=1.44&f=u