From a43cf026e7b1c6600ce3bb47e20b1560f7cb4bcc Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@redhat.com>
Date: Tue, 14 Sep 2021 12:36:34 -0400
Subject: [PATCH] Drop IPX interpretation support

---
 audit-ipx.patch | 62 +++++++++++++++++++++++++++++++++++++++++++++++++
 audit.spec      | 11 ++++++++-
 2 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 audit-ipx.patch

diff --git a/audit-ipx.patch b/audit-ipx.patch
new file mode 100644
index 0000000..dfd7c94
--- /dev/null
+++ b/audit-ipx.patch
@@ -0,0 +1,62 @@
+From 6b09724c69d91668418ddb3af00da6db6755208c Mon Sep 17 00:00:00 2001
+From: Steve Grubb <sgrubb@redhat.com>
+Date: Thu, 2 Sep 2021 15:01:12 -0400
+Subject: [PATCH] Make IPX packet interpretation dependent on the ipx header
+ file existing
+
+---
+ ChangeLog           | 1 +
+ auparse/interpret.c | 8 ++++++--
+ configure.ac        | 6 ++++++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/auparse/interpret.c b/auparse/interpret.c
+index 63829aa0..6c316456 100644
+--- a/auparse/interpret.c
++++ b/auparse/interpret.c
+@@ -44,8 +44,10 @@
+ #include <linux/ax25.h>
+ #include <linux/atm.h>
+ #include <linux/x25.h>
+-#include <linux/if.h>   // FIXME: remove when ipx.h is fixed
+-#include <linux/ipx.h>
++#ifdef HAVE_IPX_HEADERS
++  #include <linux/if.h>   // FIXME: remove when ipx.h is fixed
++  #include <linux/ipx.h>
++#endif
+ #include <linux/capability.h>
+ #include <sys/personality.h>
+ #include <sys/prctl.h>
+@@ -1279,6 +1281,7 @@ static const char *print_sockaddr(const char *val)
+ 					      x->sax25_call.ax25_call[6]);
+                         }
+                         break;
++#ifdef HAVE_IPX_HEADERS
+                 case AF_IPX:
+                         {
+                                 const struct sockaddr_ipx *ip =
+@@ -1288,6 +1291,7 @@ static const char *print_sockaddr(const char *val)
+ 					str, ip->sipx_port, ip->sipx_network);
+                         }
+                         break;
++#endif
+                 case AF_ATMPVC:
+                         {
+                                 const struct sockaddr_atmpvc* at =
+diff --git a/configure.ac b/configure.ac
+index 8f541e4c..005eb0b5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -418,6 +418,12 @@ if test x"$LIBWRAP_LIBS" != "x"; then
+ 	AC_DEFINE_UNQUOTED(HAVE_LIBWRAP, [], Define if tcp_wrappers support is enabled )
+ fi
+ 
++# linux/ipx.h - deprecated in 2018
++AC_CHECK_HEADER(linux/ipx.h, ipx_headers=yes, ipx_headers=no)
++if test $ipx_headers = yes ; then
++	AC_DEFINE(HAVE_IPX_HEADERS,1,[IPX packet interpretation])
++fi
++
+ # See if we want to support lower capabilities for plugins
+ LIBCAP_NG_PATH
+ 
diff --git a/audit.spec b/audit.spec
index cbb9caf..1f9693a 100644
--- a/audit.spec
+++ b/audit.spec
@@ -2,11 +2,14 @@
 Summary: User space tools for kernel auditing
 Name: audit
 Version: 3.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
+# Remove the next 2 lines for audit-3.0.6
+Patch1: audit-ipx.patch
+BuildRequires: autoconf automake libtool
 
 BuildRequires: make gcc swig
 BuildRequires: openldap-devel
@@ -91,6 +94,9 @@ cp %{SOURCE1} .
 # Remove the ids code, its not ready
 sed -i 's/ ids / /' audisp/plugins/Makefile.in
 
+# Remove next line for audit-3.0.6
+autoreconf -fv --install
+
 %build
 %configure --with-python=no \
 	   --with-python3=yes \
@@ -245,6 +251,9 @@ fi
 %attr(750,root,root) %{_sbindir}/audispd-zos-remote
 
 %changelog
+* Tue Sep 14 2021 Steve Grubb <sgrubb@redhat.com> 3.0.5-2
+- Drop IPX interpretation support
+
 * Wed Aug 11 2021 Steve Grubb <sgrubb@redhat.com> 3.0.5-1
 - New upstream bugfix release