From fbe8e2116430aaa26afa3830ec3eccec9d4f449e Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Thu, 18 Nov 2010 10:01:25 -0500 Subject: [PATCH] - Fix crash in sealert with missing log_* - Report bugzillas in english --- .gitignore | 1 + setroubleshoot.spec | 48 +++++++++++++++++++-------------------------- sources | 3 +-- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 899cf59..3e50171 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,4 @@ setroubleshoot-2.2.93.tar.gz /setroubleshoot-3.0.6.tar.gz /setroubleshoot-3.0.7.tar.gz /setroubleshoot-3.0.8.tar.gz +/setroubleshoot-3.0.9.tar.gz diff --git a/setroubleshoot.spec b/setroubleshoot.spec index f0863df..ae5780b 100644 --- a/setroubleshoot.spec +++ b/setroubleshoot.spec @@ -1,6 +1,6 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 3.0.8 +Version: 3.0.9 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -17,22 +17,19 @@ Requires: %{name}-plugins >= 2.0.4 Requires: pygtk2 >= 2.9.2 Requires: gnome-python2-gnome, gnome-python2-canvas Requires: gnome-python2-gtkhtml2 -Requires: gtk2 libnotify -Requires: dbus libnotify +Requires: gtk2 +Requires: dbus Requires: dbus-python Requires: pygobject2 Requires: report-gtk Requires: polkit Requires: yum Requires: gnome-python2-gnomekeyring -Requires(post): /usr/bin/update-desktop-database +Requires(post): desktop-file-utils Requires(post): dbus -Requires(postun): /usr/bin/update-desktop-database +Requires(postun): desktop-file-utils Requires(postun): dbus Requires: notify-python -%{?fc7:Requires: selinux-policy-base >= 2.6.4-45} -%{?fc8:Requires: selinux-policy-base >= 3.0.7-10} -%{?fc11:Requires: selinux-policy-base >= 3.6.12-48} BuildRequires: xdg-utils Requires: xdg-utils @@ -51,7 +48,7 @@ Requires: xdg-utils %global pkgdatabase %{pkgvardatadir}/audit_listener_database.xml %description -setroubleshoot gui. Application that allows you to view setroubleshoot-server +setroubleshoot GUI. Application that allows you to view setroubleshoot-server messages. Provides tools to help diagnose SELinux problems. When AVC messages are generated an alert can be generated that will give information @@ -61,8 +58,8 @@ to user preference. The same tools can be run on existing log files. %files %defattr(-,root,root,-) %{pkgguidir} -%{_sysconfdir}/xdg/autostart/* -%{_datadir}/applications/*.desktop +%config(noreplace) %{_sysconfdir}/xdg/autostart/* +%config %{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/sealert.service %{_datadir}/icons/hicolor %dir %attr(0755,root,root) %{pkgpythondir} @@ -71,12 +68,12 @@ to user preference. The same tools can be run on existing log files. %{pkgpythondir}/gui_utils.py* %{pkgpythondir}/run_cmd.py* %{_bindir}/seapplet -%config %{_datadir}/polkit-1/actions/org.fedoraproject.setroubleshootfixit.policy -%config %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.SetroubleshootFixit.conf +%{_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 %post -/usr/bin/update-desktop-database %{_datadir}/applications 2> /dev/null +/usr/bin/desktop-file-install %{_datadir}/applications 2> /dev/null touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : dbus-send --system /com/redhat/setroubleshootd com.redhat.SEtroubleshootdIface.restart string:'rpm install' >/dev/null 2>&1 || : @@ -131,10 +128,6 @@ about the problem and help track its resolution. Alerts can be configured to user preference. The same tools can be run on existing log files. %post server -if [ -f %{pkgdatabase} ]; then - chown root:root %{pkgdatabase} >/dev/null 2>&1 - chmod 600 %{pkgdatabase} >/dev/null 2>&1 -fi /sbin/service auditd reload >/dev/null 2>&1 || : %postun server @@ -151,6 +144,7 @@ rm -rf %{buildroot} %files server -f %{name}.lang %defattr(-,root,root,-) +%doc %{pkgdocdir} %{_bindir}/sealert %{_sbindir}/sedispatch %{_sbindir}/setroubleshootd @@ -178,15 +172,15 @@ rm -rf %{buildroot} %{pkgpythondir}/uuid.py* %{pkgpythondir}/xml_serialize.py* %{pkgpythondir}/sesearch/__init__.py* -%{pkgpythondir}/sesearch/_sesearch.so -%{pkgpythondir}/default_encoding_utf8.so +%attr(0755,root,root) %{pkgpythondir}/sesearch/_sesearch.so +%attr(0755,root,root) %{pkgpythondir}/default_encoding_utf8.so %dir %{pkgdatadir} %{pkgdatadir}/SetroubleshootFixit.py* %{pkgdatadir}/updater.py* -%config %{pkgconfigdir}/%{name}.cfg +%config(noreplace) %{pkgconfigdir}/%{name}.conf %dir %{pkglogdir} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Setroubleshootd.conf +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.fedoraproject.Setroubleshootd.conf %dir %{pkgrundir} %dir %{pkgvardatadir} %ghost %attr(0600,root,root) %{pkgdatabase} @@ -194,20 +188,20 @@ rm -rf %{buildroot} %{_mandir}/man8/sealert.8.gz %{_mandir}/man8/sedispatch.8.gz %{_mandir}/man8/setroubleshootd.8.gz -/etc/audisp/plugins.d/sedispatch.conf +%config /etc/audisp/plugins.d/sedispatch.conf %{_datadir}/dbus-1/system-services/org.fedoraproject.Setroubleshootd.service %package doc Summary: Setroubleshoot documentation Group: System Environment/Base -Requires(pre): setroubleshoot = %{version}-%{release} +Requires(pre): setroubleshoot-server = %{version}-%{release} %description doc Setroubleshoot documentation package %files doc %defattr(-,root,root,-) -%doc %{pkgdocdir} +%{pkgdocdir}/setroubleshoot* %changelog * Wed Nov 17 2010 - 3.0.8-1 @@ -221,8 +215,6 @@ Setroubleshoot documentation package * Wed Nov 10 2010 - 3.0.6-1 - Fix handling of report_count and ignore button -illa, since report will do the right thing -Resolves: #576927 * Mon Mar 15 2010 Dan Walsh - 2.2.69-1 - Add white level, so plugins can tell setroubleshoot to ignore avc @@ -255,7 +247,7 @@ Resolves: #576927 * Tue Jan 26 2010 Dan Walsh - 2.2.61-1 - Add Gavin Romig-Koch report patch - Cleanup Browser window -- Remove avc messages that are allowed or dontaudited in current policy +- Remove avc messages that are allowed or dontaudited in current poilcy * Fri Jan 22 2010 Dan Walsh - 2.2.60-1 - Remove untest attachfile code diff --git a/sources b/sources index 1fd17e6..1ad5a10 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -09f80077b428799180484bd08f0f3ee3 setroubleshoot-3.0.7.tar.gz -ce0c93379f7d70f8cde0f803e19f84f2 setroubleshoot-3.0.8.tar.gz +ad324fc4501e248daa207b998a5dbc3d setroubleshoot-3.0.9.tar.gz