diff --git a/.gitignore b/.gitignore index 29155ed..89756f9 100644 --- a/.gitignore +++ b/.gitignore @@ -204,3 +204,4 @@ setroubleshoot-2.2.93.tar.gz /setroubleshoot-3.3.17.tar.gz /setroubleshoot-3.3.18.tar.gz /setroubleshoot-3.3.19.tar.gz +/setroubleshoot-3.3.20.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 new file mode 100644 index 0000000..8c26060 --- /dev/null +++ b/0001-Use-dbus.mainloop.glib.DBusGMainLoop-instead-of-dbus.patch @@ -0,0 +1,43 @@ +From a47895131484cfb5d3b6bbbce1e1f223d69c5dda Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach +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 56073ec..746a819 100644 --- a/setroubleshoot.spec +++ b/setroubleshoot.spec @@ -3,12 +3,13 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 3.3.19 -Release: 1%{?dist} +Version: 3.3.20 +Release: 2%{?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 @@ -16,7 +17,7 @@ BuildRequires: desktop-file-utils dbus-glib-devel gtk2-devel libnotify-devel aud BuildRequires: python3-libselinux python3-pydbus python3-gobject gtk3-devel Requires: %{name}-server = %{version}-%{release} Requires: gtk3, libnotify -Requires: libreport-gtk >= 2.2.1-2, libreport-python3 +Requires: libreport-gtk >= 2.2.1-2, python3-libreport Requires: python3-gobject, python3-pydbus Requires(post): desktop-file-utils Requires(post): dbus @@ -92,7 +93,7 @@ Requires: policycoreutils-python-utils BuildRequires: intltool gettext python3 BuildRequires: python3-devel Requires: python3-slip-dbus systemd-python3 >= 206-1 -Requires: python3-gobject >= 3.11 +Requires: python3-gobject-base >= 3.11 Requires: dbus Requires: python3-dbus Requires: polkit @@ -168,6 +169,7 @@ chown -R setroubleshoot:setroubleshoot %{pkgvardatadir} %attr(0700,setroubleshoot,setroubleshoot) %dir %{pkgvardatadir} %ghost %attr(0600,setroubleshoot,setroubleshoot) %{pkgdatabase} %ghost %attr(0644,setroubleshoot,setroubleshoot) %{pkgvardatadir}/email_alert_recipients +%{_mandir}/man1/seapplet.1.gz %{_mandir}/man8/sealert.8.gz %{_mandir}/man8/sedispatch.8.gz %{_mandir}/man8/setroubleshootd.8.gz @@ -193,6 +195,17 @@ SELinux troubleshoot legacy applet %{_bindir}/seappletlegacy %changelog +* Tue Aug 27 2019 Petr Lautrbach - 3.3.20-2 +- Use dbus.mainloop.glib.DBusGMainLoop() instead of dbus.glib + +* Wed Jul 17 2019 Vit Mojzis - 3.3.20-1 +- Update "missing" scripts to automake-1.15 +- Add active polling for acquiring policy file +- Fix translation of hex values in AVCs +- require initscripts to ensure that "service" call works properly +- Add man page for seapplet +- setroubleshoot-server: only require gobject-base + * Sat Dec 8 2018 Petr Lautrbach - 3.3.19-1 - Require plugins >= 3.3.10 diff --git a/sources b/sources index 5f92a7d..a086171 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (setroubleshoot-3.3.19.tar.gz) = e012f9c0011fd682394232c9297e01710a389cc4bbae11193f75780c96a99451d7d8a77080a7d4686525ca8b8bbc6332991b7b06a282345d2baba64bab9beb24 +SHA512 (setroubleshoot-3.3.20.tar.gz) = e70e2efba8048133c2f3177038f706982532a11d3e6e9957437d94cfe1ddbfb3d8a5d05041ac3d5dc7e00b7f29613216ae5c302ad75f5b6d7c5a4de91b080aa5