diff --git a/.gitignore b/.gitignore index 63de530..27b8654 100644 --- a/.gitignore +++ b/.gitignore @@ -178,3 +178,4 @@ audit-2.0.4.tar.gz /audit-3.1.1.tar.gz /audit-3.1.2.tar.gz /audit-4.0.tar.gz +/audit-4.0.1.tar.gz diff --git a/audit-4.0-attributes.patch b/audit-4.0-attributes.patch deleted file mode 100644 index 6ef90f6..0000000 --- a/audit-4.0-attributes.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0db6e0960a5c55b468f21f9841bbc7e67832b66a Mon Sep 17 00:00:00 2001 -From: Steve Grubb -Date: Wed, 17 Jan 2024 12:07:25 -0500 -Subject: [PATCH] Update function attributes - ---- - auparse/auparse.h | 2 +- - lib/libaudit.h | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/auparse/auparse.h b/auparse/auparse.h -index c27f1ff96..0b3f68c35 100644 ---- a/auparse/auparse.h -+++ b/auparse/auparse.h -@@ -68,7 +68,7 @@ void auparse_add_callback(auparse_state_t *au, auparse_callback_ptr callback, - void *user_data, user_destroy user_destroy_func); - void auparse_set_escape_mode(auparse_state_t *au, auparse_esc_t mode); - int auparse_reset(auparse_state_t *au); --char *auparse_metrics(const auparse_state_t *au); -+char *auparse_metrics(const auparse_state_t *au) __attr_dealloc_free; - - /* Functions that are part of the search interface */ - int ausearch_add_expression(auparse_state_t *au, const char *expression, -diff --git a/lib/libaudit.h b/lib/libaudit.h -index 34b337a7c..15ea2e6f4 100644 ---- a/lib/libaudit.h -+++ b/lib/libaudit.h -@@ -248,12 +248,12 @@ int audit_set_enabled(int fd, uint32_t enabled) __wur; - int audit_set_failure(int fd, uint32_t failure) __wur; - int audit_set_rate_limit(int fd, uint32_t limit); - int audit_set_backlog_limit(int fd, uint32_t limit); --int audit_set_backlog_wait_time(int fd, uint32_t bwt); --int audit_reset_lost(int fd); --int audit_reset_backlog_wait_time_actual(int fd); -+int audit_set_backlog_wait_time(int fd, uint32_t bwt); -+int audit_reset_lost(int fd); -+int audit_reset_backlog_wait_time_actual(int fd); - int audit_set_feature(int fd, unsigned feature, unsigned value, -- unsigned lock); --int audit_set_loginuid_immutable(int fd); -+ unsigned lock) __wur; -+int audit_set_loginuid_immutable(int fd) __wur; - - /* AUDIT_LIST_RULES */ - int audit_request_rules_list_data(int fd); diff --git a/audit.spec b/audit.spec index 994074b..0392a14 100644 --- a/audit.spec +++ b/audit.spec @@ -1,13 +1,12 @@ Summary: User space tools for kernel auditing Name: audit -Version: 4.0 -Release: 8%{?dist} +Version: 4.0.1 +Release: 1%{?dist} License: GPL-2.0-or-later AND LGPL-2.0-or-later 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 -Patch1: audit-4.0-attributes.patch BuildRequires: make gcc BuildRequires: kernel-headers >= 5.0 BuildRequires: systemd @@ -96,7 +95,6 @@ The audit rules package contains the rules and utilities to load audit rules. %prep %setup -q -%patch 1 -p1 cp %{SOURCE1} . # Remove the ids code, its not ready @@ -291,6 +289,9 @@ fi %attr(750,root,root) %{_sbindir}/audispd-zos-remote %changelog +* Mon Mar 11 2024 Steve Grubb 4.0.1-1 +- New upstream release + * Sun Feb 04 2024 Timothée Ravier - 4.0-8 - Fix 'install' calls in post scriptlet diff --git a/sources b/sources index 1cff9b0..a380ec3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (audit-4.0.tar.gz) = 4ed5b216c75c655fd40a74b909d591922a66690bdf2cc5c69a23be3e9b10c8d341fd9b4f496f3ce2a8f99b7d86f0dda13e36387edd845b590ab767a82b4315cc +SHA512 (audit-4.0.1.tar.gz) = 7fbc426d0ddea340a36ceab52ac090e8e3dfb3450ebf50b478324a097f19ab4bb2cf78a2532644acb17e6114b59b8fda718affda9da62fb84181e3abf76039df