Fix timeout of setroubleshoot so that it dies after 10 seconds of non use

- Fix audit2allow -R output to actually work.

.gitignore

@@ -157,3 +157,11 @@ setroubleshoot-2.2.93.tar.gz
 /setroubleshoot-3.1.12.tar.gz
 /setroubleshoot-3.1.14.tar.gz
 /setroubleshoot-3.1.15.tar.gz
+/setroubleshoot-3.1.16.tar.gz
+/setroubleshoot-3.1.17.tar.gz
+/setroubleshoot-3.1.18.tar.gz
+/setroubleshoot-3.1.20.tar.gz
+/setroubleshoot-3.1.21.tar.gz
+/setroubleshoot-3.2.1.tar.gz
+/setroubleshoot-3.2.2.tar.gz
+/setroubleshoot-3.2.3.tar.gz

setroubleshoot-3.2.3_timeout.patch

@@ -0,0 +1,52 @@
+diff -up setroubleshoot-3.2.3/src/setroubleshootd.timeout setroubleshoot-3.2.3/src/setroubleshootd
+--- setroubleshoot-3.2.3/src/setroubleshootd.timeout	2012-07-10 08:59:53.000000000 -0400
++++ setroubleshoot-3.2.3/src/setroubleshootd	2013-04-19 13:55:38.675270996 -0400
+@@ -37,16 +37,16 @@ syslog.openlog(pkg_name)
+ def usage():
+     print '''
+ -f --nofork				no fork
++-D --debug                              debug
+ -c --config section.option=value	set a configuration value
+--v --verbose                            log INFO level and higher messages to console
+--V --debug                              log DEBUG level and higher messages to console
+ -h --help				display help info
+ '''
+ 
+ fork = True
++timeout = 10
+ 
+ try:
+-    opts, args = getopt.getopt(sys.argv[1:], "fc:h", ["nofork","config=","help"])
++    opts, args = getopt.getopt(sys.argv[1:], "dfc:h", ["debug", "nofork","config=","help"])
+ except getopt.GetoptError:
+     # print help information and exit:
+     usage()
+@@ -60,6 +60,9 @@ for o, a in opts:
+     if o in ("-f", "--nofork"):
+         fork = False
+ 
++    if o in ("-d", "--debug"):
++	timeout = 0 
++
+     if o in ("-c", "--config"):
+         config_setting = a
+         if not parse_config_setting(config_setting):
+@@ -73,9 +76,7 @@ import dbus.service
+ import dbus
+ 
+ try: 
+-    timeout = 0
+     if fork:
+-        timeput = 10
+         # do the UNIX double-fork magic, see Stevens' "Advanced 
+         # Programming in the UNIX Environment" for details (ISBN 0201563177)
+         pid = os.fork() 
+@@ -95,6 +96,8 @@ try:
+         f.close()
+     
+     from setroubleshoot.server import RunFaultServer
++    syslog.syslog(syslog.LOG_DEBUG, _("RunFaultServer(%d)") % timeout)
++
+     RunFaultServer(timeout)
+     
+ except OSError, e: 

setroubleshoot.spec

@@ -1,13 +1,14 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 3.1.15
-Release: 1%{?dist}
+Version: 3.2.3
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
 # git clone git://git.fedorahosted.org/git/setroubleshoot.git; cd setroubleshoot
 # git archive --prefix setroubleshoot-3.0.10/426cf8ea7a38e8c5179981219d831368161b65f2 > setroubleshoot-3.0.10.tar.gz
 Source0: %{name}-%{version}.tar.gz
+Patch0: setroubleshoot-3.2.3_timeout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: libcap-ng-devel
@@ -34,7 +35,6 @@ Requires: xdg-utils
 %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 %global pkgpythondir  %{python_sitelib}/%{name}
-%define pkgdocdir     %{_datadir}/doc/%{name}-%{version}
 %define pkgguidir     %{_datadir}/%{name}/gui
 %define pkgdatadir    %{_datadir}/%{name}
 %define pkglibexecdir %{_prefix}/libexec/%{name}
@@ -65,12 +65,14 @@ to user preference. The same tools can be run on existing log files.
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 dbus-send --system /com/redhat/setroubleshootd com.redhat.SEtroubleshootdIface.restart string:'rpm install' >/dev/null 2>&1 || :
+%systemd_post auditd.service
 
 %postun
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
+%systemd_postun_with_restart auditd.service
 
 %posttrans
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -78,6 +80,7 @@ fi
 
 %prep
 %setup -q
+%patch0 -p1 -b .timeout
 
 %build
 %configure
@@ -87,8 +90,10 @@ make
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}/%{_datadir}/applications/%{name}.desktop
+mkdir -p %{buildroot}%{pkgvardatadir}
 touch %{buildroot}%{pkgdatabase}
 touch %{buildroot}%{pkgvardatadir}/email_alert_recipients
+rm -rf %{buildroot}/usr/share/doc/
 %find_lang %{name}
 
 %package server
@@ -102,11 +107,11 @@ Requires: libxml2-python
 Requires: setools-libs-python >= 3.3.7-19
 Requires: rpm-python
 Requires: libselinux-python  >= 2.1.5-1
-Requires: policycoreutils-python 
+Requires: policycoreutils-devel
 BuildRequires: intltool gettext python
 BuildRequires: setools-devel >= 3.3.7-19
 BuildRequires: python-devel
-Requires: python-slip-dbus
+Requires: python-slip-dbus systemd-python
 
 Requires(post):   /sbin/chkconfig
 Requires(post):   /sbin/service
@@ -136,15 +141,12 @@ rm -rf %{buildroot}
 
 %files server -f %{name}.lang 
 %defattr(-,root,root,-)
-%doc %{pkgdocdir}
 %{_bindir}/sealert
 %{_sbindir}/sedispatch
 %{_sbindir}/setroubleshootd
-%{python_sitelib}/sesearch*.egg-info
 %{python_sitelib}/setroubleshoot*.egg-info
 %dir %attr(0755,root,root) %{pkgconfigdir}
 %dir %attr(0755,root,root) %{pkgpythondir}
-%dir %attr(0755,root,root) %{pkgpythondir}/sesearch
 %{pkgpythondir}/Plugin.py*
 %{pkgpythondir}/__init__.py*
 %{pkgpythondir}/access_control.py*
@@ -163,8 +165,6 @@ rm -rf %{buildroot}
 %{pkgpythondir}/util.py*
 %{pkgpythondir}/uuid.py*
 %{pkgpythondir}/xml_serialize.py*
-%{pkgpythondir}/sesearch/__init__.py*
-%attr(0755,root,root) %{pkgpythondir}/sesearch/_sesearch.so
 %attr(0755,root,root) %{pkgpythondir}/default_encoding_utf8.so
 %dir %{pkgdatadir}
 %{pkgdatadir}/SetroubleshootFixit.py*
@@ -183,19 +183,52 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.SetroubleshootFixit.conf
 %{_datadir}/dbus-1/system-services/org.fedoraproject.SetroubleshootFixit.service
 
-%package doc
-Summary: Setroubleshoot documentation
-Group: System Environment/Base
-Requires(pre): setroubleshoot-server = %{version}-%{release}
-
-%description doc
-Setroubleshoot documentation package
-
-%files doc
-%defattr(-,root,root,-)
-%{pkgdocdir}/setroubleshoot*
-
 %changelog
+* Fri Apr 19 2013 Dan Walsh <dwalsh@redhat.com> - 3.2.3-3
+- Fix timeout of setroubleshoot so that it dies after 10 seconds of non use
+
+* Fri Feb 15 2013 Dan Walsh <dwalsh@redhat.com> - 3.2.3-1
+- Update Translations
+- Fix audit2allow -R output to actually work.
+
+* Fri Feb 15 2013 Dan Walsh <dwalsh@redhat.com> - 3.2.2-1
+- Fix handling of sesearch data
+
+* Thu Jan 31 2013 Dan Walsh <dwalsh@redhat.com> - 3.2.1-1
+- Remove sesearch from package and start using sepolicy from policycoreutils-python
+- Fix retrieval of writable types to translate attributes into the group of types available, and not return non file types.
+
+* Fri Jan 25 2013 Dan Walsh <dwalsh@redhat.com> - 3.1.21-2
+- Need to add a requires for systemd-python
+
+* Mon Jan 14 2013 Dan Walsh <dwalsh@redhat.com> - 3.1.21-1
+- Update translations.
+- Restart auditd service on install and removal
+
+* Mon Jan 14 2013 Dan Walsh <dwalsh@redhat.com> - 3.1.20-1
+- Update translations.
+
+* Wed Dec 5 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.19-2
+- Require policycoreutils-devel to pull in audit2allow
+
+* Wed Dec 5 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.19-1
+- Update Translations
+
+* Tue Oct 9 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.18-1
+- Update Translations
+- Add keywords to desktop file
+
+* Tue Oct 9 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.17-2
+- Update Translations
+
+* Thu Sep 20 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.17-1
+- Update Translations
+
+* Mon Aug 13 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.16-1
+- Fix sealert to handle avc's in /var/log/messages which will be numbered 1400 and 1107 rather then AVC and USER_AVC
+- Update Translations
+- Fix hostname substitution to only effect hostnames
+
 * Wed Jul 25 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.15-1
 - More translation fixes.
 
@@ -220,10 +253,10 @@ Setroubleshoot documentation package
 - Add file_types as a param to setroubleshoot.utils
 - Update translations
 
-* Tue Mar 8 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.8-1
+* Thu Mar 8 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.8-1
 - Add missing lanquages, using lang supported by gtk
 
-* Tue Mar 8 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.7-1
+* Thu Mar 8 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.7-1
 - Add missing lanquages
 
 * Thu Mar 8 2012 Dan Walsh <dwalsh@redhat.com> - 3.1.6-1
@@ -262,7 +295,7 @@ Setroubleshoot documentation package
 - Patch from Mgrepl to stop printable from crashing if None is passed in
 - Update to latest translations
 
-* Mon Dec 8 2011  <dwalsh@redhat.com> - 3.0.44-1
+* Thu Dec 8 2011  <dwalsh@redhat.com> - 3.0.44-1
 - Update to latest translations
 - Fix memory leak in sedispatch
 
@@ -291,7 +324,7 @@ Setroubleshoot documentation package
 - Move serverconnection.py and FixIt commands from setroubleshoot to setroubleshoot-server
 - Remove run_cmd.py
 
-* Mon May 24 2011  <dwalsh@redhat.com> - 3.0.35-1
+* Tue May 24 2011  <dwalsh@redhat.com> - 3.0.35-1
 - Make work on RHEL6
 - Fix if Button to allow user to select full button
 
@@ -437,7 +470,7 @@ Setroubleshoot documentation package
 - Don't crash on missing inode
 - Fix up default_encoding an translations
 
-* Thu Jan 13 2010 Dan Walsh <dwalsh@redhat.com> - 2.2.55-2
+* Wed Jan 13 2010 Dan Walsh <dwalsh@redhat.com> - 2.2.55-2
 - Cleanup spec file
 - Add default_encoding
 - Fix wording in bug report window
@@ -575,13 +608,13 @@ Setroubleshoot documentation package
 * Sun Jul 19 2009 Dan Walsh <dwalsh@redhat.com> - 2.2.15-1
 - Fix a1 handling
 
-* Mon Jul 15 2009 Dan Walsh <dwalsh@redhat.com> - 2.2.14-1
+* Mon Jul 13 2009 Dan Walsh <dwalsh@redhat.com> - 2.2.14-1
 - Update to upstream
   2009-7-15 Dan Walsh <dwalsh@redhat.com> 
   - Fix handling of syscall record a1 field
   - Translate "/" to mountpoint when returned by kernel
 
-* Mon Jul 7 2009 Dan Walsh <dwalsh@redhat.com> - 2.2.13-1
+* Tue Jul 7 2009 Dan Walsh <dwalsh@redhat.com> - 2.2.13-1
 - Update to upstream
   2009-7-07 Thomas Liu <tliu@redhat.com> 
   - Fixed detail doc not clearing when deleting all alerts
@@ -1125,21 +1158,21 @@ Setroubleshoot documentation package
 - fix return args on rpc method
 - add instance id to server
 
-* Wed Dec  9 2006 Dan Walsh <dwalsh@redhat.com> - 1.8.10-1
+* Wed Dec 13 2006 Dan Walsh <dwalsh@redhat.com> - 1.8.10-1
 - Improve quality of plugins
 - Make matching easier
 - Fixes 216575
 
-* Wed Dec  9 2006 Dan Walsh <dwalsh@redhat.com> - 1.8.9-1
+* Wed Dec 13 2006 Dan Walsh <dwalsh@redhat.com> - 1.8.9-1
 - Additional Translations
 - Fixes 216575
 
-* Sat Dec  8 2006 Dan Walsh <dwalsh@redhat.com> - 1.8.8-1
+* Sat Dec  9 2006 Dan Walsh <dwalsh@redhat.com> - 1.8.8-1
 - Additional Translations
 - Change sealert to be able to run without X-Windows
 - Fixes 216575
 
-* Fri Dec  8 2006 Dan Walsh <dwalsh@redhat.com> - 1.8.7-1
+* Fri Dec 8 2006 Dan Walsh <dwalsh@redhat.com> - 1.8.7-1
 - Additional Translations
 - Change avc_audit.py to allow it to analyze /var/log/messages
 
@@ -1189,7 +1222,7 @@ Setroubleshoot documentation package
    strike-throughs of alerts marked for deletion.
 - multiple alerts can now be selected, add select all command, 
 
-* Tue Nov 23 2006 Dan Walsh <dwalsh@redhat.com> - 1.7.1-1
+* Thu Nov 23 2006 Dan Walsh <dwalsh@redhat.com> - 1.7.1-1
 - New Icon and translations
 
 * Tue Nov 21 2006 Dan Walsh <dwalsh@redhat.com> - 1.7-1
@@ -1213,7 +1246,7 @@ Setroubleshoot documentation package
 * Wed Nov 8 2006 Dan Walsh <dwalsh@redhat.com> - 1.5-1
 - Speed up startup of service
 
-* Tue Nov 6 2006 Dan Walsh <dwalsh@redhat.com> - 1.4-1
+* Tue Nov 7 2006 Dan Walsh <dwalsh@redhat.com> - 1.4-1
 - Many fixes
 - Changed the api
 
@@ -1287,14 +1320,14 @@ Setroubleshoot documentation package
    during data transfer.
 - checkpoint the logfile scanning code, somewhat working
 
-* Fri Aug 31 2006 Dan Walsh <dwalsh@redhat.com> - 0.41-1
+* Thu Aug 31 2006 Dan Walsh <dwalsh@redhat.com> - 0.41-1
 - Fix printing
 
-* Fri Aug 31 2006 Dan Walsh <dwalsh@redhat.com> - 0.40-1
+* Thu Aug 31 2006 Dan Walsh <dwalsh@redhat.com> - 0.40-1
 - Fix notification window problems.  Now dissappears and does not regenerate if
 it has already been seen
 
-* Fri Aug 31 2006 Dan Walsh <dwalsh@redhat.com> - 0.39-1
+* Thu Aug 31 2006 Dan Walsh <dwalsh@redhat.com> - 0.39-1
 - Add Icon
     [John Dennis <jdennis@redhat.com>]
 - dispatcher.py: rework how audit messages injected into the
@@ -1315,7 +1348,7 @@ it has already been seen
     [Karl MacMillan <kmacmill@redhat.com>]
 - Separated out HTML rendering and made it easier to translate.
 
-* Fri Aug 30 2006 Dan Walsh <dwalsh@redhat.com> - 0.38-1
+* Wed Aug 30 2006 Dan Walsh <dwalsh@redhat.com> - 0.38-1
     [Dan  Walsh]
 - Hook up the rest of the menu bars on browser window
 - Add public_content.py plugin
@@ -1346,7 +1379,7 @@ it has already been seen
    icon now checks if the browser is visible, the status icon is
    not presented if the browser is already displayed.
 
-* Thu Aug 22 2006 Dan Walsh <dwalsh@redhat.com> - 0.34-1
+* Thu Aug 24 2006 Dan Walsh <dwalsh@redhat.com> - 0.34-1
 - Standardize on the browser. remove alert window
     [John Dennis <jdennis@redhat.com>]
 - remove all vestiges of popup alert, now browser is the only
@@ -1494,7 +1527,7 @@ it has already been seen
 - Complete all boolean plugins except disable
 - Change interface to use audit unix domain socket
 
-* Mon Jul 28 2006 Dan Walsh <dwalsh@redhat.com> - 0.16-1
+* Fri Jul 28 2006 Dan Walsh <dwalsh@redhat.com> - 0.16-1
     [John Dennis <jdennis@redhat.com>]
 - modify SetFilter in server to return errors instead of
    throwing an exception. Default the filter list on each alert display.
@@ -1511,7 +1544,7 @@ it has already been seen
 - Make Close button work.
 - Make setroubleshoot_dispatcher exit if it gets an avc about itself
 
-* Mon Jul 26 2006 Dan Walsh <dwalsh@redhat.com> - 0.15-1
+* Wed Jul 26 2006 Dan Walsh <dwalsh@redhat.com> - 0.15-1
     [Karl MacMillan <kmacmill@redhat.com>]
 - Add generic templating mechanism to Plugin
 - Ported all plugins to use templating mechanism
@@ -1531,17 +1564,17 @@ it has already been seen
 - Fix startup order for setrobleshoot
 - Fix Plugins
 
-* Tue Jul 20 2006 Dan Walsh <dwalsh@redhat.com> - 0.9-1
+* Thu Jul 20 2006 Dan Walsh <dwalsh@redhat.com> - 0.9-1
 - Additional Plugins plus a lot of cleanup
 
-* Mon Jul 19 2006 Dan Walsh <dwalsh@redhat.com> - 0.8-1
+* Wed Jul 19 2006 Dan Walsh <dwalsh@redhat.com> - 0.8-1
 - Added a bunch more plugins
     [Karl MacMillan <kmacmill@redhat.com>]
 - Add allow_cvs_read_shadow.py, allow_ftp_use_cifs, allow_ftp_use_nfs, and allow_gssd_read_tmp.
 - Change AVC to have additional helpers for matching messages.
 - Change Plugin to work better with more than one solution.
 
-* Mon Jul 19 2006 Dan Walsh <dwalsh@redhat.com> - 0.7-1
+* Wed Jul 19 2006 Dan Walsh <dwalsh@redhat.com> - 0.7-1
 - Fix setroubleshoot_dispatcher to catch all information from
    avc. Much cleaner interface and no longer uses audit2allow cruft.
 - Remove toolbar from popup window since it did nothing, and I

sources

@@ -1 +1 @@
-ba7243a4bd4020ac186da9f36ff938dd  setroubleshoot-3.1.15.tar.gz
+2af06ba6b0dca05cb3d505191368552b  setroubleshoot-3.2.3.tar.gz