From b67978a729c610582505b2b17506464d76266340 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 11 Aug 2008 15:58:06 +0000 Subject: [PATCH] * Mon Aug 11 2008 Dan Walsh 2.0.54-6 - Add missing html_util.py file --- policycoreutils-gui.patch | 304 +++++++++++++++++++++++++++++--------- policycoreutils.spec | 5 +- 2 files changed, 240 insertions(+), 69 deletions(-) diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch index 2fbf239..600f822 100644 --- a/policycoreutils-gui.patch +++ b/policycoreutils-gui.patch @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.52/gui/Makefile +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.54/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/Makefile 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/Makefile 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,36 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -38,9 +38,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreu +indent: + +relabel: -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.52/gui/booleansPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.54/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/booleansPage.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/booleansPage.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,237 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -279,9 +279,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py poli + self.load(self.filter) + return True + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.52/gui/fcontextPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.54/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/fcontextPage.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/fcontextPage.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,217 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -500,9 +500,177 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py poli + self.store.set_value(iter, SPEC_COL, fspec) + self.store.set_value(iter, FTYPE_COL, ftype) + self.store.set_value(iter, TYPE_COL, "%s:%s" % (type, mls)) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.52/gui/lockdown.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.54/gui/html_util.py +--- nsapolicycoreutils/gui/html_util.py 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.54/gui/html_util.py 2008-08-11 11:54:46.000000000 -0400 +@@ -0,0 +1,164 @@ ++# Authors: John Dennis ++# ++# Copyright (C) 2007 Red Hat, Inc. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++# ++ ++ ++__all__ = [ ++ 'escape_html', ++ 'unescape_html', ++ 'html_to_text', ++ ++ 'html_document', ++] ++ ++import htmllib ++import formatter as Formatter ++import string ++from types import * ++import StringIO ++ ++#------------------------------------------------------------------------------ ++ ++class TextWriter(Formatter.DumbWriter): ++ def __init__(self, file=None, maxcol=80, indent_width=4): ++ Formatter.DumbWriter.__init__(self, file, maxcol) ++ self.indent_level = 0 ++ self.indent_width = indent_width ++ self._set_indent() ++ ++ def _set_indent(self): ++ self.indent_col = self.indent_level * self.indent_width ++ self.indent = ' ' * self.indent_col ++ ++ def new_margin(self, margin, level): ++ self.indent_level = level ++ self._set_indent() ++ ++ def send_label_data(self, data): ++ data = data + ' ' ++ if len(data) > self.indent_col: ++ self.send_literal_data(data) ++ else: ++ offset = self.indent_col - len(data) ++ self.send_literal_data(' ' * offset + data) ++ ++ def send_flowing_data(self, data): ++ if not data: return ++ atbreak = self.atbreak or data[0] in string.whitespace ++ col = self.col ++ maxcol = self.maxcol ++ write = self.file.write ++ col = self.col ++ if col == 0: ++ write(self.indent) ++ col = self.indent_col ++ for word in data.split(): ++ if atbreak: ++ if col + len(word) >= maxcol: ++ write('\n' + self.indent) ++ col = self.indent_col ++ else: ++ write(' ') ++ col = col + 1 ++ write(word) ++ col = col + len(word) ++ atbreak = 1 ++ self.col = col ++ self.atbreak = data[-1] in string.whitespace ++ ++class HTMLParserAnchor(htmllib.HTMLParser): ++ ++ def __init__(self, formatter, verbose=0): ++ htmllib.HTMLParser.__init__(self, formatter, verbose) ++ ++ def anchor_bgn(self, href, name, type): ++ self.anchor = href ++ ++ def anchor_end(self): ++ if self.anchor: ++ self.handle_data(' (%s) ' % self.anchor) ++ self.anchor = None ++ ++#------------------------------------------------------------------------------ ++ ++def escape_html(s): ++ if s is None: return None ++ s = s.replace("&", "&") # Must be done first! ++ s = s.replace("<", "<") ++ s = s.replace(">", ">") ++ s = s.replace("'", "'") ++ s = s.replace('"', """) ++ return s ++ ++ ++def unescape_html(s): ++ if s is None: return None ++ if '&' not in s: ++ return s ++ s = s.replace("<", "<") ++ s = s.replace(">", ">") ++ s = s.replace("'", "'") ++ s = s.replace(""", '"') ++ s = s.replace("&", "&") # Must be last ++ return s ++ ++def html_to_text(html, maxcol=80): ++ try: ++ buffer = StringIO.StringIO() ++ formatter = Formatter.AbstractFormatter(TextWriter(buffer, maxcol)) ++ parser = HTMLParserAnchor(formatter) ++ parser.feed(html) ++ parser.close() ++ text = buffer.getvalue() ++ buffer.close() ++ return text ++ except Exception, e: ++ log_program.error('cannot convert html to text: %s' % e) ++ return None ++ ++def html_document(*body_components): ++ '''Wrap the body components in a HTML document structure with a valid header. ++ Accepts a variable number of arguments of of which canb be: ++ * string ++ * a sequences of strings (tuple or list). ++ * a callable object taking no parameters and returning a string or sequence of strings. ++ ''' ++ head = '\n \n \n \n \n' ++ tail = '\n \n' ++ ++ doc = head ++ ++ for body_component in body_components: ++ if type(body_component) is StringTypes: ++ doc += body_component ++ elif type(body_component) in [TupleType, ListType]: ++ for item in body_component: ++ doc += item ++ elif callable(body_component): ++ result = body_component() ++ if type(result) in [TupleType, ListType]: ++ for item in result: ++ doc += item ++ else: ++ doc += result ++ else: ++ doc += body_component ++ ++ doc += tail ++ return doc ++ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.54/gui/lockdown.glade --- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/lockdown.glade 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/lockdown.glade 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,771 @@ + + @@ -1275,9 +1443,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade polic + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.52/gui/lockdown.gladep +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.54/gui/lockdown.gladep --- nsapolicycoreutils/gui/lockdown.gladep 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/lockdown.gladep 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/lockdown.gladep 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,7 @@ + + @@ -1286,9 +1454,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep poli + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.52/gui/lockdown.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.54/gui/lockdown.py --- nsapolicycoreutils/gui/lockdown.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/lockdown.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/lockdown.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,382 @@ +#!/usr/bin/python +# @@ -1672,9 +1840,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policyco + + app = booleanWindow() + app.stand_alone() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.52/gui/loginsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.54/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/loginsPage.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/loginsPage.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,185 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1861,9 +2029,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policy + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.52/gui/mappingsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.54/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/mappingsPage.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/mappingsPage.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,56 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1921,9 +2089,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py poli + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.52/gui/modulesPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.54/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/modulesPage.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/modulesPage.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,195 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -2120,9 +2288,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py polic + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.52/gui/polgen.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.54/gui/polgen.glade --- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/polgen.glade 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/polgen.glade 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,3284 @@ + + @@ -5408,9 +5576,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policyc + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.52/gui/polgen.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.54/gui/polgen.py --- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/polgen.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/polgen.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,925 @@ +#!/usr/bin/python +# @@ -6337,9 +6505,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore + sys.exit(0) + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.52/gui/polgengui.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.54/gui/polgengui.py --- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/polgengui.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/polgengui.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,623 @@ +#!/usr/bin/python -E +# @@ -6964,9 +7132,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.52/gui/portsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.54/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/portsPage.py 2008-07-08 15:48:27.000000000 -0400 ++++ policycoreutils-2.0.54/gui/portsPage.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,259 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -7227,9 +7395,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policyc + + return True + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.52/gui/selinux.tbl +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.54/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/selinux.tbl 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/selinux.tbl 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,234 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_daemons_dump_core _("Admin") _("Allow all daemons to write corefiles to /") @@ -7465,9 +7633,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policyco +webadm_manage_user_files _("HTTPD Service") _("Allow SELinux webadm user to manage unprivileged users home directories") +webadm_read_user_files _("HTTPD Service") _("Allow SELinux webadm user to read unprivileged users home directories") + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.52/gui/semanagePage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.54/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/semanagePage.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/semanagePage.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,169 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -7638,9 +7806,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py poli + self.load(self.filter) + return True + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.52/gui/statusPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.54/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/statusPage.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/statusPage.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,191 @@ +# statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -7833,9 +8001,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policy + return self.types[self.selinuxTypeOptionMenu.get_active()] + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.52/gui/system-config-selinux.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.54/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/system-config-selinux.glade 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/system-config-selinux.glade 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,3221 @@ + + @@ -11058,9 +11226,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.52/gui/system-config-selinux.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.54/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/system-config-selinux.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/system-config-selinux.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,187 @@ +#!/usr/bin/python +# @@ -11249,9 +11417,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinu + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.52/gui/templates/__init__.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.54/gui/templates/__init__.py --- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/__init__.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/__init__.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,18 @@ +# +# Copyright (C) 2007 Red Hat, Inc. @@ -11271,9 +11439,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.p +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.52/gui/templates/boolean.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.54/gui/templates/boolean.py --- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/boolean.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/boolean.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,40 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11315,9 +11483,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py +') +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.52/gui/templates/etc_rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.54/gui/templates/etc_rw.py --- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/etc_rw.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/etc_rw.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11448,9 +11616,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_etc_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.52/gui/templates/executable.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.54/gui/templates/executable.py --- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/executable.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/executable.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,327 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11779,9 +11947,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable +EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.52/gui/templates/network.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.54/gui/templates/network.py --- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/network.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/network.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,80 @@ +te_port_types=""" +type TEMPLATETYPE_port_t; @@ -11863,9 +12031,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.52/gui/templates/rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.54/gui/templates/rw.py --- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/rw.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/rw.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,128 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -11995,9 +12163,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py poli +fc_dir=""" +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.52/gui/templates/script.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.54/gui/templates/script.py --- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/script.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/script.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,105 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12104,9 +12272,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py +# Adding roles to SELinux user USER +/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.52/gui/templates/semodule.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.54/gui/templates/semodule.py --- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/semodule.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/semodule.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,41 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12149,9 +12317,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.p +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.52/gui/templates/tmp.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.54/gui/templates/tmp.py --- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/tmp.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/tmp.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,97 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12250,9 +12418,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py pol + TEMPLATETYPE_manage_tmp($1) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.52/gui/templates/user.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.54/gui/templates/user.py --- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/user.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/user.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,182 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12436,9 +12604,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py po +te_newrole_rules=""" +seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t }) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.52/gui/templates/var_lib.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.54/gui/templates/var_lib.py --- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_lib.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/var_lib.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,158 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12598,9 +12766,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.52/gui/templates/var_log.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.54/gui/templates/var_log.py --- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_log.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/var_log.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,110 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12712,9 +12880,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.52/gui/templates/var_run.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.54/gui/templates/var_run.py --- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_run.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/var_run.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,118 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12834,9 +13002,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.52/gui/templates/var_spool.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.54/gui/templates/var_spool.py --- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/templates/var_spool.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/templates/var_spool.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,129 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -12967,9 +13135,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool. +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.52/gui/translationsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.54/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/translationsPage.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/translationsPage.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,118 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -13089,9 +13257,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.52/gui/usersPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.54/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/gui/usersPage.py 2008-07-03 16:17:11.000000000 -0400 ++++ policycoreutils-2.0.54/gui/usersPage.py 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,150 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006,2007,2008 Red Hat, Inc. diff --git a/policycoreutils.spec b/policycoreutils.spec index ad1de41..fa73ddf 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.54 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,9 @@ if [ "$1" -ge "1" ]; then fi %changelog +* Mon Aug 11 2008 Dan Walsh 2.0.54-6 +- Add missing html_util.py file + * Thu Aug 7 2008 Dan Walsh 2.0.54-5 - Fixes for multiple transactions