From f04abfa49a0f7efb05ecb0dca9bd77d626bd3c81 Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@redhat.com>
Date: Tue, 29 Mar 2022 17:38:46 -0400
Subject: [PATCH] New upstream bugfix release

---
 audit-3.0.8-flex-array-workaround.patch | 17 +++++++++--------
 audit.spec                              |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/audit-3.0.8-flex-array-workaround.patch b/audit-3.0.8-flex-array-workaround.patch
index cb643a8..3f22d37 100644
--- a/audit-3.0.8-flex-array-workaround.patch
+++ b/audit-3.0.8-flex-array-workaround.patch
@@ -1,6 +1,6 @@
 diff -urp audit-3.0.8.orig/bindings/swig/src/auditswig.i audit-3.0.8/bindings/swig/src/auditswig.i
---- audit-3.0.8.orig/bindings/swig/src/auditswig.i	2021-08-21 10:15:51.000000000 -0400
-+++ audit-3.0.8/bindings/swig/src/auditswig.i	2022-02-23 14:19:18.389777267 -0500
+--- audit-3.0.8.orig/bindings/swig/src/auditswig.i	2022-03-29 16:52:34.000000000 -0400
++++ audit-3.0.8/bindings/swig/src/auditswig.i	2022-03-29 17:31:15.810268855 -0400
 @@ -39,7 +39,7 @@ signed
  #define __attribute(X) /*nothing*/
  typedef unsigned __u32;
@@ -11,8 +11,8 @@ diff -urp audit-3.0.8.orig/bindings/swig/src/auditswig.i audit-3.0.8/bindings/sw
  %include <stdint.i>
  %include "../lib/libaudit.h"
 diff -urp audit-3.0.8.orig/lib/audit.h audit-3.0.8/lib/audit.h
---- audit-3.0.8.orig/lib/audit.h	2022-02-23 13:35:24.915815547 -0500
-+++ audit-3.0.8/lib/audit.h	2022-02-23 13:34:46.356475888 -0500
+--- audit-3.0.8.orig/lib/audit.h	2022-03-29 17:29:30.358211892 -0400
++++ audit-3.0.8/lib/audit.h	2022-03-29 17:31:15.811268833 -0400
 @@ -514,7 +514,7 @@ struct audit_rule_data {
  	__u32		values[AUDIT_MAX_FIELDS];
  	__u32		fieldflags[AUDIT_MAX_FIELDS];
@@ -23,9 +23,9 @@ diff -urp audit-3.0.8.orig/lib/audit.h audit-3.0.8/lib/audit.h
  
  #endif /* _LINUX_AUDIT_H_ */
 diff -urp audit-3.0.8.orig/lib/libaudit.h audit-3.0.8/lib/libaudit.h
---- audit-3.0.8.orig/lib/libaudit.h	2022-02-14 14:14:08.000000000 -0500
-+++ audit-3.0.8/lib/libaudit.h	2022-02-23 13:35:52.638340789 -0500
-@@ -39,7 +39,7 @@ extern "C" {
+--- audit-3.0.8.orig/lib/libaudit.h	2022-03-29 16:52:34.000000000 -0400
++++ audit-3.0.8/lib/libaudit.h	2022-03-29 17:31:15.812268812 -0400
+@@ -27,7 +27,7 @@
  #include <stdint.h>
  #include <sys/socket.h>
  #include <linux/netlink.h>
@@ -33,4 +33,5 @@ diff -urp audit-3.0.8.orig/lib/libaudit.h audit-3.0.8/lib/libaudit.h
 +#include "audit.h"
  #include <stdarg.h>
  #include <syslog.h>
- 
+ #ifndef __attr_access
+Only in audit-3.0.8/lib: libaudit.h.orig
diff --git a/audit.spec b/audit.spec
index 7c9964c..2eefa4c 100644
--- a/audit.spec
+++ b/audit.spec
@@ -90,7 +90,6 @@ Management Facility) database, through an IBM Tivoli Directory Server
 
 %prep
 %setup -q
-autoreconf -fv --install
 cp %{SOURCE1} .
 cp /usr/include/linux/audit.h lib/
 %patch1 -p1
@@ -132,6 +131,7 @@ touch -r ./audit.spec $RPM_BUILD_ROOT/usr/share/man/man5/libaudit.conf.5.gz
 cur=`pwd`
 cd $RPM_BUILD_ROOT
 patch -p0 < %{PATCH2}
+find . -name '*.orig' -delete
 cd $cur
 
 %check