From bb170b347c0eae62cce9a05c00f343e61099399e Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Wed, 29 Jan 2020 13:55:06 -0500 Subject: [PATCH] Fix multiple definition of `event_node_list' (#1794446) --- audit-3.0-no-common.patch | 22 ++++++++++++++++++++++ audit.spec | 5 ++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 audit-3.0-no-common.patch diff --git a/audit-3.0-no-common.patch b/audit-3.0-no-common.patch new file mode 100644 index 0000000..626c965 --- /dev/null +++ b/audit-3.0-no-common.patch @@ -0,0 +1,22 @@ +From 3c9672de4743e34c33c2ebb6d9b46aefcec5fb44 Mon Sep 17 00:00:00 2001 +From: Steve Grubb +Date: Thu, 23 Jan 2020 17:27:20 -0500 +Subject: [PATCH] fix compiler warning + +--- + audisp/plugins/syslog/audisp-syslog.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/audisp/plugins/syslog/audisp-syslog.c b/audisp/plugins/syslog/audisp-syslog.c +index 9daa021..d4fc565 100644 +--- a/audisp/plugins/syslog/audisp-syslog.c ++++ b/audisp/plugins/syslog/audisp-syslog.c +@@ -207,7 +207,7 @@ static inline void write_syslog(char *s) + } + } + +-int main(int argc, char *argv[]) ++int main(int argc, const char *argv[]) + { + char tmp[MAX_AUDIT_MESSAGE_LENGTH+1]; + struct sigaction sa; diff --git a/audit.spec b/audit.spec index 48cf2f9..653d5ec 100644 --- a/audit.spec +++ b/audit.spec @@ -2,7 +2,7 @@ Summary: User space tools for kernel auditing Name: audit Version: 3.0 -Release: 0.17.20191104git1c2f876%{?dist} +Release: 0.18.20191104git1c2f876%{?dist} License: GPLv2+ URL: http://people.redhat.com/sgrubb/audit/ Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}-alpha9.tar.gz @@ -246,6 +246,9 @@ fi %attr(750,root,root) /sbin/audispd-zos-remote %changelog +* Wed Jan 29 2020 Steve Grubb 3.0-0.18.20191104git1c2f876 +- Fix multiple definition of `event_node_list' (#1794446) + * Tue Jan 28 2020 Fedora Release Engineering - 3.0-0.17.20191104git1c2f876 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild