From 390018d909c3c04bbc4babc8631f2e8e0ec51128 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Wed, 18 Jul 2018 22:08:30 +0200
Subject: [PATCH] setroubleshoot-3.3.18-1

- Move sedispatch.conf to /etc/audit/plugins.d/
- Fix summary and "if" text for AVCs with unknown target path
---
 .gitignore          |  1 +
 setroubleshoot.spec | 16 ++++++++++------
 sources             |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5c88e3e..5d212c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -202,3 +202,4 @@ setroubleshoot-2.2.93.tar.gz
 /setroubleshoot-3.3.15.tar.gz
 /setroubleshoot-3.3.16.tar.gz
 /setroubleshoot-3.3.17.tar.gz
+/setroubleshoot-3.3.18.tar.gz
diff --git a/setroubleshoot.spec b/setroubleshoot.spec
index c042cfc..a8d14c8 100644
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
@@ -3,8 +3,8 @@
 
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 3.3.17
-Release: 3%{?dist}
+Version: 3.3.18
+Release: 1%{?dist}
 License: GPLv2+
 URL: https://pagure.io/setroubleshoot
 Source0: https://releases.pagure.org/setroubleshoot/%{name}-%{version}.tar.gz
@@ -70,7 +70,7 @@ dbus-send --system /com/redhat/setroubleshootd com.redhat.SEtroubleshootdIface.r
 %autosetup -p 2
 
 %build
-%configure PYTHON=%{__python3} --enable-seappletlegacy=yes
+%configure PYTHON=%{__python3} --enable-seappletlegacy=yes --with-auditpluginsdir=/etc/audit/plugins.d
 make
 
 %install
@@ -91,8 +91,8 @@ install -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
 Summary: SELinux troubleshoot server
 
 Requires: %{name}-plugins >= 3.3.8
-Requires: audit >= 1.2.6-3
-Requires: audit-libs-python3 >= 1.2.6-3
+Requires: audit >= 3
+Requires: audit-libs-python3
 Requires: libxml2-python3
 Requires: rpm-python3
 Requires: libselinux-python3  >= 2.1.5-1
@@ -179,7 +179,7 @@ chown -R setroubleshoot:setroubleshoot %{pkgvardatadir}
 %{_mandir}/man8/sealert.8.gz
 %{_mandir}/man8/sedispatch.8.gz
 %{_mandir}/man8/setroubleshootd.8.gz
-%config /etc/audisp/plugins.d/sedispatch.conf
+%config /etc/audit/plugins.d/sedispatch.conf
 %{_datadir}/dbus-1/system-services/org.fedoraproject.Setroubleshootd.service
 %{_datadir}/polkit-1/actions/org.fedoraproject.setroubleshootfixit.policy
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.SetroubleshootFixit.conf
@@ -201,6 +201,10 @@ SELinux troubleshoot legacy applet
 %{_bindir}/seappletlegacy
 
 %changelog
+* Wed Jul 18 2018 Petr Lautrbach <plautrba@redhat.com> - 3.3.18-1
+- Move sedispatch.conf to /etc/audit/plugins.d/
+- Fix summary and "if" text for AVCs with unknown target path
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 48efe8f..f1c3b2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setroubleshoot-3.3.17.tar.gz) = ae0083163f909fad3d5ef91dd3c80f3263452e50dd314ab0f1e6394022cbe771111655919f7518fd1351dcc195929dd81b838436ef797174f5bf3baf4f9adf15
+SHA512 (setroubleshoot-3.3.18.tar.gz) = 020d80d5a78b178ce402e548ab2e1bba7fb57c8af584c7ed47d7828b83f62f853edce9ccaafb06147c51fb0ac13947b2c63eef7a7b305c6cd4cdd231fac5e143