rpms/audit/devel audit-1.2.1-header-abuse.patch, NONE, 1.1 audit-1.2.1-include.patch, NONE, 1.1 audit.spec, 1.88, 1.89

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	audit.spec 
Added Files:
	audit-1.2.1-header-abuse.patch audit-1.2.1-include.patch 
Log Message:
Update for kernel headers changes

audit-1.2.1-header-abuse.patch:
 lookup_table.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE audit-1.2.1-header-abuse.patch ---
--- audit-1.2.1/lib/lookup_table.c~	2006-04-07 18:46:34.000000000 +0100
+++ audit-1.2.1/lib/lookup_table.c	2006-04-28 16:38:01.000000000 +0100
@@ -29,9 +29,7 @@
 
 #include "libaudit.h"
 #include "private.h"
-#define __KERNEL__
 #include <sys/syscall.h>
-#undef __KERNEL__
 
 struct transtab {
     int   value;

audit-1.2.1-include.patch:
 libaudit.h |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE audit-1.2.1-include.patch ---
--- audit-1.2.1/lib/libaudit.h~	2006-04-10 19:50:29.000000000 +0100
+++ audit-1.2.1/lib/libaudit.h	2006-04-28 16:34:13.000000000 +0100
@@ -55,12 +55,6 @@ extern "C" {
  * 2500 - 2999 future user space (maybe integrity labels and related events)
  */
 
-#ifndef AUDIT_ADD_RULE
-#define AUDIT_ADD_RULE		1011    /* Add syscall filtering rule */
-#define AUDIT_DEL_RULE		1012    /* Delete syscall filtering rule */
-#define AUDIT_LIST_RULES	1013    /* List syscall filtering rules */
-#endif
-
 #define AUDIT_FIRST_USER_MSG    1100    /* First user space message */
 #define AUDIT_LAST_USER_MSG     1199    /* Last user space message */
 #define AUDIT_USER_AUTH         1100    /* User space authentication */
@@ -252,6 +246,11 @@ typedef enum {
  * fields. It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and
  * AUDIT_LIST_RULES requests.
  */
+#ifndef AUDIT_ADD_RULE
+#define AUDIT_ADD_RULE		1011    /* Add syscall filtering rule */
+#define AUDIT_DEL_RULE		1012    /* Delete syscall filtering rule */
+#define AUDIT_LIST_RULES	1013    /* List syscall filtering rules */
+
 struct audit_rule_data {
 	uint32_t	flags;  /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
 	uint32_t	action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
@@ -263,6 +262,7 @@ struct audit_rule_data {
 	uint32_t	buflen; /* total length of string fields */
 	char		buf[0]; /* string fields buffer */
 };
+#endif /* AUDIT_ADD_RULE */
 
 /* data structure for who signaled the audit daemon */
 struct audit_sig_info {


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- audit.spec	26 Apr 2006 16:17:04 -0000	1.88
+++ audit.spec	28 Apr 2006 15:39:53 -0000	1.89
@@ -7,6 +7,8 @@
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
 Patch1: audit-1.1.3-initscript-disabled.patch
+Patch2: audit-1.2.1-include.patch
+Patch3: audit-1.2-1-headerabuse.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
 BuildRequires: kernel-headers >= 2.4-9.1.95
@@ -34,7 +36,7 @@
 License: LGPL
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: glibc-kernheaders >= 2.4-9.1.95
+Requires: kernel-headers >= 2.6.16
 
 %description libs-devel
 The audit-libs-devel package contains the static libraries and header 
@@ -46,7 +48,7 @@
 License: LGPL
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: glibc-kernheaders >= 2.4-9.1.95
+Requires: kernel-headers >= 2.6.16
 
 %description libs-python
 The audit-libs-python package contains the bindings so that libaudit
@@ -56,6 +58,8 @@
 %setup -q
 # When in production, uncomment this so the patch is applied
 #%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf -fv --install
@@ -156,6 +160,8 @@
 %changelog
 * Wed Apr 25 2006 David Woodhouse <dwmw2 at redhat.com> 1.2.1-2
 - Require kernel-headers, not glibc-kernheaders
+- Fix redefinition of audit_rule_data with new kernel headers
+- Remove abuse of __KERNEL__ in lookup_table.c
 
 * Sun Apr 16 2006 Steve Grubb <sgrubb at redhat.com> 1.2.1-1
 - New message type for trusted apps