rpms/policycoreutils/devel policycoreutils-gui.patch, 1.76, 1.77 policycoreutils-rhat.patch, 1.393, 1.394 policycoreutils.spec, 1.560, 1.561
Daniel J Walsh
dwalsh at fedoraproject.org
Fri Oct 17 22:05:44 UTC 2008
- Previous message: rpms/selinux-policy/devel .cvsignore, 1.152, 1.153 sources, 1.169, 1.170
- Next message: rpms/nted/devel .cvsignore, 1.5, 1.6 nted.spec, 1.5, 1.6 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10645
Modified Files:
policycoreutils-gui.patch policycoreutils-rhat.patch
policycoreutils.spec
Log Message:
* Fri Oct 17 2008 Dan Walsh <dwalsh at redhat.com> 2.0.57-3
- Fix text in newrole
- Fix revertbutton on booleans page in system-config-selinux
policycoreutils-gui.patch:
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- policycoreutils-gui.patch 9 Sep 2008 19:14:39 -0000 1.76
+++ policycoreutils-gui.patch 17 Oct 2008 22:05:43 -0000 1.77
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.55/gui/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.57/gui/Makefile
--- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/Makefile 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/Makefile 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,37 @@
+# Installation directories.
+PREFIX ?= ${DESTDIR}/usr
@@ -39,10 +39,10 @@
+indent:
+
+relabel:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.55/gui/booleansPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.57/gui/booleansPage.py
--- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/booleansPage.py 2008-08-29 14:34:59.000000000 -0400
-@@ -0,0 +1,237 @@
++++ policycoreutils-2.0.57/gui/booleansPage.py 2008-10-17 11:57:42.000000000 -0400
+@@ -0,0 +1,248 @@
+#
+# booleansPage.py - GUI for Booleans page in system-config-securitylevel
+#
@@ -148,6 +148,7 @@
+
+ self.revertButton = xml.get_widget("booleanRevertButton")
+ self.revertButton.set_sensitive(self.local)
++ self.revertButton.connect("clicked", self.on_revert_clicked)
+ listStore = gtk.ListStore(gobject.TYPE_STRING)
+ cell = gtk.CellRendererText()
+
@@ -200,6 +201,8 @@
+
+ def deleteDialog(self):
+ store, iter = self.booleansView.get_selection().get_selected()
++ if iter == None:
++ return
+ boolean = store.get_value(iter, BOOLEAN)
+ # change cursor
+ if boolean == None:
@@ -260,6 +263,14 @@
+ self.wait()
+ setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
+ commands.getstatusoutput(setsebool)
++ self.load(self.filter)
++ self.ready()
++
++ def on_revert_clicked(self, button):
++ self.wait()
++ setsebool="semanage boolean --deleteall"
++ commands.getstatusoutput(setsebool)
++ self.load(self.filter)
+ self.ready()
+
+ def on_lockdown_clicked(self, button):
@@ -280,9 +291,9 @@
+ self.load(self.filter)
+ return True
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.55/gui/fcontextPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.57/gui/fcontextPage.py
--- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/fcontextPage.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/fcontextPage.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,217 @@
+## fcontextPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -501,9 +512,9 @@
+ 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/html_util.py policycoreutils-2.0.55/gui/html_util.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/html_util.py policycoreutils-2.0.57/gui/html_util.py
--- nsapolicycoreutils/gui/html_util.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/html_util.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/html_util.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,164 @@
+# Authors: John Dennis <jdennis at redhat.com>
+#
@@ -669,9 +680,9 @@
+ doc += tail
+ return doc
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.55/gui/lockdown.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.57/gui/lockdown.glade
--- nsapolicycoreutils/gui/lockdown.glade 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/lockdown.glade 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/lockdown.glade 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,771 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -1444,9 +1455,9 @@
+</widget>
+
+</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.55/gui/lockdown.gladep
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.gladep policycoreutils-2.0.57/gui/lockdown.gladep
--- nsapolicycoreutils/gui/lockdown.gladep 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/lockdown.gladep 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/lockdown.gladep 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
@@ -1455,9 +1466,9 @@
+ <name></name>
+ <program_name></program_name>
+</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.55/gui/lockdown.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.py policycoreutils-2.0.57/gui/lockdown.py
--- nsapolicycoreutils/gui/lockdown.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/lockdown.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/lockdown.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,382 @@
+#!/usr/bin/python
+#
@@ -1841,9 +1852,9 @@
+
+ app = booleanWindow()
+ app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.55/gui/loginsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.57/gui/loginsPage.py
--- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/loginsPage.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/loginsPage.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,185 @@
+## loginsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -2030,9 +2041,9 @@
+ 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.55/gui/mappingsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.57/gui/mappingsPage.py
--- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/mappingsPage.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/mappingsPage.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,56 @@
+## mappingsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -2090,9 +2101,9 @@
+ 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.55/gui/modulesPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.57/gui/modulesPage.py
--- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/modulesPage.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/modulesPage.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,195 @@
+## modulesPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -2289,9 +2300,9 @@
+
+
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.55/gui/polgen.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.57/gui/polgen.glade
--- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/polgen.glade 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/polgen.glade 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,3284 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -5577,9 +5588,9 @@
+</widget>
+
+</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.55/gui/polgen.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.57/gui/polgen.py
--- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/polgen.py 2008-09-09 13:21:29.000000000 -0400
++++ policycoreutils-2.0.57/gui/polgen.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,925 @@
+#!/usr/bin/python
+#
@@ -6506,9 +6517,9 @@
+ sys.exit(0)
+
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.55/gui/polgengui.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.57/gui/polgengui.py
--- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/polgengui.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/polgengui.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,623 @@
+#!/usr/bin/python -E
+#
@@ -7133,9 +7144,9 @@
+
+ app = childWindow()
+ app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.55/gui/portsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.57/gui/portsPage.py
--- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/portsPage.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/portsPage.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,259 @@
+## portsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -7396,9 +7407,9 @@
+
+ return True
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.55/gui/selinux.tbl
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.57/gui/selinux.tbl
--- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/selinux.tbl 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/selinux.tbl 2008-10-10 16:04:46.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 /")
@@ -7634,9 +7645,9 @@
+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.55/gui/semanagePage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.57/gui/semanagePage.py
--- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/semanagePage.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/semanagePage.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,169 @@
+## semanagePage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -7807,9 +7818,9 @@
+ self.load(self.filter)
+ return True
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.55/gui/statusPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.57/gui/statusPage.py
--- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/statusPage.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/statusPage.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,191 @@
+# statusPage.py - show selinux status
+## Copyright (C) 2006 Red Hat, Inc.
@@ -8002,9 +8013,9 @@
+ return self.types[self.selinuxTypeOptionMenu.get_active()]
+
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.55/gui/system-config-selinux.glade
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.57/gui/system-config-selinux.glade
--- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/system-config-selinux.glade 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/system-config-selinux.glade 2008-10-17 11:57:52.000000000 -0400
@@ -0,0 +1,3221 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -11227,9 +11238,9 @@
+</widget>
+
+</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.55/gui/system-config-selinux.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.57/gui/system-config-selinux.py
--- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/system-config-selinux.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/system-config-selinux.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,187 @@
+#!/usr/bin/python
+#
@@ -11418,9 +11429,9 @@
+
+ app = childWindow()
+ app.stand_alone()
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.55/gui/templates/__init__.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.57/gui/templates/__init__.py
--- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/__init__.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/__init__.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2007 Red Hat, Inc.
@@ -11440,9 +11451,9 @@
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.55/gui/templates/boolean.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.57/gui/templates/boolean.py
--- nsapolicycoreutils/gui/templates/boolean.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/boolean.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/boolean.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,40 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -11484,9 +11495,9 @@
+')
+"""
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.55/gui/templates/etc_rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.57/gui/templates/etc_rw.py
--- nsapolicycoreutils/gui/templates/etc_rw.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/etc_rw.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/etc_rw.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,129 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -11617,9 +11628,9 @@
+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.55/gui/templates/executable.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.57/gui/templates/executable.py
--- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/executable.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/executable.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,327 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -11948,9 +11959,9 @@
+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.55/gui/templates/network.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.57/gui/templates/network.py
--- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/network.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/network.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,80 @@
+te_port_types="""
+type TEMPLATETYPE_port_t;
@@ -12032,9 +12043,9 @@
+corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
+"""
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.55/gui/templates/rw.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.57/gui/templates/rw.py
--- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/rw.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/rw.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,128 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12164,9 +12175,9 @@
+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.55/gui/templates/script.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.57/gui/templates/script.py
--- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/script.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/script.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,105 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12273,9 +12284,9 @@
+# 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.55/gui/templates/semodule.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.57/gui/templates/semodule.py
--- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/semodule.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/semodule.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,41 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12318,9 +12329,9 @@
+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.55/gui/templates/tmp.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.57/gui/templates/tmp.py
--- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/tmp.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/tmp.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,97 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12419,9 +12430,9 @@
+ TEMPLATETYPE_manage_tmp($1)
+"""
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.55/gui/templates/user.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.57/gui/templates/user.py
--- nsapolicycoreutils/gui/templates/user.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/user.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/user.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,182 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12605,9 +12616,9 @@
+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.55/gui/templates/var_lib.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.57/gui/templates/var_lib.py
--- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/var_lib.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/var_lib.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,158 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12767,9 +12778,9 @@
+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.55/gui/templates/var_log.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.57/gui/templates/var_log.py
--- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/var_log.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/var_log.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,110 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -12881,9 +12892,9 @@
+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.55/gui/templates/var_run.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.57/gui/templates/var_run.py
--- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/var_run.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/var_run.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,118 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -13003,9 +13014,9 @@
+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.55/gui/templates/var_spool.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.57/gui/templates/var_spool.py
--- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/templates/var_spool.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/templates/var_spool.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,129 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -13136,9 +13147,9 @@
+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.55/gui/translationsPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.57/gui/translationsPage.py
--- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/translationsPage.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/translationsPage.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,118 @@
+## translationsPage.py - show selinux translations
+## Copyright (C) 2006 Red Hat, Inc.
@@ -13258,9 +13269,9 @@
+ 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.55/gui/usersPage.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.57/gui/usersPage.py
--- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.55/gui/usersPage.py 2008-08-29 14:34:59.000000000 -0400
++++ policycoreutils-2.0.57/gui/usersPage.py 2008-10-10 16:04:46.000000000 -0400
@@ -0,0 +1,150 @@
+## usersPage.py - show selinux mappings
+## Copyright (C) 2006,2007,2008 Red Hat, Inc.
policycoreutils-rhat.patch:
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- policycoreutils-rhat.patch 6 Oct 2008 19:06:04 -0000 1.393
+++ policycoreutils-rhat.patch 17 Oct 2008 22:05:44 -0000 1.394
@@ -1,9 +1,115 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.56/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.57/Makefile
--- nsapolicycoreutils/Makefile 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.56/Makefile 2008-10-01 15:18:10.000000000 -0400
++++ policycoreutils-2.0.57/Makefile 2008-10-10 16:04:46.000000000 -0400
@@ -1,4 +1,4 @@
-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
+SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
+diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-2.0.57/newrole/newrole.c
+--- nsapolicycoreutils/newrole/newrole.c 2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.57/newrole/newrole.c 2008-10-17 16:43:52.000000000 -0400
+@@ -553,7 +553,7 @@
+ new_caps = cap_init();
+ tmp_caps = cap_init();
+ if (!new_caps || !tmp_caps) {
+- fprintf(stderr, _("Error initing capabilities, aborting.\n"));
++ fprintf(stderr, _("Error initializing capabilities, aborting.\n"));
+ return -1;
+ }
+ rc |= cap_set_flag(new_caps, CAP_PERMITTED, 1, cap_list, CAP_SET);
+@@ -631,7 +631,7 @@
+ /* Non-root caller, suid root path */
+ new_caps = cap_init();
+ if (!new_caps) {
+- fprintf(stderr, _("Error initing capabilities, aborting.\n"));
++ fprintf(stderr, _("Error initializing capabilities, aborting.\n"));
+ return -1;
+ }
+ rc |= cap_set_flag(new_caps, CAP_PERMITTED, 6, cap_list, CAP_SET);
+Binary files nsapolicycoreutils/semodule/semodule and policycoreutils-2.0.57/semodule/semodule differ
+diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.57/semodule/semodule.c
+--- nsapolicycoreutils/semodule/semodule.c 2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.57/semodule/semodule.c 2008-10-10 16:04:46.000000000 -0400
+@@ -60,24 +60,6 @@
+ free(commands);
+ }
+
+-/* mmap() a file to '*data', returning the total number of bytes in
+- * the file. Returns 0 if file could not be opened or mapped. */
+-static size_t map_file(char *filename, char **data)
+-{
+- int fd;
+- struct stat sb;
+- if ((fd = open(filename, O_RDONLY)) == -1) {
+- return 0;
+- }
+- if (fstat(fd, &sb) == -1 ||
+- (*data = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) ==
+- MAP_FAILED) {
+- sb.st_size = 0;
+- }
+- close(fd);
+- return sb.st_size;
+-}
+-
+ /* Signal handlers. */
+ static void handle_signal(int sig_num)
+ {
+@@ -339,16 +321,6 @@
+ for (i = 0; i < num_commands; i++) {
+ enum client_modes mode = commands[i].mode;
+ char *mode_arg = commands[i].arg;
+- char *data = NULL;
+- size_t data_len = 0;
+- if (mode == INSTALL_M || mode == UPGRADE_M || mode == BASE_M) {
+- if ((data_len = map_file(mode_arg, &data)) == 0) {
+- fprintf(stderr,
+- "%s: Could not read file '%s': %s\n",
+- argv[0], mode_arg, errno ? strerror(errno) : "");
+- goto cleanup;
+- }
+- }
+ switch (mode) {
+ case INSTALL_M:{
+ if (verbose) {
+@@ -357,7 +329,7 @@
+ mode_arg);
+ }
+ result =
+- semanage_module_install(sh, data, data_len);
++ semanage_module_install_file(sh, mode_arg);
+ break;
+ }
+ case UPGRADE_M:{
+@@ -367,7 +339,7 @@
+ mode_arg);
+ }
+ result =
+- semanage_module_upgrade(sh, data, data_len);
++ semanage_module_upgrade_file(sh, mode_arg);
+ break;
+ }
+ case BASE_M:{
+@@ -377,8 +349,7 @@
+ mode_arg);
+ }
+ result =
+- semanage_module_install_base(sh, data,
+- data_len);
++ semanage_module_install_base_file(sh, mode_arg);
+ break;
+ }
+ case REMOVE_M:{
+@@ -429,9 +400,6 @@
+ }
+ }
+ commit += do_commit[mode];
+- if (mode == INSTALL_M || mode == UPGRADE_M || mode == BASE_M) {
+- munmap(data, data_len);
+- }
+ if (result < 0) {
+ fprintf(stderr, "%s: Failed on %s!\n", argv[0],
+ mode_arg ? : "list");
+Binary files nsapolicycoreutils/semodule/semodule.o and policycoreutils-2.0.57/semodule/semodule.o differ
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -r1.560 -r1.561
--- policycoreutils.spec 6 Oct 2008 19:06:05 -0000 1.560
+++ policycoreutils.spec 17 Oct 2008 22:05:44 -0000 1.561
@@ -1,12 +1,12 @@
%define libauditver 1.4.2-1
%define libsepolver 2.0.19-1
-%define libsemanagever 2.0.27-2
+%define libsemanagever 2.0.28-2
%define libselinuxver 2.0.46-5
%define sepolgenver 1.0.13
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.57
-Release: 1%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,13 @@
fi
%changelog
+* Fri Oct 17 2008 Dan Walsh <dwalsh at redhat.com> 2.0.57-3
+- Fix text in newrole
+- Fix revertbutton on booleans page in system-config-selinux
+
+* Wed Oct 1 2008 Dan Walsh <dwalsh at redhat.com> 2.0.57-2
+- Change semodule calls for libsemanage
+
* Wed Oct 1 2008 Dan Walsh <dwalsh at redhat.com> 2.0.57-1
- Update to upstream
* Update po files from Dan Walsh.
- Previous message: rpms/selinux-policy/devel .cvsignore, 1.152, 1.153 sources, 1.169, 1.170
- Next message: rpms/nted/devel .cvsignore, 1.5, 1.6 nted.spec, 1.5, 1.6 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list