rpms/setroubleshoot/devel setroubleshoot-2.1.12-guiredesign.patch, NONE, 1.1 .cvsignore, 1.100, 1.101 setroubleshoot.spec, 1.134, 1.135 sources, 1.112, 1.113
Daniel J Walsh
dwalsh at fedoraproject.org
Tue Jun 16 21:36:12 UTC 2009
Author: dwalsh
Update of /cvs/extras/rpms/setroubleshoot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5136
Modified Files:
.cvsignore setroubleshoot.spec sources
Added Files:
setroubleshoot-2.1.12-guiredesign.patch
Log Message:
* Tue Jun 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.1-1
- Update to upstream
* New Gui
setroubleshoot-2.1.12-guiredesign.patch:
--- NEW FILE setroubleshoot-2.1.12-guiredesign.patch ---
diff -up setroubleshoot-2.1.12/gui/browser.glade.guiredesign setroubleshoot-2.1.12/gui/browser.glade
--- setroubleshoot-2.1.12/gui/browser.glade.guiredesign 2009-06-10 09:50:58.605308760 -0400
+++ setroubleshoot-2.1.12/gui/browser.glade 2009-06-10 10:42:52.488312815 -0400
@@ -0,0 +1,454 @@
+<?xml version="1.0"?>
+<glade-interface>
+ <!-- interface-requires gtk+ 2.16 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <widget class="GtkWindow" id="main_window">
+ <property name="visible">True</property>
+ <property name="border_width">15</property>
+ <property name="title" translatable="yes">SELinux Security Alerts</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center</property>
+ <property name="gravity">north</property>
+ <child>
+ <widget class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkHBox" id="hbox9">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="image">
+ <property name="visible">True</property>
+ <property name="pixel_size">58</property>
+ <property name="icon_name">gtk-dialog-warning</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="warning_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><span face="Helvetica" size='xx-large' weight='bold'>SELinux has detected suspicious behavior on your system</span></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="inner_frame">
+ <property name="width_request">710</property>
+ <property name="height_request">290</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <widget class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="access_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">15</property>
+ <property name="ypad">10</property>
+ <property name="label" translatable="yes"><span size='large' weight='bold' face='verdana'>A program has requested access it has not been granted</span></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="date_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">15</property>
+ <property name="label" translatable="yes"><span foreground='grey'>date</span></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="text_label">
+ <property name="width_request">650</property>
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">25</property>
+ <property name="ypad">5</property>
+ <property name="label" translatable="yes">No alerts available.</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">15</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkExpander" id="expander1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">1</property>
+ <signal name="activate" handler="on_expander1_activate"/>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-out</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="details_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Show full error output</property>
+ <property name="wrap">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox2">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <widget class="GtkButton" id="report_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip" translatable="yes">Reports a bug to bugzilla.redhat.com.</property>
+ <signal name="clicked" handler="on_report_button_clicked"/>
+ <child>
+ <widget class="GtkAlignment" id="alignment11">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox14">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image13">
+ <property name="visible">True</property>
+ <property name="stock">gtk-about</property>
+ <property name="icon-size">4</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label33">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Report this Bug</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="grant_button">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
[...4140 lines suppressed...]
+ except xmlrpclib.ProtocolError, e:
+ raise CommunicationError(str(e))
+ except xmlrpclib.Fault, e:
+ raise ValueError(str(e))
+ except socket.error, e:
+ raise CommunicationError(str(e))
+
+ def __init__(self, bugUrl=None, develVersion=None, defaultProduct=None):
+ AbstractFiler.__init__(self, bugUrl=bugUrl, develVersion=develVersion,
+ defaultProduct=defaultProduct)
+ self._bz = None
+
+ def login(self, username, password):
+ import bugzilla
+
+ try:
+ self._bz = bugzilla.Bugzilla(url=self.bugUrl)
+ retval = self._bz.login(username, password)
+ except socket.error, e:
+ raise CommunicationError(str(e))
+
+ if not retval:
+ raise LoginError(self.bugUrl, username)
+
+ return retval
+
+ def createbug(self, *args, **kwargs):
+ whiteboards = []
+
+ for (key, val) in kwargs.items():
+ if key.endswith("_whiteboard"):
+ wb = key.split("_")[0]
+ whiteboards.append((wb, val))
+ kwargs.pop(key)
+
+ if key == "platform":
+ platformLst = self.__withBugzillaDo(lambda b: b._proxy.Bug.legal_values({'field': 'platform'}))
+ if not val in platformLst['values']:
+ kwargs[key] = platformLst['values'][0]
+
+ bug = self.__withBugzillaDo(lambda b: b.createbug(**kwargs))
+ for (wb, val) in whiteboards:
+ bug.setwhiteboard(val, which=wb)
+
+ return BugzillaBug(self, bug=bug)
+
+ def getbug(self, id):
+ return BugzillaBug(self, bug=self.__withBugzillaDo(lambda b: b.getbug(id)))
+
+ def getbugs(self, idlist):
+ lst = self.__withBugzillaDo(lambda b: b.getbugs(idlist))
+ return map(lambda b: BugzillaBug(self, bug=b), lst)
+
+ def getproduct(self, prod):
+ details = self.__withBugzillaDo(lambda b: b.getproducts())
+ for d in details:
+ if d['name'] == prod:
+ return prod
+
+ if self.defaultProduct:
+ return self.defaultProduct
+ else:
+ raise ValueError, "The product %s is not valid and no defaultProduct is set." % prod
+
+ def getversion(self, ver, prod):
+ details = self.__withBugzillaDo(lambda b: b._proxy.bugzilla.getProductDetails(prod))
+ bugzillaVers = details[1]
+ bugzillaVers.sort()
+
+ if ver not in bugzillaVers:
+ if self.develVersion:
+ return self.develVersion
+ else:
+ return bugzillaVers[-1]
+ else:
+ return ver
+
+ def query(self, query):
+ lst = self.__withBugzillaDo(lambda b: b.query(query))
+ return map(lambda b: BugzillaBug(self, bug=b), lst)
+
+ def supportsFiling(self):
+ return True
+
+class BugzillaBug(AbstractBug):
+ def __withBugDo(self, fn):
+ try:
+ retval = fn(self._bug)
+ return retval
+ except xmlrpclib.ProtocolError, e:
+ raise CommunicationError(str(e))
+ except xmlrpclib.Fault, e:
+ raise ValueError(str(e))
+ except socket.error, e:
+ raise CommunicationError(str(e))
+
+ def __init__(self, filer, bug=None, *args, **kwargs):
+ import bugzilla
+
+ self.filer = filer
+
+ if not bug:
+ self._bug = bugzilla.Bug(self.filer, *args, **kwargs)
+ else:
+ self._bug = bug
+
+ def __str__(self):
+ return self._bug.__str__()
+
+ def __repr__(self):
+ return self._bug.__repr__()
+
+ def addCC(self, address):
+ try:
+ return self.filer._bz._updatecc(self._bug.bug_id, [address], 'add')
+ except xmlrpclib.ProtocolError, e:
+ raise CommunicationError(str(e))
+ except xmlrpclib.Fault, e:
+ raise ValueError(str(e))
+ except socket.error, e:
+ raise CommunicationError(str(e))
+
+ def addcomment(self, comment):
+ return self.__withBugDo(lambda b: b.addcomment(comment))
+
+ def attachfile(self, file, description, **kwargs):
+ try:
+ return self.filer._bz.attachfile(self._bug.bug_id, file, description, **kwargs)
+ except xmlrpclib.ProtocolError, e:
+ raise CommunicationError(str(e))
+ except xmlrpclib.Fault, e:
+ raise ValueError(str(e))
+ except socket.error, e:
+ raise CommunicationError(str(e))
+
+ def id(self):
+ return self._bug.bug_id
+
+ def close(self, resolution, dupeid=0, comment=''):
+ return self.__withBugDo(lambda b: b.close(resolution, dupeid=dupeid,
+ comment=comment))
+
+ def setstatus(self, status, comment=''):
+ return self.__withBugDo(lambda b: b.setstatus(status, comment=comment))
+
+ def setassignee(self, assigned_to='', reporter='', comment=''):
+ return self.__withBugDo(lambda b: b.setassignee(assigned_to=assigned_to,
+ reporter=reporter,
+ comment=comment))
+
+ def getwhiteboard(self, which='status'):
+ return self.__withBugDo(lambda b: b.getwhiteboard(which=which))
+
+ def appendwhiteboard(self, text, which='status'):
+ return self.__withBugDo(lambda b: b.appendwhiteboard(text, which=which))
+
+ def prependwhiteboard(self, text, which='status'):
+ return self.__withBugDo(lambda b: b.prependwhiteboard(text, which=which))
+
+ def setwhiteboard(self, text, which='status'):
+ return self.__withBugDo(lambda b: b.setwhiteboard(text, which=which))
diff -up setroubleshoot-2.1.12/src/Makefile.am.guiredesign setroubleshoot-2.1.12/src/Makefile.am
--- setroubleshoot-2.1.12/src/Makefile.am.guiredesign 2009-04-03 16:07:55.000000000 -0400
+++ setroubleshoot-2.1.12/src/Makefile.am 2009-06-10 09:50:58.616309307 -0400
@@ -11,6 +11,7 @@ PYTHON_FILES = \
email_alert.py \
email_dialog.py \
errcode.py \
+ filer.py \
gui_utils.py \
html_util.py \
log.py \
diff -up setroubleshoot-2.1.12/src/Makefile.in.guiredesign setroubleshoot-2.1.12/src/Makefile.in
--- setroubleshoot-2.1.12/src/Makefile.in.guiredesign 2009-06-02 11:07:27.000000000 -0400
+++ setroubleshoot-2.1.12/src/Makefile.in 2009-06-10 09:50:58.617308874 -0400
@@ -247,6 +247,7 @@ PYTHON_FILES = \
email_alert.py \
email_dialog.py \
errcode.py \
+ filer.py \
gui_utils.py \
html_util.py \
log.py \
diff -up setroubleshoot-2.1.12/src/signature.py.guiredesign setroubleshoot-2.1.12/src/signature.py
--- setroubleshoot-2.1.12/src/signature.py.guiredesign 2009-06-10 10:42:15.146313357 -0400
+++ setroubleshoot-2.1.12/src/signature.py 2009-06-10 10:42:28.336311489 -0400
@@ -1,4 +1,5 @@
# Authors: John Dennis <jdennis at redhat.com>
+# Thomas Liu <tliu at redhat.com>
#
# Copyright (C) 2006,2007,2008 Red Hat, Inc.
#
@@ -256,6 +257,7 @@ class SEFaultSignatureInfo(XmlSerialize)
'local_id' : {'XMLForm':'element' },
'users' : {'XMLForm':'element', 'list':'user', 'import_typecast':SEFaultSignatureUser, },
'level' : {'XMLForm':'element' },
+ 'fixable' : {'XMLForm':'element' },
}
merge_include = ['audit_event', 'tpath', 'src_rpm_list', 'tgt_rpm_list',
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- .cvsignore 3 Jun 2009 13:19:53 -0000 1.100
+++ .cvsignore 16 Jun 2009 21:35:41 -0000 1.101
@@ -16,3 +16,5 @@ setroubleshoot-2.1.9.tar.gz
setroubleshoot-2.1.10.tar.gz
setroubleshoot-2.1.11.tar.gz
setroubleshoot-2.1.12.tar.gz
+setroubleshoot-2.1.13.tar.gz
+setroubleshoot-2.1.14.tar.gz
Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- setroubleshoot.spec 8 Jun 2009 18:09:53 -0000 1.134
+++ setroubleshoot.spec 16 Jun 2009 21:35:41 -0000 1.135
@@ -1,13 +1,12 @@
Summary: Helps troubleshoot SELinux problems
Name: setroubleshoot
-Version: 2.1.12
-Release: 2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://fedorahosted.org/setroubleshoot
Source0: %{name}-%{version}.tar.gz
Source2: setroubleshoot.logrotate
-Patch: setroubleshoot-2.1.12-guiredesign.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl-XML-Parser
BuildRequires: intltool gettext python
@@ -17,12 +16,8 @@ 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: python-bugzilla
Requires: gnome-python2-gnomekeyring
-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
@@ -30,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
@@ -76,6 +72,10 @@ to user preference. The same tools can b
%{pkgpythondir}/gui_utils.py*
%{pkgpythondir}/run_cmd.py*
%{_bindir}/seapplet
+%config %{_datadir}/PolicyKit/policy/org.fedoraproject.setroubleshootfixit.policy
+%config %{_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
@@ -90,7 +90,6 @@ touch --no-create %{_datadir}/icons/hico
%prep
%setup -q
-%patch -p1 -b .guiredesign
%build
%configure
@@ -113,10 +112,13 @@ Requires: %{name}-plugins >= 2.0.4
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
@@ -199,6 +201,13 @@ Setroubleshoot documentation package
%doc %{pkgdocdir}
%changelog
+* Tue Jun 16 2009 Dan Walsh <dwalsh at redhat.com> - 2.2.1-1
+- Update to upstream
+ * New Gui
+
+* Wed Jun 10 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.13-2
+- Fix handling of PATH with locatepwd
+
* Mon Jun 8 2009 Thomas Liu <tliu at redhat.com> - 2.1.12-2
- Redesign of GUI
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- sources 3 Jun 2009 13:19:53 -0000 1.112
+++ sources 16 Jun 2009 21:35:41 -0000 1.113
@@ -1 +1 @@
-8bfbdaecc9bc5d1ad0859b7ea0a9cc54 setroubleshoot-2.1.12.tar.gz
+ba2296f3e5b74ce3eb5298251aa5eff3 setroubleshoot-2.1.14.tar.gz
More information about the fedora-extras-commits
mailing list