rpms/audit/devel audit-2.0.5-auparse-empty-FILE_ARRAY.patch, NONE, 1.1 audit-2.0.5-glibc.patch, NONE, 1.1 audit-2.0.5-i386-inode.patch, NONE, 1.1 audit.spec, 1.225, 1.226

[Steve Grubb]

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17881

Modified Files:
	audit.spec 
Added Files:
	audit-2.0.5-auparse-empty-FILE_ARRAY.patch 
	audit-2.0.5-glibc.patch audit-2.0.5-i386-inode.patch 
Log Message:
* Fri Jan 29 2010 Steve Grubb <sgrubb at redhat.com> 2.0.4-2
- Split out static libs (#556039)


audit-2.0.5-auparse-empty-FILE_ARRAY.patch:
 auparse.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE audit-2.0.5-auparse-empty-FILE_ARRAY.patch ---
diff -urp audit-2.0.5.orig/auparse/auparse.c audit-2.0.5/auparse/auparse.c
--- audit-2.0.5.orig/auparse/auparse.c	2009-12-09 09:49:10.000000000 -0500
+++ audit-2.0.5/auparse/auparse.c	2009-12-09 09:49:24.000000000 -0500
@@ -782,6 +782,10 @@ static int retrieve_next_line(auparse_st
 		case AUSOURCE_FILE_ARRAY:
 			// if the first time through, open file
 			if (au->list_idx == 0 && au->in == NULL) {
+				if (au->source_list[au->list_idx] == NULL) {
+					errno = 0;
+					return -2;
+				}
 				au->line_number = 0;
 				au->in = fopen(au->source_list[au->list_idx],
 									"r");

audit-2.0.5-glibc.patch:
 libaudit.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE audit-2.0.5-glibc.patch ---
diff -urp audit-2.0.5.orig/lib/libaudit.c audit-2.0.5/lib/libaudit.c
--- audit-2.0.5.orig/lib/libaudit.c	2009-12-09 09:49:10.000000000 -0500
+++ audit-2.0.5/lib/libaudit.c	2010-01-13 19:28:10.000000000 -0500
@@ -34,6 +34,7 @@
 #include <errno.h>
 #include <sys/poll.h>
 #include <sys/utsname.h>
+#include <sys/stat.h>
 #include <fcntl.h>	/* O_NOFOLLOW needs gnu defined */
 #include <limits.h>	/* for PATH_MAX */
 

audit-2.0.5-i386-inode.patch:
 libaudit.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE audit-2.0.5-i386-inode.patch ---
diff -urp audit-2.0.5.orig/lib/libaudit.c audit-2.0.5/lib/libaudit.c
--- audit-2.0.5.orig/lib/libaudit.c	2009-12-09 09:49:10.000000000 -0500
+++ audit-2.0.5/lib/libaudit.c	2010-01-13 14:28:52.000000000 -0500
@@ -1130,7 +1130,12 @@ int audit_rule_fieldpair_data(struct aud
 			if (!isdigit((char)*(v)))
 				return -21;
 
-			rule->values[rule->field_count] = strtol(v, NULL, 0);
+			if (field == AUDIT_INODE)
+				rule->values[rule->field_count] =
+					strtoul(v, NULL, 0);
+			else
+				rule->values[rule->field_count] =
+					strtol(v, NULL, 0);
 			break;
 	}
 	rule->field_count++;


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- audit.spec	29 Jan 2010 18:46:25 -0000	1.225
+++ audit.spec	29 Jan 2010 18:57:22 -0000	1.226
@@ -8,6 +8,9 @@ License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
+Patch1: audit-2.0.5-auparse-empty-FILE_ARRAY.patch
+Patch2: audit-2.0.5-i386-inode.patch
+Patch3: audit-2.0.5-glibc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: swig python-devel
 BuildRequires: tcp_wrappers-devel libcap-ng-devel 
@@ -80,6 +83,9 @@ behavior.
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no --with-libcap-ng=yes