dist-git conversion

#2781)

.gitignore

@@ -12,3 +12,7 @@ setroubleshoot-2.1.5.tar.gz
 setroubleshoot-2.1.6.tar.gz
 setroubleshoot-2.1.7.tar.gz
 setroubleshoot-2.1.8.tar.gz
+setroubleshoot-2.1.9.tar.gz
+setroubleshoot-2.1.10.tar.gz
+setroubleshoot-2.1.11.tar.gz
+setroubleshoot-2.1.12.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: setroubleshoot
-# $Id: Makefile,v 1.1 2006/07/18 19:48:52 jdennis Exp $
-NAME := setroubleshoot
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

setroubleshoot-analyze.patch

@@ -0,0 +1,12 @@
+diff -up setroubleshoot-2.0.12/src/analyze.py~ setroubleshoot-2.0.12/src/analyze.py
+--- setroubleshoot-2.0.12/src/analyze.py~	2009-05-21 13:41:16.000000000 -0400
++++ setroubleshoot-2.0.12/src/analyze.py	2009-05-21 13:42:08.000000000 -0400
+@@ -168,7 +168,7 @@ class Analyze(object):
+ 
+         if profile:
+             statistics.end()
+-            log_stats.info("analyze_avc() audit_event=%s\nstatistics=%s", audit_event, statistics)
++            log_stats.info("analyze_avc() avc=%s\nstatistics=%s", avc, statistics)
+     
+ #------------------------------------------------------------------------------
+ 

setroubleshoot-log.patch

@@ -0,0 +1,48 @@
+diff -up setroubleshoot-2.1.14/src/sedispatch.c.log setroubleshoot-2.1.14/src/sedispatch.c
+--- setroubleshoot-2.1.14/src/sedispatch.c.log	2009-08-18 08:43:43.000000000 -0400
++++ setroubleshoot-2.1.14/src/sedispatch.c	2009-08-18 08:44:04.000000000 -0400
+@@ -85,7 +85,7 @@ static 	DBusConnection* init_dbus(void) 
+ 	// connect to the bus
+ 	conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
+ 	if (dbus_error_is_set(&err)) { 
+-		syslog(LOG_DAEMON, "Connection Error (%s): AVC Will be dropped\n", err.message); 
++		syslog(LOG_ERR, "Connection Error (%s): AVC Will be dropped\n", err.message); 
+ 		dbus_error_free(&err); 
+ 	}
+ 	return conn;
+@@ -108,7 +108,7 @@ int main(int argc __attribute__((unused)
+ 	/* Initialize the auparse library */
+ 	au = auparse_init(AUSOURCE_FEED, 0);
+ 	if (au == NULL) {
+-		syslog(LOG_DAEMON,"sedispatch is exiting due to auparse init errors");
++		syslog(LOG_ERR,"sedispatch is exiting due to auparse init errors");
+ 		return -1;
+ 	}
+ 
+@@ -135,7 +135,7 @@ int main(int argc __attribute__((unused)
+ 	if (stop)
+ 		syslog(LOG_DEBUG,"sedispatch is exiting on stop request\n");
+ 	else
+-		syslog(LOG_DAEMON,"sedispatch is exiting on stdin EOF\n");
++		syslog(LOG_ERR,"sedispatch is exiting on stdin EOF\n");
+ 
+ 	return 0;
+ }
+@@ -159,7 +159,7 @@ static void dump_whole_record(auparse_st
+ 	const char *tcon = auparse_find_field(au, "tcontext");
+ 	if (is_setroubleshoot(scon) ||
+ 	    is_setroubleshoot(tcon)) {
+-		syslog(LOG_DAEMON, "AVC Message for setroubleshoot, dropping message"); 
++		syslog(LOG_ERR, "AVC Message for setroubleshoot, dropping message"); 
+ 		return;
+ 	}
+ 			
+@@ -168,7 +168,7 @@ static void dump_whole_record(auparse_st
+ 	  len = asprintf(&tmp, "%s%s\n", 
+ 			 tmp, auparse_get_record_text(au));
+ 	  if (len < 0) {
+-	    syslog(LOG_DAEMON,"sedispatch out of memory\n");
++	    syslog(LOG_ERR,"sedispatch out of memory\n");
+ 	    free(tmp);
+ 	    return;
+ 	  }

setroubleshoot-lstat.patch

@@ -0,0 +1,12 @@
+diff -up setroubleshoot-2.1.14/src/audit_data.py.lstat setroubleshoot-2.1.14/src/audit_data.py
+--- setroubleshoot-2.1.14/src/audit_data.py.lstat	2009-07-01 17:04:02.000000000 -0400
++++ setroubleshoot-2.1.14/src/audit_data.py	2009-07-01 17:04:10.000000000 -0400
+@@ -715,7 +715,7 @@ class AVC:
+                     inode = int(self.avc_record.get_field("ino"))
+                     for file in output.split("\n"):
+                         try:
+-                            if int(os.stat(file).st_ino) == inode:
++                            if int(os.lstat(file).st_ino) == inode:
+                                 path = file
+                                 break
+                         except:

setroubleshoot.spec

@@ -1,12 +1,14 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 2.1.9
-Release: 1%{?dist}
+Version: 2.1.14
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
 Source0: %{name}-%{version}.tar.gz
 Source2: setroubleshoot.logrotate
+patch: setroubleshoot-lstat.patch
+patch2: setroubleshoot-log.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: intltool gettext python
@@ -16,10 +18,6 @@ Requires: %{name}-plugins >= 2.0.4
 Requires: pygtk2 >= 2.9.2
 Requires: gnome-python2-gnome, gnome-python2-canvas
 Requires: gnome-python2-gtkhtml2
-Requires: dbus libnotify
-Requires: dbus-python
-Requires: libxml2-python
-Requires: libselinux-python  >= 1.30.15-1
 Requires(post): /usr/bin/update-desktop-database
 Requires(post): dbus
 Requires(postun): /usr/bin/update-desktop-database
@@ -27,6 +25,7 @@ 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}
 
 %if 0%{?fedora}
 BuildRequires: xdg-utils
@@ -86,6 +85,8 @@ touch --no-create %{_datadir}/icons/hicolor
 
 %prep
 %setup -q
+%patch -p1 -b .lstat
+%patch2 -p1 -b .log
 
 %build
 %configure
@@ -109,9 +110,13 @@ Requires: audit >= 1.2.6-3
 Requires: audit-libs-python >= 1.2.6-3
 Requires: pygobject2
 Requires: dbus-python 
+Requires: dbus libnotify
+Requires: dbus-python
 Requires: libxml2-python
 Requires: rpm-python
 Requires: gtk2 libnotify
+Requires: libselinux-python  >= 1.30.15-1
+Requires: policycoreutils-python 
 BuildRequires: intltool gettext python
 
 Requires(post):   /sbin/chkconfig
@@ -194,8 +199,33 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
-* Mon Apr 6 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.9-1
+* Tue Aug 18 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.14-3
+- Change sedispatch to complain in /var/log/messages rather then the console.
+
+* Wed Jul 1 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.14-2
+- Change to use os.lstat to look at links
+
+* Wed Jun 10 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.14-1
+- Fix locate patch
+
+* Wed Jun 10 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.13-2
+- Add requires policycoreutils-python
+
+* Wed Jun 10 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.13-1
+- Fix handling of PATH with locatepwd
+
+* Wed Jun 3 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.12-1
+- Fix handling of PATH 
+
+* Thu May 21 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.11-1
+- Fix crash when gathering stats
+
+* Wed May 6 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.10-1
+- Make sure setroubleshoot exists after 10 seconds 
+
+* Mon May 4 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.9-1
 - Change multiple signatures from exception to warning
+- Update links on fedorahosted.org
 
 * Fri Apr 3 2009 Dan Walsh <dwalsh@redhat.com> - 2.1.8-1
 - Fix sealert segfault

sources

@@ -1 +1 @@
-9703bbdf2967967a94631785ee05cae2  setroubleshoot-2.1.8.tar.gz
+ba2296f3e5b74ce3eb5298251aa5eff3  setroubleshoot-2.1.14.tar.gz