Skip to content

Commit 5f1eaad

Browse files
committed
Deprecate AF_IPX interpretations
1 parent 4dbed28 commit 5f1eaad

File tree

5 files changed

+6
-26
lines changed

5 files changed

+6
-26
lines changed

ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
4.1.2
22
- Use runstatedir to guide the whole audit project to the run directory
33
- Deprecate the notion that plugins can be anything other than outbound
4+
- Drop IPX header handling and require kernel 5.15 or later
45

56
4.1.1
67
- Add libauplugin example program and improve its documentation

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Linux Audit System is designed to make Linux compliant with the requirements
66

77
* coreutils
88
* initscripts-service (Recommended - soft requirement)
9-
* kernel >= 5.0
9+
* kernel >= 5.15
1010
* systemd
1111

1212
NOTE: While this repository provides support for systemd to start the audit
@@ -17,7 +17,7 @@ an init script for OpenRC.
1717
## BUILD-TIME DEPENDENCIES (for tar file)
1818
* gcc (or clang)
1919
* make
20-
* kernel-headers >= 5.0
20+
* kernel-headers >= 5.15
2121
* systemd
2222

2323
## ADDITIONAL BUILD-TIME DEPENDENCIES (if using github sources)

audit.spec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Group: System Environment/Daemons
77
URL: https://github.com/linux-audit/audit-userspace/
88
Source0: https://github.com/linux-audit/audit-userspace/releases/tag/v%{version}.tar.gz
99
BuildRequires: make gcc
10-
BuildRequires: kernel-headers >= 5.0
10+
BuildRequires: kernel-headers >= 5.15
1111
BuildRequires: systemd
1212
BuildRequires: autoconf automake libtool
1313

@@ -36,7 +36,7 @@ applications to use the audit framework.
3636
Summary: Header files for libaudit
3737
License: LGPL-2.0-or-later
3838
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
39-
Requires: kernel-headers >= 5.0
39+
Requires: kernel-headers >= 5.15
4040

4141
%description libs-devel
4242
The audit-libs-devel package contains the header files needed for
@@ -45,7 +45,7 @@ developing applications that need to use the audit framework libraries.
4545
%package libs-static
4646
Summary: Static version of libaudit library
4747
License: LGPL-2.0-or-later
48-
Requires: kernel-headers >= 5.0
48+
Requires: kernel-headers >= 5.15
4949

5050
%description libs-static
5151
The audit-libs-static package contains the static libraries

auparse/interpret.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
#include <linux/ax25.h>
4545
#include <linux/atm.h>
4646
#include <linux/x25.h>
47-
#ifdef HAVE_IPX_HEADERS
48-
#include <linux/if.h> // FIXME: remove when ipx.h is fixed
49-
#include <linux/ipx.h>
50-
#endif
5147
#include <linux/capability.h>
5248
#include <sys/personality.h>
5349
#include <sys/prctl.h>
@@ -1371,17 +1367,6 @@ static const char *print_sockaddr(const char *val)
13711367
x->sax25_call.ax25_call[6]);
13721368
}
13731369
break;
1374-
#ifdef HAVE_IPX_HEADERS
1375-
case AF_IPX:
1376-
{
1377-
const struct sockaddr_ipx *ip =
1378-
(const struct sockaddr_ipx *)saddr;
1379-
rc = asprintf(&out,
1380-
"{ saddr_fam=%s lport=%d ipx-net=%u }",
1381-
str, ip->sipx_port, ip->sipx_network);
1382-
}
1383-
break;
1384-
#endif
13851370
case AF_ATMPVC:
13861371
{
13871372
const struct sockaddr_atmpvc* at =

configure.ac

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -415,12 +415,6 @@ if test x$use_io_uring != xno ; then
415415
fi
416416
AC_MSG_RESULT($use_io_uring)
417417

418-
# linux/ipx.h - deprecated in 2018
419-
AC_CHECK_HEADER(linux/ipx.h, ipx_headers=yes, ipx_headers=no)
420-
if test $ipx_headers = yes ; then
421-
AC_DEFINE(HAVE_IPX_HEADERS,1,[IPX packet interpretation])
422-
fi
423-
424418
# Determine firewall control utility
425419
AC_ARG_WITH([nftables],
426420
AS_HELP_STRING([--with-nftables],

0 commit comments

Comments
 (0)