rpms/readahead/F-7 readahead-1.4.1-auparse.patch, NONE, 1.1 readahead-1.4.1-warning.patch, NONE, 1.1 readahead.spec, 1.38, 1.39

[Karel Zak (kzak)]

Author: kzak

Update of /cvs/pkgs/rpms/readahead/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19130

Modified Files:
	readahead.spec 
Added Files:
	readahead-1.4.1-auparse.patch readahead-1.4.1-warning.patch 
Log Message:
* Mon Oct  8 2007 Karel Zak <kzak at redhat.com> -1:1.4.1-3
- fix readahead-collector (auparse problem)
- fix gcc warning


readahead-1.4.1-auparse.patch:

--- NEW FILE readahead-1.4.1-auparse.patch ---
diff -up readahead-1.4.1/src/readahead-collector.c.auparse readahead-1.4.1/src/readahead-collector.c
--- readahead-1.4.1/src/readahead-collector.c.auparse	2007-04-12 14:47:30.000000000 +0200
+++ readahead-1.4.1/src/readahead-collector.c	2007-10-08 09:43:34.000000000 +0200
@@ -790,7 +790,7 @@ debug("block_add_event");
 		return -1;
 
 	hdrlen = strlen(hdr);
-	len = hdrlen + rep->len + 1;
+	len = hdrlen + rep->len + 2;
 
 	if (len > MEMBLK_SIZE)
 		return  -1;
@@ -811,6 +811,8 @@ debug("block_add_event");
 	memcpy(blk->pos, rep->message, rep->len);
 	blk->pos += rep->len;
 
+	*blk->pos = '\n';
+	blk->pos++;
 	*blk->pos = '\0';
 
 	if (space > len)
@@ -1007,6 +1009,8 @@ parse_events(RacStatus *rac, char **ary,
 	if (rac->execign)
 		ignlen = strlen(rac->execign);
 
+	debug("parsing buffers: start (events: %d)", rac->nevents);
+
 	do {
 		/* audit uses quotation marks in auparse_find_field() result */
 		char path[PATH_MAX+3];
@@ -1073,17 +1077,22 @@ parse_events(RacStatus *rac, char **ary,
 			if (stat(buff, &st) == -1 || S_ISREG(st.st_mode) == 0)
 				continue;
 
+			debug("parsing buffers: add file: %s\n", buff);
 			all[nfiles++] = strdup(buff);
 
 			/*
 			 * Lookup for separator between early / later lists
 			 */
 			if (rac->listsep && *sep == 0 &&
-					strcmp(buff, rac->listsep) == 0)
+					strcmp(buff, rac->listsep) == 0) {
+				debug("parsing buffers: separator detected: %s\n", buff);
 				*sep = nfiles;
+			}
 		}
 	} while (auparse_next_event(au) > 0);
 
+	debug("parsing buffers: done");
+
 	auparse_destroy(au);
 
 	all[nfiles] = NULL;

readahead-1.4.1-warning.patch:

--- NEW FILE readahead-1.4.1-warning.patch ---
diff -up readahead-1.4.1/src/readahead.c.warning readahead-1.4.1/src/readahead.c
--- readahead-1.4.1/src/readahead.c.warning	2007-10-08 09:41:14.000000000 +0200
+++ readahead-1.4.1/src/readahead.c	2007-10-08 09:42:28.000000000 +0200
@@ -24,8 +24,11 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <unistd.h>
+#define _GNU_SOURCE
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 #include <errno.h>
 #include <time.h>


Index: readahead.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readahead/F-7/readahead.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- readahead.spec	20 Apr 2007 19:02:46 -0000	1.38
+++ readahead.spec	8 Oct 2007 19:06:31 -0000	1.39
@@ -1,14 +1,13 @@
 Summary:        Read a preset list of files into memory
 Name:           readahead
 Version:        1.4.1
-Release: 2%{?dist}
+Release:	3%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPL
 Source0:        readahead-%{version}.tar.bz2
 Source1:        default.early
 Source2:        default.later
-Patch0: readahead-1.4.1-quiet.patch
 URL:            https://hosted.fedoraproject.org/projects/readahead
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,6 +19,10 @@
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  audit-libs-devel
 
+Patch0: 	readahead-1.4.1-quiet.patch
+Patch1:		readahead-1.4.1-auparse.patch
+Patch2:		readahead-1.4.1-warning.patch
+
 %description
 readahead reads the contents of a list of files into memory,
 which causes them to be read from cache when they are actually
@@ -28,6 +31,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
 cp -f -t ./lists/ %{SOURCE1}
 cp -f -t ./lists/ %{SOURCE2}
 
@@ -73,6 +79,10 @@
 exit 0
 
 %changelog
+* Mon Oct  8 2007 Karel Zak <kzak at redhat.com> -1:1.4.1-3
+- fix readahead-collector (auparse problem)
+- fix gcc warning
+
 * Fri Apr 20 2007 Jeremy Katz <katzj at redhat.com> - 1:1.4.1-2
 - don't be so noisy (#237302)