From b0a90c50e7413e9507d36242d99be402a6f9b253 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 20 Feb 2007 22:08:56 +0000 Subject: [PATCH] auto-import setroubleshoot-1.9.1-1 on branch devel from setroubleshoot-1.9.1-1.src.rpm --- .cvsignore | 2 +- setroubleshoot.spec | 111 ++++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 79 insertions(+), 36 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c54f8a..ed20b7b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -setroubleshoot-1.8.18.tar.gz +setroubleshoot-1.9.1.tar.gz diff --git a/setroubleshoot.spec b/setroubleshoot.spec index 138772e..619de97 100644 --- a/setroubleshoot.spec +++ b/setroubleshoot.spec @@ -1,6 +1,6 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 1.8.18 +Version: 1.9.1 Release: 1%{?dist} License: GPL Group: Applications/System @@ -11,7 +11,15 @@ Source2: setroubleshoot.logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl-XML-Parser +Requires: %{name}-server = %{version}-%{release} +Requires: pygtk2 >= 2.9.2 +Requires: gnome-python2, pygtk2-libglade, gnome-python2-canvas +Requires: usermode, rhpl +BuildRequires: desktop-file-utils Requires: gnome-python2-gtkhtml2 +Requires(post): /usr/bin/update-desktop-database +Requires(postun): /usr/bin/update-desktop-database +Requires: notify-python %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -24,30 +32,29 @@ Requires: gnome-python2-gtkhtml2 %define pkgconfigdir %{_sysconfdir}/%{name} %define pkglogdir %{_localstatedir}/log/%{name} -Requires: audit >= 1.2.6-3 -Requires: audit-libs-python >= 1.2.6-3 -Requires: libselinux >= 1.30.15-1 -Requires: pygtk2 >= 2.9.2 -Requires: notify-python -Requires: pygtk2-libglade - -BuildRequires: intltool gettext python - -Requires(post): /sbin/chkconfig -Requires(post): /sbin/service -Requires(post): /usr/bin/update-desktop-database - -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service - -Requires(postun): /usr/bin/update-desktop-database - %description +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 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. +%files +%{_sysconfdir}/xdg/autostart/* +%{_datadir}/applications/*.desktop +%{_datadir}/dbus-1/services/sealert.service +%{pkgpythondir}/browser.py* +%{pkgpythondir}/gui_utils.py* +%{pkgpythondir}/email_dialog.py* +%{pkgpythondir}/runcmd.py* + +%postun +/usr/bin/update-desktop-database %{_datadir}/applications + +%post +/usr/bin/update-desktop-database %{_datadir}/applications + %prep %setup -q @@ -55,7 +62,7 @@ to user preference. The same tools can be run on existing log files. %configure make -%install +%install rm -rf %{buildroot} make DESTDIR=%{buildroot} install %{__install} -D -m755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/%{name} @@ -64,13 +71,34 @@ touch %{buildroot}%{pkgvardatadir}/audit_listener_database.xml touch %{buildroot}%{pkgvardatadir}/email_alert_recipients %find_lang %{name} -%post +%package server +Summary: SELinux troubleshoot server +Group: Applications/System + +Requires: audit >= 1.2.6-3 +Requires: audit-libs-python >= 1.2.6-3 +Requires: libselinux >= 1.30.15-1 + +BuildRequires: intltool gettext python + +Requires(post): /sbin/chkconfig +Requires(post): /sbin/service + +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service + +%description server +Provides tools to help diagnose SELinux problems. When AVC messages +are generated an alert can be generated that will give information +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 [ -f %{pkgvardatadir}/database.xml ] && chmod 644 %{pkgvardatadir}/database.xml -/usr/bin/update-desktop-database %{_datadir}/applications /sbin/chkconfig --add %{name} /sbin/service %{name} condrestart >/dev/null 2>&1 || : -%preun +%preun server if [ $1 = 0 ]; then /sbin/service %{name} stop >/dev/null 2>&1 /sbin/chkconfig --del %{name} @@ -79,20 +107,32 @@ fi %triggerpostun -- setroubleshoot <= 0.35-1 /sbin/service %{name} cleardb -%postun -/usr/bin/update-desktop-database %{_datadir}/applications - -%clean +%clean rm -rf %{buildroot} -%files -f %{name}.lang +%files server -f %{name}.lang %defattr(-,root,root,-) %doc %{pkgdocdir} %{_bindir}/* %{_sbindir}/* -%{pkgpythondir} -%{pkgdatadir} %dir %attr(0755,root,root) %{pkgconfigdir} +%{pkgpythondir}/Plugin.py* +%{pkgpythondir}/__init__.py* +%{pkgpythondir}/access_control.py* +%{pkgpythondir}/analyze.py* +%{pkgpythondir}/avc_audit.py* +%{pkgpythondir}/cmd_job.py* +%{pkgpythondir}/config.py* +%{pkgpythondir}/email_alert.py* +%{pkgpythondir}/errcode.py* +%{pkgpythondir}/log.py* +%{pkgpythondir}/rpc.py* +%{pkgpythondir}/rpc_interfaces.py* +%{pkgpythondir}/server.py* +%{pkgpythondir}/signature.py* +%{pkgpythondir}/util.py* +%{pkgpythondir}/uuid.py* +%{pkgdatadir} %config(noreplace) %{pkgconfigdir}/%{name}.cfg %dir %{pkglogdir} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} @@ -103,14 +143,17 @@ rm -rf %{buildroot} %{_mandir}/man8/sealert.8.gz /etc/rc.d/init.d/%{name} -%{_sysconfdir}/xdg/autostart/* -%{_datadir}/applications/*.desktop -%{_datadir}/dbus-1/services/sealert.service %changelog +* Fri Feb 16 2007 Dan Walsh - 1.9.1-1 +- Split into server and gui packages + +* Fri Feb 16 2007 Dan Walsh - 1.8.19-1 +- Remove use of ctypes in uuid, which is causing bad avc messages + * Fri Feb 9 2007 Dan Walsh - 1.8.18-1 - Remove avc from Plugin.py - +p * Wed Feb 7 2007 Dan Walsh - 1.8.17-1 - Remove tempfile handling in util.py. Causes lots of avc's and is not used diff --git a/sources b/sources index d105d74..d24c152 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81c29a5fe4344eeb91c3bcc75005f838 setroubleshoot-1.8.18.tar.gz +78627d34ce6c66b225a637a67fac8aee setroubleshoot-1.9.1.tar.gz