[PR PATCH] audit: update to 3.0

[paper42 <paper42@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1625 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages 0001-audit-update-to-3.0.patch
https://github.com/void-linux/void-packages/pull/28447

audit: update to 3.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

ping @CameronNemo 
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28447.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-audit-update-to-3.0.patch-28447.patch --]
[-- Type: text/x-diff, Size: 7609 bytes --]

From f785fab90c8516d7369fcfab2ca2dfcc5b310837 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 3 Feb 2021 20:30:36 +0100
Subject: [PATCH] audit: update to 3.0

---
 ...uparse-caused-by-corrected-event-ord.patch | 31 ------
 ...uparse-caused-by-corrected-event-ord.patch | 41 --------
 srcpkgs/audit/patches/musl.patch              | 97 -------------------
 srcpkgs/audit/template                        |  7 +-
 4 files changed, 4 insertions(+), 172 deletions(-)
 delete mode 100644 srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
 delete mode 100644 srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
 delete mode 100644 srcpkgs/audit/patches/musl.patch

diff --git a/srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch b/srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
deleted file mode 100644
index 0c2b320bb0a..00000000000
--- a/srcpkgs/audit/patches/0001-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c2544c220bb1b1045589ceae3dbb69f195b860e5 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Tue, 26 Mar 2019 09:18:00 -0400
-Subject: [PATCH 1/2] Fix memleak in auparse caused by corrected event ordering
-
----
- auparse/auparse.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git auparse/auparse.c auparse/auparse.c
-index 34aa90c..ecea88e 100644
---- auparse/auparse.c
-+++ auparse/auparse.c
-@@ -265,6 +265,14 @@ static event_list_t *au_get_ready_event(auparse_state_t *au, int is_test)
- 			au_lolnode *ptr = lowest;
- 			while (ptr->status == EBS_EMPTY && lol->maxi > 0) {
- 				lol->maxi--;
-+				if (ptr->l) {
-+					aup_list_clear(ptr->l);
-+					free(ptr->l);
-+					ptr->l = NULL;
-+					au->le = NULL;	// this should crash
-+							// usage of au->le
-+							// until reset
-+				}
- 				ptr = &lol->array[lol->maxi];
- 			}
- 		}
--- 
-2.24.0
-
diff --git a/srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch b/srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
deleted file mode 100644
index ed6a8991131..00000000000
--- a/srcpkgs/audit/patches/0002-Fix-memleak-in-auparse-caused-by-corrected-event-ord.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ce0debf94f93d787d3bed635952133b2a5ff3551 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Tue, 26 Mar 2019 17:24:37 -0400
-Subject: [PATCH 2/2] Fix memleak in auparse caused by corrected event ordering
- part 2
-
----
- auparse/auparse.c | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git auparse/auparse.c auparse/auparse.c
-index ecea88e..5318d25 100644
---- auparse/auparse.c
-+++ auparse/auparse.c
-@@ -259,23 +259,6 @@ static event_list_t *au_get_ready_event(auparse_state_t *au, int is_test)
- 	if (lowest && lowest->status == EBS_COMPLETE) {
- 		lowest->status = EBS_EMPTY;
- 		au->au_ready--;
--		// Try to consolidate the array so that we iterate
--		// over a smaller portion next time
--		if (lowest == &lol->array[lol->maxi]) {
--			au_lolnode *ptr = lowest;
--			while (ptr->status == EBS_EMPTY && lol->maxi > 0) {
--				lol->maxi--;
--				if (ptr->l) {
--					aup_list_clear(ptr->l);
--					free(ptr->l);
--					ptr->l = NULL;
--					au->le = NULL;	// this should crash
--							// usage of au->le
--							// until reset
--				}
--				ptr = &lol->array[lol->maxi];
--			}
--		}
- 		return lowest->l;
- 	}
- 
--- 
-2.24.0
-
diff --git a/srcpkgs/audit/patches/musl.patch b/srcpkgs/audit/patches/musl.patch
deleted file mode 100644
index ba5942a99f0..00000000000
--- a/srcpkgs/audit/patches/musl.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From d579a08bb1cde71f939c13ac6b2261052ae9f77e Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Tue, 26 Feb 2019 18:33:33 -0500
-Subject: [PATCH] Add substitue functions for strndupa & rawmemchr
-
-diff --git auparse/auparse.c auparse/auparse.c
-index 69127b7a..042ea2b0 100644
---- auparse/auparse.c
-+++ auparse/auparse.c
-@@ -1119,6 +1119,16 @@ static int str2event(char *s, au_event_t *e)
- 	return 0;
- }
- 
-+#ifndef HAVE_STRNDUPA
-+static inline char *strndupa(const char *old, size_t n)
-+{
-+	size_t len = strnlen(old, n);
-+	char *tmp = alloca(len + 1);
-+	tmp[len] = 0;
-+	return memcpy(tmp, old, len);
-+}
-+#endif
-+
- /* Returns 0 on success and 1 on error */
- static int extract_timestamp(const char *b, au_event_t *e)
- {
-diff --git auparse/interpret.c auparse/interpret.c
-index 88523c6d..f19ee854 100644
---- auparse/interpret.c
-+++ auparse/interpret.c
-@@ -855,6 +855,13 @@ static const char *print_escaped_ext(const idata *id)
- 		return print_escaped(id->val);
- }
- 
-+// rawmemchr is faster. Let's use it if we have it.
-+#ifdef HAVE_RAWMEMCHR
-+#define STRCHR rawmemchr
-+#else
-+#define STRCHR strchr
-+#endif
-+
- static const char *print_proctitle(const char *val)
- {
- 	char *out = (char *)print_escaped(val);
-@@ -865,7 +872,7 @@ static const char *print_proctitle(const char *val)
- 		// Proctitle has arguments separated by NUL bytes
- 		// We need to write over the NUL bytes with a space
- 		// so that we can see the arguments
--		while ((ptr  = rawmemchr(ptr, '\0'))) {
-+		while ((ptr  = STRCHR(ptr, '\0'))) {
- 			if (ptr >= end)
- 				break;
- 			*ptr = ' ';
-diff --git configure.ac configure.ac
-index acd6d615..00658d4f 100644
---- configure.ac
-+++ configure.ac
-@@ -72,6 +72,18 @@ dnl; posix_fallocate is used in audisp-remote
- AC_CHECK_FUNCS([posix_fallocate])
- dnl; signalfd is needed for libev
- AC_CHECK_FUNC([signalfd], [], [ AC_MSG_ERROR([The signalfd system call is necessary for auditd]) ])
-+dnl; check if rawmemchr is available
-+AC_CHECK_FUNCS([rawmemchr])
-+dnl; check if strndupa is available
-+AC_LINK_IFELSE(
-+  [AC_LANG_SOURCE(
-+    [[
-+      #define _GNU_SOURCE
-+      #include <string.h>
-+      int main() { (void) strndupa("test", 10); return 0; }]])],
-+ [AC_DEFINE(HAVE_STRNDUPA, 1, [Let us know if we have it or not])],
-+ []
-+)
- 
- ALLWARNS=""
- ALLDEBUG="-g"
-diff --git src/ausearch-lol.c src/ausearch-lol.c
-index bebbcf4b..0babd517 100644
---- src/ausearch-lol.c
-+++ src/ausearch-lol.c
-@@ -152,6 +152,16 @@ static int compare_event_time(event *e1, event *e2)
- 	return 0;
- }
- 
-+#ifndef HAVE_STRNDUPA
-+static inline char *strndupa(const char *old, size_t n)
-+{
-+	size_t len = strnlen(old, n);
-+	char *tmp = alloca(len + 1);
-+	tmp[len] = 0;
-+	return memcpy(tmp, old, len);
-+}
-+#endif
-+
- /*
-  * This function will look at the line and pick out pieces of it.
-  */
diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index 3294ac19927..9c900942dbb 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
 # Template file for 'audit'
 pkgname=audit
-version=2.8.5
-revision=5
+version=3.0
+revision=1
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
  --with-apparmor --with-libcap-ng --with-python3"
@@ -13,8 +13,9 @@ short_desc="Linux Security Auditing Framework"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://people.redhat.com/sgrubb/audit"
+changelog="https://raw.githubusercontent.com/linux-audit/audit-userspace/master/ChangeLog"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=0e5d4103646e00f8d1981e1cd2faea7a2ae28e854c31a803e907a383c5e2ecb7
+checksum=bd31826823b912b6fe271d2d979ed879e9fc393cab1e2f7c4e1af258231765b8
 
 CFLAGS="-fcommon"