aboutsummaryrefslogtreecommitdiffstats
path: root/main/audit
diff options
context:
space:
mode:
Diffstat (limited to 'main/audit')
-rw-r--r--main/audit/0002-auparse-remove-use-of-rawmemchr.patch34
-rw-r--r--main/audit/0005-fix-path-in-auditd-conf.patch19
-rw-r--r--main/audit/APKBUILD12
-rw-r--r--main/audit/fno-common-fix.patch23
4 files changed, 3 insertions, 85 deletions
diff --git a/main/audit/0002-auparse-remove-use-of-rawmemchr.patch b/main/audit/0002-auparse-remove-use-of-rawmemchr.patch
deleted file mode 100644
index 891a87bbc3..0000000000
--- a/main/audit/0002-auparse-remove-use-of-rawmemchr.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8f2a6788b78dd6b219545aacbd42e2f84df8c71a Mon Sep 17 00:00:00 2001
-From: Tycho Andersen <tycho@docker.com>
-Date: Mon, 13 Mar 2017 16:17:10 -0700
-Subject: [PATCH 2/4] auparse: remove use of rawmemchr
-
-just iterate over the string instead, it's much simpler and doesn't use a
-glibc extension.
-
-Signed-off-by: Tycho Andersen <tycho@docker.com>
----
- auparse/interpret.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/auparse/interpret.c b/auparse/interpret.c
-index ea17c41..75b7679 100644
---- a/auparse/interpret.c
-+++ b/auparse/interpret.c
-@@ -819,10 +819,9 @@ 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'))) {
-- if (ptr >= end)
-- break;
-- *ptr = ' ';
-+ while (ptr < end) {
-+ if (*ptr == '\0')
-+ *ptr = ' ';
- ptr++;
- }
- }
---
-2.13.1
-
diff --git a/main/audit/0005-fix-path-in-auditd-conf.patch b/main/audit/0005-fix-path-in-auditd-conf.patch
deleted file mode 100644
index 4214d39861..0000000000
--- a/main/audit/0005-fix-path-in-auditd-conf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Dermot Bradley <dermot_bradley@yahoo.com>
-Date: Fri, 29 May 2020 19:58:07 +0100
-
-Fix the path to the audispd binary.
-
-There is no point upstreaming this fix as the next release (3.0
-in development) no longer uses this configuration setting.
-
---- a/init.d/auditd.conf
-+++ b/init.d/auditd.conf
-@@ -13,7 +13,7 @@
- num_logs = 5
- priority_boost = 4
- disp_qos = lossy
--dispatcher = /sbin/audispd
-+dispatcher = /usr/sbin/audispd
- name_format = NONE
- ##name = mydomain
- max_log_file_action = ROTATE
diff --git a/main/audit/APKBUILD b/main/audit/APKBUILD
index b99bc5a5b4..bd9c723667 100644
--- a/main/audit/APKBUILD
+++ b/main/audit/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
# Maintainer: Tycho Andersen <tycho@docker.com>
pkgname=audit
-pkgver=2.8.5
-pkgrel=3
+pkgver=3.0.1
+pkgrel=1
pkgdesc="User space tools for 2.6 kernel auditing"
url="https://people.redhat.com/sgrubb/audit/"
arch="all"
@@ -12,11 +12,8 @@ makedepends="$depends_dev swig libcap-ng-dev python3"
install="$pkgname.pre-install"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc"
source="https://people.redhat.com/sgrubb/audit/audit-$pkgver.tar.gz
- fno-common-fix.patch
- 0002-auparse-remove-use-of-rawmemchr.patch
0003-all-get-rid-of-strndupa.patch
0004-fix-path-in-au-remote-conf.patch
- 0005-fix-path-in-auditd-conf.patch
auditd.initd
auditd.confd"
@@ -65,11 +62,8 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}
-sha512sums="7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a audit-2.8.5.tar.gz
-78e32c05b6896d37bacf0938954fbce7486a528dabd55421f1715438fe489171f9157059050abdcb3f673258aa28b4a11f643ddb7824f3499a195dbbe634f101 fno-common-fix.patch
-b7851d4c3c6d7d35f2e822273c17ab530ac24301c414da7f0c7578b7a182692ecd01b51cb50ea04adba4b43987f27020f8f411aec23b3bda0af4d4b6e9fbae5d 0002-auparse-remove-use-of-rawmemchr.patch
+sha512sums="ad2897c9f539681f0f65b08cd0e650c528957fd4799755c2bcc47f869e04272aad31684c46847124d7b42dde243a16ba2754936890189610814c7007c0381d8c audit-3.0.1.tar.gz
f3f2c4ee745e99877c981d889c5cbb0379d073a9b7634c1480ae603a21a13045f9978b51f8cb53c8d0ba414d249bb859af7bca7e302c464b3fc3c6463ecca762 0003-all-get-rid-of-strndupa.patch
6a0e1fb81d7defe6ad84da447a55e1e0b90299fcbd1ca679934a1dfa1a211986ea4642a1c69abe0619120b64b16546a41fa028f55f27c79819d896178aac6df7 0004-fix-path-in-au-remote-conf.patch
-f2ed684363df755360f5265257da3d0cbd41024b1112498beb9c6d76b8f538e7b5e4bcfe233c8d6cbb22ecac60eb1b20f91ae0ba93b3d9009af733021c4be61e 0005-fix-path-in-auditd-conf.patch
b3d7ceba02b6b4406222c3b142fcfdf2b612dc52eebc490cfd121d696e4ef7c6cc5e27813d67937c464ed4c3cd283de9ccfcb75e63405a447523fa4641e79da3 auditd.initd
69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7 auditd.confd"
diff --git a/main/audit/fno-common-fix.patch b/main/audit/fno-common-fix.patch
deleted file mode 100644
index b73ae271ff..0000000000
--- a/main/audit/fno-common-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 017e6c6ab95df55f34e339d2139def83e5dada1f Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Fri, 10 Jan 2020 21:13:50 -0500
-Subject: [PATCH] Header definitions need to be external when building with
- -fno-common (which is default in GCC 10) - Tony Jones
-
----
- src/ausearch-common.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ausearch-common.h b/src/ausearch-common.h
-index 6669203..3040547 100644
---- a/src/ausearch-common.h
-+++ b/src/ausearch-common.h
-@@ -50,7 +50,7 @@ extern pid_t event_pid;
- extern int event_exact_match;
- extern uid_t event_uid, event_euid, event_loginuid;
- extern const char *event_tuid, *event_teuid, *event_tauid;
--slist *event_node_list;
-+extern slist *event_node_list;
- extern const char *event_comm;
- extern const char *event_filename;
- extern const char *event_hostname;