From 82e602850ca940a729588097f1ad4e14d73dd37d Mon Sep 17 00:00:00 2001
From: Vit Mojzis <vmojzis@redhat.com>
Date: Wed, 11 Dec 2019 16:39:29 +0100
Subject: [PATCH] setroubleshoot-3.3.21-1

- Fix AVC.__typeMatch to handle aliases properly
- Handle sockets with abstract path properly (#1775135)
---
 .gitignore                                    |  1 +
 ...p.glib.DBusGMainLoop-instead-of-dbus.patch | 43 -------------------
 setroubleshoot.spec                           |  9 ++--
 sources                                       |  2 +-
 4 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 0001-Use-dbus.mainloop.glib.DBusGMainLoop-instead-of-dbus.patch

diff --git a/.gitignore b/.gitignore
index 89756f9..0862f3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -205,3 +205,4 @@ setroubleshoot-2.2.93.tar.gz
 /setroubleshoot-3.3.18.tar.gz
 /setroubleshoot-3.3.19.tar.gz
 /setroubleshoot-3.3.20.tar.gz
+/setroubleshoot-3.3.21.tar.gz
diff --git a/0001-Use-dbus.mainloop.glib.DBusGMainLoop-instead-of-dbus.patch b/0001-Use-dbus.mainloop.glib.DBusGMainLoop-instead-of-dbus.patch
deleted file mode 100644
index 8c26060..0000000
--- a/0001-Use-dbus.mainloop.glib.DBusGMainLoop-instead-of-dbus.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a47895131484cfb5d3b6bbbce1e1f223d69c5dda Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Tue, 27 Aug 2019 22:34:08 +0200
-Subject: [PATCH] Use dbus.mainloop.glib.DBusGMainLoop() instead of dbus.glib
-
-Fixes:
-/usr/bin/sealert:32: DeprecationWarning: Importing dbus.glib to use the GLib main loop with dbus-python is deprecated.
-Instead, use this sequence:
-
-    from dbus.mainloop.glib import DBusGMainLoop
-
-    DBusGMainLoop(set_as_default=True)
-
-  import dbus.glib
----
- framework/src/sealert | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/framework/src/sealert b/framework/src/sealert
-index 4934df4..42dc976 100755
---- a/framework/src/sealert
-+++ b/framework/src/sealert
-@@ -29,7 +29,6 @@ from gi.repository import GObject, GLib
- GLib.set_prgname('setroubleshoot')
- 
- import dbus
--import dbus.glib
- import dbus.service
- import errno as Errno
- import gettext
-@@ -42,6 +41,9 @@ import fcntl
- import sys
- import slip.dbus.service
- 
-+from dbus.mainloop.glib import DBusGMainLoop
-+DBusGMainLoop(set_as_default=True)
-+
- from setroubleshoot.config import parse_config_setting, get_config
- domain = get_config('general', 'i18n_text_domain')
- kwargs = {}
--- 
-2.23.0
-
diff --git a/setroubleshoot.spec b/setroubleshoot.spec
index 030b665..3860201 100644
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
@@ -3,13 +3,12 @@
 
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 3.3.20
-Release: 4%{?dist}
+Version: 3.3.21
+Release: 1%{?dist}
 License: GPLv2+
 URL: https://pagure.io/setroubleshoot
 Source0: https://releases.pagure.org/setroubleshoot/%{name}-%{version}.tar.gz
 Source1: %{name}.tmpfiles
-Patch1: 0001-Use-dbus.mainloop.glib.DBusGMainLoop-instead-of-dbus.patch
 BuildRequires: gcc
 BuildRequires: libcap-ng-devel
 BuildRequires: intltool gettext python3 python3-devel
@@ -195,6 +194,10 @@ SELinux troubleshoot legacy applet
 %{_bindir}/seappletlegacy
 
 %changelog
+* Wed Dec 11 2019 Vit Mojzis <vmojzis@redhat.com> - 3.3.21-1
+- Fix AVC.__typeMatch to handle aliases properly
+- Handle sockets with abstract path properly (#1775135)
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.3.20-4
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 
diff --git a/sources b/sources
index a086171..06fd37c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setroubleshoot-3.3.20.tar.gz) = e70e2efba8048133c2f3177038f706982532a11d3e6e9957437d94cfe1ddbfb3d8a5d05041ac3d5dc7e00b7f29613216ae5c302ad75f5b6d7c5a4de91b080aa5
+SHA512 (setroubleshoot-3.3.21.tar.gz) = 96d64d3990f5faddbb47317e9045dcb0bd6a5fb8b42cf394b7866db8727993ea48e87f8b9b888641d5c4ea1efebc9738f25ac31fd4a980746f7506d532f78fc9