From 84b361ea0bc517db2095405e6e9100cfdefc6fb9 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 16 Dec 2020 21:46:20 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/audit.git#3f24e88012fee6d6cb2915287fc535c997a0db4e --- .gitignore | 1 + audit-3.0-no-common.patch | 23 ----------------------- audit.spec | 9 +++++---- sources | 2 +- 4 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 audit-3.0-no-common.patch diff --git a/.gitignore b/.gitignore index 53305a3..1779c3d 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,4 @@ audit-2.0.4.tar.gz /audit-3.0-alpha7.tar.gz /audit-3.0-alpha8.tar.gz /audit-3.0-alpha9.tar.gz +/audit-3.0.tar.gz diff --git a/audit-3.0-no-common.patch b/audit-3.0-no-common.patch deleted file mode 100644 index b73ae27..0000000 --- a/audit-3.0-no-common.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 017e6c6ab95df55f34e339d2139def83e5dada1f Mon Sep 17 00:00:00 2001 -From: Steve Grubb -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; diff --git a/audit.spec b/audit.spec index da75ea2..fe5f508 100644 --- a/audit.spec +++ b/audit.spec @@ -2,12 +2,11 @@ Summary: User space tools for kernel auditing Name: audit Version: 3.0 -Release: 0.21.20191104git1c2f876%{?dist} +Release: 1%{?dist} License: GPLv2+ URL: http://people.redhat.com/sgrubb/audit/ -Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}-alpha9.tar.gz +Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz Source1: https://www.gnu.org/licenses/lgpl-2.1.txt -Patch1: audit-3.0-no-common.patch BuildRequires: gcc swig BuildRequires: openldap-devel @@ -87,7 +86,6 @@ Management Facility) database, through an IBM Tivoli Directory Server %prep %setup -q cp %{SOURCE1} . -%patch1 -p1 %build %configure --sbindir=/sbin --libdir=/%{_lib} --with-python=no \ @@ -252,6 +250,9 @@ fi %attr(750,root,root) /sbin/audispd-zos-remote %changelog +* Wed Dec 16 2020 Steve Grubb 3.0-1 +- New upstream feature and bugfix release + * Mon Jul 27 2020 Fedora Release Engineering - 3.0-0.21.20191104git1c2f876 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 02d565d..faf36f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (audit-3.0-alpha9.tar.gz) = 680dd34c21f31d625e6a5d7b0cb8dfd868d60a8536acb389bac5f3f018a1c90d195206d41954394196fede74f99452792dc90a72248ebbac4cd7f0e002f453c6 +SHA512 (audit-3.0.tar.gz) = b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88