From 48ae6132310268da164e8d32e5ca825672cbcfd2 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 12 Feb 2021 21:00:34 +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#ef3b06b9ca01517606ecd84647c2cdd15261e339
---
 .gitignore |  1 +
 audit.spec | 19 +++++++++++++++----
 sources    |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1779c3d..ea3bba4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -165,3 +165,4 @@ audit-2.0.4.tar.gz
 /audit-3.0-alpha8.tar.gz
 /audit-3.0-alpha9.tar.gz
 /audit-3.0.tar.gz
+/audit-3.0.1.tar.gz
diff --git a/audit.spec b/audit.spec
index 9a19dde..69369cc 100644
--- a/audit.spec
+++ b/audit.spec
@@ -1,14 +1,14 @@
 
 Summary: User space tools for kernel auditing
 Name: audit
-Version: 3.0
-Release: 2%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
 License: GPLv2+
 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
 
-BuildRequires: gcc swig
+BuildRequires: make gcc swig
 BuildRequires: openldap-devel
 BuildRequires: krb5-devel libcap-ng-devel
 BuildRequires: kernel-headers >= 2.6.29
@@ -88,12 +88,15 @@ Management Facility) database, through an IBM Tivoli Directory Server
 %setup -q
 cp %{SOURCE1} .
 
+# Remove the ids code, its not ready
+sed -i 's/ ids / /' audisp/plugins/Makefile.in
+
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-python=no \
 	   --with-python3=yes \
 	   --enable-gssapi-krb5=yes --with-arm --with-aarch64 \
 	   --with-libcap-ng=yes --enable-zos-remote \
-	   --enable-systemd
+	   --enable-systemd --enable-experimental
 
 make CFLAGS="%{optflags}" %{?_smp_mflags}
 
@@ -236,12 +239,16 @@ fi
 %config(noreplace) %attr(640,root,root) /etc/audit/audisp-remote.conf
 %config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/au-remote.conf
 %config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/syslog.conf
+%config(noreplace) %attr(640,root,root) /etc/audit/audisp-statsd.conf
+%config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/au-statsd.conf
 %attr(750,root,root) /sbin/audisp-remote
 %attr(750,root,root) /sbin/audisp-syslog
+%attr(750,root,root) /sbin/audisp-statsd
 %attr(700,root,root) %dir %{_var}/spool/audit
 %attr(644,root,root) %{_mandir}/man5/audisp-remote.conf.5.gz
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 %attr(644,root,root) %{_mandir}/man8/audisp-syslog.8.gz
+%attr(644,root,root) %{_mandir}/man8/audisp-statsd.8.gz
 
 %files -n audispd-plugins-zos
 %attr(644,root,root) %{_mandir}/man8/audispd-zos-remote.8.gz
@@ -251,6 +258,10 @@ fi
 %attr(750,root,root) /sbin/audispd-zos-remote
 
 %changelog
+* Fri Feb 12 2021 Steve Grubb <sgrubb@redhat.com> 3.0.1-1
+- New upstream feature and bugfix release
+- Enable building the audisp-statsd plugin
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index faf36f7..dd6131d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (audit-3.0.tar.gz) = b82ec73c85a8ebb5108b526673d6fe08cbe0b51376788f3ea6ed5747c4612158462893e719496dffbd723f833f84383a2d1d55fd78a3ed985ecfd19545060c88
+SHA512 (audit-3.0.1.tar.gz) = ad2897c9f539681f0f65b08cd0e650c528957fd4799755c2bcc47f869e04272aad31684c46847124d7b42dde243a16ba2754936890189610814c7007c0381d8c