rpms/audit/FC-6 audit-1.4.2-auparse.patch, NONE, 1.1 audit.spec, 1.120, 1.121

[fedora-cvs-commits at redhat.com]

Author: sgrubb

Update of /cvs/dist/rpms/audit/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv1766

Modified Files:
	audit.spec 
Added Files:
	audit-1.4.2-auparse.patch 
Log Message:
* Wed Feb 21 2007 Steve Grubb <sgrubb at redhat.com> 1.4.2-2
- Fix hidden function in auparse library


audit-1.4.2-auparse.patch:
 auparse/internal.h    |    4 ++++
 auparse/private.h     |    1 +
 auparse/rlist.c       |    3 ++-
 auparse/test/Makefile |    2 +-
 src/auditctl.c        |    6 ++++--
 5 files changed, 12 insertions(+), 4 deletions(-)

--- NEW FILE audit-1.4.2-auparse.patch ---
diff -urp audit-1.4.2/auparse/internal.h audit-1.5/auparse/internal.h
--- audit-1.4.2/auparse/internal.h	2007-02-19 15:18:58.000000000 -0500
+++ audit-1.5/auparse/internal.h	2007-02-21 17:44:32.000000000 -0500
@@ -86,6 +86,10 @@ hidden_proto(audit_send_user_message)
 hidden_proto(load_config)
 hidden_proto(free_config)
 
+// rlist.c
+hidden_proto(aurule_next)
+
+
 #ifdef __cplusplus
 }
 #endif
diff -urp audit-1.4.2/auparse/private.h audit-1.5/auparse/private.h
--- audit-1.4.2/auparse/private.h	2007-02-04 14:22:45.000000000 -0500
+++ audit-1.5/auparse/private.h	2007-02-21 17:42:28.000000000 -0500
@@ -55,6 +55,7 @@ void auparse_msg(int priority, const cha
         ;
 #endif
 
+hidden_proto(audit_msg)
 
 #ifdef __cplusplus
 }
diff -urp audit-1.4.2/auparse/rlist.c audit-1.5/auparse/rlist.c
--- audit-1.4.2/auparse/rlist.c	2007-02-14 16:20:05.000000000 -0500
+++ audit-1.5/auparse/rlist.c	2007-02-21 17:27:12.000000000 -0500
@@ -24,6 +24,7 @@
 #include "config.h"
 #include <stdlib.h>
 #include "rlist.h"
+#include "internal.h"
 
 
 void aurule_create(aurule_list_t *l)
@@ -101,5 +102,5 @@ aurulenode *aurule_next(aurule_list_t *l
         	l->cur = l->cur->next;
         return l->cur;
 }
-hidden_def(aurule_list_next);
+hidden_def(aurule_next);
 
diff -urp audit-1.4.2/auparse/test/Makefile audit-1.5/auparse/test/Makefile
--- audit-1.4.2/auparse/test/Makefile	2007-01-29 18:35:44.000000000 -0500
+++ audit-1.5/auparse/test/Makefile	2007-02-21 17:21:58.000000000 -0500
@@ -4,7 +4,7 @@ LIBS=-lauparse -laudit
 
 all: auparse_test
 auparse_test: auparse_test.c
-	gcc $(CFLAGS) auparse_test.c -o auparse_test -static -L../.libs/ $(LIBS)
+	gcc $(CFLAGS) auparse_test.c -o auparse_test -L../.libs/ $(LIBS)
 
 check: auparse_test
 	./auparse_test 
diff -urp audit-1.4.2/src/auditctl.c audit-1.5/src/auditctl.c
--- audit-1.4.2/src/auditctl.c	2007-02-05 11:06:02.000000000 -0500
+++ audit-1.5/src/auditctl.c	2007-02-21 15:23:57.000000000 -0500
@@ -1168,8 +1168,10 @@ static int audit_print_reply(struct audi
 					printf(" (0x%x)", rep->rule->values[i]);
 			}
 			if (show_syscall &&
-				(rep->rule->flags & AUDIT_FILTER_MASK) != 
-						AUDIT_FILTER_USER) {
+				((rep->rule->flags & AUDIT_FILTER_MASK) != 
+						AUDIT_FILTER_USER) &&
+				((rep->rule->flags & AUDIT_FILTER_MASK) !=
+						AUDIT_FILTER_TASK)) {
 				printf(" syscall=");
 				for (sparse = 0, i = 0; 
 					i < (AUDIT_BITMASK_SIZE-1); i++) {


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-6/audit.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- audit.spec	21 Feb 2007 00:38:40 -0000	1.120
+++ audit.spec	21 Feb 2007 22:54:58 -0000	1.121
@@ -1,11 +1,12 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
+Patch1: audit-1.4.2-auparse.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -55,6 +56,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 autoreconf -fv --install
@@ -174,6 +176,9 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Wed Feb 21 2007 Steve Grubb <sgrubb at redhat.com> 1.4.2-2
+- Fix hidden function in auparse library
+
 * Tue Feb 20 2007 Steve Grubb <sgrubb at redhat.com> 1.4.2-1
 - Add man pages
 - Reduce text relocations in parser library