rpms/glibc-kernheaders/devel kernel-headers-2.6-libaudit.patch, NONE, 1.1 glibc-kernheaders.spec, 1.112, 1.113

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/glibc-kernheaders/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3910

Modified Files:
	glibc-kernheaders.spec 
Added Files:
	kernel-headers-2.6-libaudit.patch 
Log Message:
work around userspace libaudit.h

kernel-headers-2.6-libaudit.patch:
 audit.h |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE kernel-headers-2.6-libaudit.patch ---
--- usr/include/linux/audit.h	2006-04-27 00:47:28.000000000 +0100
+++ usr/include/linux/audit.h	2006-04-27 03:42:09.000000000 +0100
@@ -236,6 +236,7 @@
 	__u32		backlog;	/* messages waiting in queue */
 };
 
+#if 0 /* libaudit.h has this unconditionally */
 /* audit_rule_data supports filter rules with both integer and string
  * fields.  It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and
  * AUDIT_LIST_RULES requests.
@@ -251,6 +252,7 @@
 	__u32		buflen;	/* total length of string fields */
 	char		buf[0];	/* string fields buffer */
 };
+#endif
 
 /* audit_rule is supported to maintain backward compatibility with
  * userspace.  It supports integer fields only and corresponds to


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- glibc-kernheaders.spec	27 Apr 2006 02:05:40 -0000	1.112
+++ glibc-kernheaders.spec	27 Apr 2006 02:48:50 -0000	1.113
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -17,6 +17,7 @@
 %endif
 
 Source0: glibc-kernheaders.tar.bz2
+Patch1: kernel-headers-2.6-libaudit.patch
 
 %description
 Kernel-headers includes the C header files that specify the interface
@@ -25,11 +26,10 @@
 building most standard programs and are also needed for rebuilding the
 glibc package
 
-* Wed Apr 26 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-9
-
 
 %prep
 %setup -q -c
+%patch1 -p0
 
 %build
 
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-13
+- Work around libaudit.h defining audit_rule_data
+
 * Thu Apr 27 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-12
 - ... and remove the inclusion of <linux/config.h> from it.