From c81b8a0babc7f81893d58085ff29e8dc4bb4627e Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Sat, 4 Nov 2023 11:25:06 -0400 Subject: [PATCH] Bug fixes pulled from upstrean --- audit-3.9-3-fix-arg.patch | 19 ------------------- audit.spec | 6 ++---- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 audit-3.9-3-fix-arg.patch diff --git a/audit-3.9-3-fix-arg.patch b/audit-3.9-3-fix-arg.patch deleted file mode 100644 index be67c37..0000000 --- a/audit-3.9-3-fix-arg.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 59c886a671c53741399fe9dea710c2bf1ae3d8f4 -Author: Steve Grubb -Date: Wed Nov 1 15:40:32 2023 -0400 - - use correct arg in audit_add_perm_syscalls - -diff --git a/lib/libaudit.c b/lib/libaudit.c -index 563cc2f..0a52285 100644 ---- a/lib/libaudit.c -+++ b/lib/libaudit.c -@@ -1522,7 +1522,7 @@ static int audit_add_perm_syscalls(int perm, struct audit_rule_data *rule) - _audit_syscalladded = 1; - break; - case -1: // Should never happen -- audit_msg(LOG_ERR, "Syscall name unknown: %s", syscall); -+ audit_msg(LOG_ERR, "Syscall name unknown: %s", syscalls); - break; - default: // Error reported - do nothing here - break; diff --git a/audit.spec b/audit.spec index e5ab485..83a8157 100644 --- a/audit.spec +++ b/audit.spec @@ -9,9 +9,8 @@ Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz Source1: https://www.gnu.org/licenses/lgpl-2.1.txt Patch1: audit-3.9-1-aureport.patch Patch2: audit-3.9-2-no-io_uring.patch -Patch3: audit-3.9-3-fix-arg.patch -Patch4: audit-3.9-4-fix-leak.patch -Patch5: audit-3.9-5-mk-static.patch +Patch3: audit-3.9-4-fix-leak.patch +Patch4: audit-3.9-5-mk-static.patch BuildRequires: make gcc BuildRequires: krb5-devel @@ -98,7 +97,6 @@ cp %{SOURCE1} . %patch 2 -p1 %patch 3 -p1 %patch 4 -p1 -%patch 5 -p1 # Remove the ids code, its not ready sed -i 's/ ids / /' audisp/plugins/Makefile.am