setroubleshoot-3.3.11-1

- Fix "list all alerts" in sealert gui (#1370272, #1332485)
- Fix sealert message for capability2 (#1360392)

.gitignore

@@ -186,3 +186,13 @@ setroubleshoot-2.2.93.tar.gz
 /setroubleshoot-3.2.23.tar.gz
 /setroubleshoot-3.2.24.tar.gz
 /setroubleshoot-3.3.1.tar.gz
+/setroubleshoot-3.3.3.tar.gz
+/setroubleshoot-3.3.4.tar.gz
+/setroubleshoot-3.3.5.tar.gz
+/setroubleshoot-3.3.6.tar.gz
+/setroubleshoot-3.3.7.tar.gz
+/setroubleshoot-3.3.8.tar.gz
+/setroubleshoot-3.3.8.1.tar.gz
+/setroubleshoot-3.3.9.1.tar.gz
+/setroubleshoot-3.3.10.tar.gz
+/setroubleshoot-3.3.11.tar.gz

0001-setroubleshoot-Ensure-that-dbus-string-param-isn-t-n.patch

@@ -0,0 +1,26 @@
+From a1d303150b341d6cfdc1f7d36c38004cee01fdb7 Mon Sep 17 00:00:00 2001
+From: Dominik Perpeet <dperpeet@redhat.com>
+Date: Wed, 6 Apr 2016 10:09:55 +0200
+Subject: [PATCH] setroubleshoot: Ensure that dbus string param isn't null
+
+An alert's level can be None, but DBUS doesn't allow that for string parameters.
+---
+ framework/src/setroubleshoot/server.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/framework/src/setroubleshoot/server.py b/framework/src/setroubleshoot/server.py
+index 87722c9..e788d41 100755
+--- a/framework/src/setroubleshoot/server.py
++++ b/framework/src/setroubleshoot/server.py
+@@ -579,7 +579,7 @@ Return an alert with summary, audit events, fix suggestions
+ 
+         return (alert.local_id, alert.summary(), alert.report_count,
+                 audit_events, plugins,
+-                str(alert.first_seen_date), str(alert.last_seen_date), alert.level
++                str(alert.first_seen_date), str(alert.last_seen_date), alert.level or ''
+         )
+ 
+ 
+-- 
+2.7.3
+

0002-framework-Drop-unwanted-debug-message-in-sedispatch.patch

@@ -0,0 +1,30 @@
+From 4271b72e879ca25ba244036c0c2b6b9dbf7b2edf Mon Sep 17 00:00:00 2001
+From: Petr Lautrbach <plautrba@redhat.com>
+Date: Thu, 14 Apr 2016 10:36:14 +0200
+Subject: [PATCH 2/2] framework: Drop unwanted debug message in sedispatch
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1326985
+---
+ framework/src/sedispatch.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/framework/src/sedispatch.c b/framework/src/sedispatch.c
+index 6417a10..bec3aa9 100644
+--- a/framework/src/sedispatch.c
++++ b/framework/src/sedispatch.c
+@@ -147,10 +147,9 @@ int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused)))
+ 			FD_SET(0, &rfds);
+ 			tv.tv_sec = 3;
+ 			tv.tv_usec = 0;
+-			if (select(1, &rfds, NULL, NULL, &tv) == 0) {
+-				syslog(LOG_ERR, "timeout flush");
++			if (select(1, &rfds, NULL, NULL, &tv) == 0)
++				/* The timeout occurred, the event is probably complete */
+ 				auparse_flush_feed(au);
+-			}
+ 		}
+ 		if (feof(stdin))
+ 			break;
+-- 
+2.7.3
+

setroubleshoot.spec

@@ -1,26 +1,17 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 3.3.1
-Release: 0.1%{?dist}
+Version: 3.3.11
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
-# git clone https://github.com/fedora-selinux/setroubleshoot.git
-# cd setroubleshoot/framework/
-# # for the devel version use
-# git checkout python3
-# # for a relase use
-# # git checkout setroubleshoot-%{version}
-# ./autogen.sh
-# make dist
-Source0: %{name}-%{version}.tar.gz
+Source0: https://fedorahosted.org/releases/s/e/setroubleshoot/%{name}-%{version}.tar.gz
 Source1: %{name}.tmpfiles
 BuildRequires: perl-XML-Parser
 BuildRequires: libcap-ng-devel
 BuildRequires: intltool gettext python3 python3-devel
-BuildRequires: desktop-file-utils dbus-glib-devel gtk2-devel libnotify-devel audit-libs-devel libselinux-devel polkit-devel
+BuildRequires: desktop-file-utils dbus-glib-devel gtk2-devel gtk3-devel libnotify-devel audit-libs-devel libselinux-devel polkit-devel
 Requires: %{name}-server = %{version}-%{release} 
-Requires: pygtk2-libglade >= 2.9.2
 Requires: gtk2
 Requires: libreport-gtk >= 2.2.1-2, libreport-python3
 Requires(post): desktop-file-utils
@@ -53,15 +44,15 @@ to user preference. The same tools can be run on existing log files.
 %{pkgguidir}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/*
 %{_datadir}/applications/*.desktop
+%{_datadir}/appdata/*.appdata.xml
 %{_datadir}/dbus-1/services/sealert.service
 %{_datadir}/icons/hicolor/*/*/*
 %dir %attr(0755,root,root) %{pkgpythondir}
-%{pkgpythondir}/browser.py*
-%{pkgpythondir}/gui_utils.py*
+%{pkgpythondir}/browser.py
+%{pkgpythondir}/__pycache__/browser.cpython*
+%{pkgpythondir}/gui_utils.py
+%{pkgpythondir}/__pycache__/gui_utils.cpython*
 %{_bindir}/seapplet
-%attr(0644,root,root) %{_tmpfilesdir}/%{name}.conf
-%attr(0711,setroubleshoot,setroubleshoot) %dir %{_rundir}/setroubleshoot
-%{pkgpythondir}/__pycache__/*
 
 
 %post
@@ -81,7 +72,7 @@ fi
 
 
 %prep
-%setup -q
+%autosetup -p 2 -S git
 
 %build
 %configure PYTHON=%{__python3}
@@ -106,7 +97,7 @@ install -m644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
 Summary: SELinux troubleshoot server
 Group: Applications/System
 
-Requires: %{name}-plugins >= 3.0.14
+Requires: %{name}-plugins >= 3.3.4
 Requires: audit >= 1.2.6-3
 Requires: audit-libs-python3 >= 1.2.6-3
 Requires: libxml2-python3
@@ -115,10 +106,10 @@ Requires: libselinux-python3  >= 2.1.5-1
 Requires: policycoreutils-python-utils
 BuildRequires: intltool gettext python3
 BuildRequires: python3-devel
-Requires: python-slip-dbus systemd-python >= 206-1
-Requires: pygobject3 >= 3.11
+Requires: python3-slip-dbus systemd-python3 >= 206-1
+Requires: python3-gobject >= 3.11
 Requires: dbus
-Requires: dbus-python
+Requires: python3-dbus
 Requires: polkit
 Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd
 
@@ -145,31 +136,49 @@ rm -rf %{buildroot}
 
 %files server -f %{name}.lang
 %defattr(-,root,root,-)
-%{_datadir}/appdata/*.appdata.xml
 %{_bindir}/sealert
 %{_sbindir}/sedispatch
 %{_sbindir}/setroubleshootd
 %{python3_sitelib}/setroubleshoot*.egg-info
 %dir %attr(0755,root,root) %{pkgconfigdir}
 %dir %attr(0755,root,root) %{pkgpythondir}
-%{pkgpythondir}/Plugin.py*
-%{pkgpythondir}/__init__.py*
-%{pkgpythondir}/access_control.py*
-%{pkgpythondir}/analyze.py*
-%{pkgpythondir}/audit_data.py*
-%{pkgpythondir}/avc_audit.py*
-%{pkgpythondir}/config.py*
-%{pkgpythondir}/email_alert.py*
-%{pkgpythondir}/errcode.py*
-%{pkgpythondir}/html_util.py*
-%{pkgpythondir}/rpc.py*
-%{pkgpythondir}/serverconnection.py*
-%{pkgpythondir}/rpc_interfaces.py*
-%{pkgpythondir}/server.py*
-%{pkgpythondir}/signature.py*
-%{pkgpythondir}/util.py*
-%{pkgpythondir}/uuid.py*
-%{pkgpythondir}/xml_serialize.py*
+%{pkgpythondir}/Plugin.py
+%{pkgpythondir}/__init__.py
+%{pkgpythondir}/access_control.py
+%{pkgpythondir}/analyze.py
+%{pkgpythondir}/audit_data.py
+%{pkgpythondir}/avc_audit.py
+%{pkgpythondir}/config.py
+%{pkgpythondir}/email_alert.py
+%{pkgpythondir}/errcode.py
+%{pkgpythondir}/html_util.py
+%{pkgpythondir}/rpc.py
+%{pkgpythondir}/serverconnection.py
+%{pkgpythondir}/rpc_interfaces.py
+%{pkgpythondir}/server.py
+%{pkgpythondir}/signature.py
+%{pkgpythondir}/util.py
+%{pkgpythondir}/uuid.py
+%{pkgpythondir}/xml_serialize.py
+%dir %{pkgpythondir}
+%{pkgpythondir}/__pycache__/Plugin.cpython*
+%{pkgpythondir}/__pycache__/__init__.cpython*
+%{pkgpythondir}/__pycache__/access_control.cpython*
+%{pkgpythondir}/__pycache__/analyze.cpython*
+%{pkgpythondir}/__pycache__/audit_data.cpython*
+%{pkgpythondir}/__pycache__/avc_audit.cpython*
+%{pkgpythondir}/__pycache__/config.cpython*
+%{pkgpythondir}/__pycache__/email_alert.cpython*
+%{pkgpythondir}/__pycache__/errcode.cpython*
+%{pkgpythondir}/__pycache__/html_util.cpython*
+%{pkgpythondir}/__pycache__/rpc.cpython*
+%{pkgpythondir}/__pycache__/rpc_interfaces.cpython*
+%{pkgpythondir}/__pycache__/server.cpython*
+%{pkgpythondir}/__pycache__/serverconnection.cpython*
+%{pkgpythondir}/__pycache__/signature.cpython*
+%{pkgpythondir}/__pycache__/util.cpython*
+%{pkgpythondir}/__pycache__/uuid.cpython*
+%{pkgpythondir}/__pycache__/xml_serialize.cpython*
 %dir %{pkgdatadir}
 %{pkgdatadir}/SetroubleshootFixit.py*
 %{pkgdatadir}/updater.py*
@@ -186,8 +195,69 @@ rm -rf %{buildroot}
 %{_datadir}/polkit-1/actions/org.fedoraproject.setroubleshootfixit.policy
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.SetroubleshootFixit.conf
 %{_datadir}/dbus-1/system-services/org.fedoraproject.SetroubleshootFixit.service
+%attr(0644,root,root) %{_tmpfilesdir}/%{name}.conf
+%attr(0711,setroubleshoot,setroubleshoot) %dir %{_rundir}/setroubleshoot
+%doc AUTHORS COPYING ChangeLog DBUS.md NEWS README TODO
+
 
 %changelog
+* Wed Aug 31 2016 Petr Lautrbach <plautrba@redhat.com> - 3.3.11-1
+- Fix "list all alerts" in sealert gui (#1370272, #1332485)
+- Fix sealert message for capability2 (#1360392)
+
+* Sat Jul 16 2016 Petr Lautrbach <plautrba@redhat.com> - 3.3.10-1
+- setroubleshootd fixed to catch all subprocess exceptions
+- Translations updated
+
+* Tue Jun 21 2016 Petr Lautrbach <plautrba@redhat.com> - 3.3.9.1-1
+- Do not use dangerous shell=True
+- Use subprocess.check_output() with a sequence of program arguments
+
+* Thu Jun 02 2016 Petr Lautrbach <plautrba@redhat.com> - 3.3.8.1-1
+- fixed get_all_alerts_ignored()
+
+* Thu Jun 02 2016 Petr Lautrbach <plautrba@redhat.com> - 3.3.8-1
+- added setroubleshootd_log.log_full=True|False directive
+- setroubleshootd_log.level and sealert_log.level can be set to
+  different values
+- get_alert() and get_all_alerts_since() DBUS APIs change to use
+  number of microseconds instead of date string
+- setroubleshoot.conf cleanup
+
+* Wed May 18 2016 Petr Lautrbach <plautrba@redhat.com> - 3.3.7-1
+- Added new methods to DBUS API:
+  set_filter(), get_all_alerts_ignored(), delete_alert()
+
+* Fri May 06 2016 Petr Lautrbach <plautrba@redhat.com> - 3.3.6-1
+- Translations updated (#1322654)
+- Suggest my-<command>.pp modules instead of mypol.pp (#1329037)
+
+* Thu Apr 14 2016 Petr Lautrbach <plautrba@redhat.com> - 3.3.5-3
+- Drop unwanted debug message in sedispatch (#1326985)
+
+* Thu Apr 07 2016 Petr Lautrbach <plautrba@redhat.com> - 3.3.5-2
+- setroubleshoot: Ensure that dbus string param isn't null
+
+* Mon Apr 04 2016 Petr Lautrbach <plautrba@redhat.com> - 3.3.5-1
+- get_alert() DBUS API extended with more parameters
+- sedispatch uses a timeout when collecting audit events (#1322771)
+- Use correct packaging for byte compiled files (#1321047)
+
+* Thu Feb 11 2016 Petr Lautrbach <plautrba@redhat.com> 3.3.4-1
+- fixed traceback in SetroubleshootFixit.py (#1279396)
+
+* Thu Jan 21 2016 Petr Lautrbach <plautrba@redhat.com> 3.3.3-1
+- fixed few UI browser problems
+- extended DBUS API, see DBUS.md
+- import MIMEText from the right module (#1297111)
+- Fix several GTK deprecated warnings
+
+* Wed Sep 16 2015 Richard Hughes <rhughes@redhat.com> - 3.3.1-0.3
+- Move the AppData file to the right subpackage so it gets used.
+
+* Fri Aug 28 2015 Michal Srb <msrb@redhat.com> - 3.3.1-0.2
+- Sanitize requires for Python 3
+
 * Tue Aug 18 2015 Petr Lautrbach <plautrba@redhat.com> 3.3.1-0.1
 - port setroubleshoot to Python 3
 

sources

@@ -1 +1 @@
-597f296f7b3e1ad0fe5701f1dfaf8b45  setroubleshoot-3.3.1.tar.gz
+a85efc83e57a790204b1b62ad5db0fda  setroubleshoot-3.3.11.tar.gz