diff --git a/.cvsignore b/.cvsignore index 4e9a37e..9866126 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -setroubleshoot-1.9.5.tar.gz +setroubleshoot-1.9.7.tar.gz diff --git a/setroubleshoot-autogen.patch b/setroubleshoot-autogen.patch deleted file mode 100644 index 3b17ff4..0000000 --- a/setroubleshoot-autogen.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -r -u setroubleshoot-1.9.4/src/config.py setroubleshoot-1.9.4.good/src/config.py ---- setroubleshoot-1.9.4/src/config.py 2007-03-19 14:56:59.000000000 -0400 -+++ setroubleshoot-1.9.4.good/src/config.py 2007-05-07 14:25:12.438028000 -0400 -@@ -32,7 +32,7 @@ - - _cfg = None - --CFG_FILE = os.path.join('/usr/local/etc/setroubleshoot', "%s.cfg" % 'setroubleshoot') -+CFG_FILE = os.path.join('/etc/setroubleshoot', "%s.cfg" % 'setroubleshoot') - - LOG_CATEGORIES = ['rpc','xml','cfg','alert','sig','plugin','avc', - 'email','gui', 'gui_data', 'program','database','server','dbus', -@@ -41,7 +41,7 @@ - defaults = { - 'general' : { - 'pid_file' : { -- 'value' : '/usr/local/var/run/setroubleshootd.pid', -+ 'value' : '/var/run/setroubleshootd.pid', - 'description' : '', - 'readOnly' : False, - }, -@@ -65,12 +65,12 @@ - 'readOnly' : True, - }, - 'data_dir' : { -- 'value' : '/usr/local/share/setroubleshoot', -+ 'value' : '/usr/share/setroubleshoot', - 'description' : '', - 'readOnly' : True, - }, - 'config_dir' : { -- 'value' : '/usr/local/etc/setroubleshoot', -+ 'value' : '/etc/setroubleshoot', - 'description' : '', - 'readOnly' : True, - }, -@@ -93,7 +93,7 @@ - }, - 'alert' : { - 'status_icon' : { -- 'value' : os.path.join('/usr/local/share/setroubleshoot/gui','setroubleshoot_icon.png'), -+ 'value' : os.path.join('/usr/share/setroubleshoot/gui','setroubleshoot_icon.png'), - 'description' : '', - 'readOnly' : True, - }, -@@ -104,7 +104,7 @@ - }, - 'plugins' : { - 'plugin_dir' : { -- 'value' : '/usr/local/share/setroubleshoot/plugins', -+ 'value' : '/usr/share/setroubleshoot/plugins', - 'description' : '', - }, - }, -@@ -127,7 +127,7 @@ - }, - 'database' : { - 'database_dir' : { -- 'value' : '/usr/local/var/lib/setroubleshoot', -+ 'value' : '/var/lib/setroubleshoot', - 'description' : '', - }, - 'filename' : { -@@ -141,7 +141,7 @@ - 'description' : '', - }, - 'path' : { -- 'value' : os.path.join('/usr/local/var/run/setroubleshoot','setroubleshoot_server'), -+ 'value' : os.path.join('/var/run/setroubleshoot','setroubleshoot_server'), - 'description' : '', - 'readOnly' : False, - }, -@@ -203,7 +203,7 @@ - The list of available categories is: [%s]''' % ', '.join(LOG_CATEGORIES), - }, - 'filename' : { -- 'value' : '/usr/local/var/log/setroubleshoot/setroubleshootd.log', -+ 'value' : '/var/log/setroubleshoot/setroubleshootd.log', - 'description' : '', - }, - 'filemode' : { -@@ -301,7 +301,7 @@ - 'description' : 'The Subject: email header', - }, - 'recipients_filepath' : { -- 'value' : os.path.join('/usr/local/var/lib/setroubleshoot', 'email_alert_recipients'), -+ 'value' : os.path.join('/var/lib/setroubleshoot', 'email_alert_recipients'), - 'description' : 'Path name of file with email recipients. One address per line, optionally followed by enable flag. Comment character is #. ' - }, - }, diff --git a/setroubleshoot.spec b/setroubleshoot.spec index 3acc84a..930e7e9 100644 --- a/setroubleshoot.spec +++ b/setroubleshoot.spec @@ -1,14 +1,13 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 1.9.4 -Release: 2%{?dist} +Version: 1.9.7 +Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz Source1: setroubleshoot.init Source2: setroubleshoot.logrotate -Patch0: setroubleshoot-autogen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl-XML-Parser @@ -46,6 +45,7 @@ to user preference. The same tools can be run on existing log files. %{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/sealert.service %{_datadir}/icons/hicolor +%dir %attr(0755,root,root) %{pkgpythondir} %{pkgpythondir}/browser.py* %{pkgpythondir}/gui_utils.py* %{pkgpythondir}/email_dialog.py* @@ -62,7 +62,6 @@ touch --no-create %{_datadir}/icons/hicolor || : %prep %setup -q -%patch0 -p1 -b .autogen %build %configure @@ -122,11 +121,13 @@ rm -rf %{buildroot} %{_bindir}/* %{_sbindir}/* %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}/avc_audit.py* +%{pkgpythondir}/avc_auparse.py* %{pkgpythondir}/config.py* %{pkgpythondir}/email_alert.py* %{pkgpythondir}/errcode.py* @@ -150,8 +151,21 @@ rm -rf %{buildroot} /etc/rc.d/init.d/%{name} %changelog -* Mon May 7 2007 John Dennis - 1.9.4-2 - - Resolves bug# 233760, fix autogen problem resulting in /usr/local prefix +* Tue Jun 12 2007 John Dennis - 1.9.7-1 + - Resolves Bug# 241739, this bug is the lead bug for several bug reports, + all consequences of the same problem, setroubleshootd/sealert when run + in a non latin language environment because of incompatibilities in + i18n encoding between components. + +* Wed May 30 2007 John Dennis - 1.9.6-1 + - add avc_auparse.py, now has option to use audit parsing library instead of + built-in audit parsing. + - fix bug in log file scanning and detail display update + - Resolves Bug# 238516, python pkg directory not owned + +* Wed Apr 25 2007 Dan Walsh - 1.9.5-1 + - Update translations + - Fix mislabeled file * Mon Mar 19 2007 Dan Walsh - 1.9.4-1 - Remove disable_trans boolean diff --git a/sources b/sources index 978a37e..c259659 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dcbe7f3db18ec3f30583897b562b5cb8 setroubleshoot-1.9.4.tar.gz +cb39cb419aa3f3709811e721ef1bde41 setroubleshoot-1.9.7.tar.gz