rpms/audit/F-8 audit-1.7.3-prelude.patch, 1.1, 1.2 audit.spec, 1.158, 1.159

[Steve Grubb (sgrubb)]

Author: sgrubb

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

Modified Files:
	audit-1.7.3-prelude.patch audit.spec 
Log Message:
* Fri Apr 18 2008 Steve Grubb <sgrubb at redhat.com> 1.7.2-2
- Apply patch3 this time


audit-1.7.3-prelude.patch:

Index: audit-1.7.3-prelude.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-8/audit-1.7.3-prelude.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audit-1.7.3-prelude.patch	17 Apr 2008 20:54:12 -0000	1.1
+++ audit-1.7.3-prelude.patch	18 Apr 2008 10:38:45 -0000	1.2
@@ -1,6 +1,6 @@
 diff -urp audit-1.7.2.orig/audisp/plugins/prelude/audisp-prelude.c audit-1.7.2/audisp/plugins/prelude/audisp-prelude.c
 --- audit-1.7.2.orig/audisp/plugins/prelude/audisp-prelude.c	2008-04-07 16:57:12.000000000 -0400
-+++ audit-1.7.2/audisp/plugins/prelude/audisp-prelude.c	2008-04-17 16:27:51.000000000 -0400
++++ audit-1.7.2/audisp/plugins/prelude/audisp-prelude.c	2008-04-18 06:27:00.000000000 -0400
 @@ -228,7 +228,8 @@ int main(int argc, char *argv[])
  		return -1;
  	}
@@ -23,11 +23,23 @@
  
  	/* Cleanup subsystems */
  	if (client) 
-@@ -1938,6 +1940,7 @@ static void handle_event(auparse_state_t
- 				break;
- 			case AUDIT_SYSCALL:
- 				handle_watched_syscalls(au, &idmef, &alert);
-+				goto_record_type(au, AUDIT_SYSCALL);
- 				break;
- 			default:
- 				break;
+diff -urp audit-1.7.2.orig/auparse/auparse.c audit-1.7.2/auparse/auparse.c
+--- audit-1.7.2.orig/auparse/auparse.c	2008-04-08 12:37:09.000000000 -0400
++++ audit-1.7.2/auparse/auparse.c	2008-04-17 18:13:30.000000000 -0400
+@@ -1130,6 +1130,7 @@ int auparse_first_record(auparse_state_t
+ 			return rc;
+ 	}
+ 	aup_list_first(&au->le);
++	aup_list_first_field(&au->le);
+ 	
+ 	return 1;
+ }
+@@ -1258,6 +1259,8 @@ const char *auparse_find_field_next(aupa
+ 			if (nvlist_find_name(&r->nv, au->find_field))
+ 				return nvlist_get_cur_val(&r->nv);
+ 			r = aup_list_next(&au->le);
++			if (r)
++				aup_list_first_field(&au->le);
+ 		}
+ 	}
+ 	return NULL;


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/F-8/audit.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- audit.spec	17 Apr 2008 20:54:12 -0000	1.158
+++ audit.spec	18 Apr 2008 10:38:45 -0000	1.159
@@ -1,5 +1,5 @@
 %define sca_version 0.4.6
-%define sca_release 1
+%define sca_release 2
 %define selinux_variants mls strict targeted
 %define selinux_policyver 3.0.8 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
@@ -7,7 +7,7 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -102,6 +102,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 mkdir zos-remote-policy
 cp -p audisp/plugins/zos-remote/policy/audispd-zos-remote.* zos-remote-policy
 
@@ -327,6 +328,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Fri Apr 18 2008 Steve Grubb <sgrubb at redhat.com> 1.7.2-2
+- Apply patch3 this time
+
 * Thu Apr 17 2008 Steve Grubb <sgrubb at redhat.com> 1.7.2-1
 - New upstream version
 - Update system-config-audit to version 0.4.6 (Miloslav Trmac)