rpms/policycoreutils/devel .cvsignore, 1.178, 1.179 policycoreutils-gui.patch, 1.60, 1.61 policycoreutils-po.patch, 1.30, 1.31 policycoreutils-rhat.patch, 1.360, 1.361 policycoreutils.spec, 1.517, 1.518 sources, 1.183, 1.184

Daniel J Walsh (dwalsh) fedora-extras-commits at redhat.com
Wed May 7 11:40:59 UTC 2008


Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23039

Modified Files:
	.cvsignore policycoreutils-gui.patch policycoreutils-po.patch 
	policycoreutils-rhat.patch policycoreutils.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- .cvsignore	18 Mar 2008 20:59:17 -0000	1.178
+++ .cvsignore	7 May 2008 11:38:31 -0000	1.179
@@ -177,3 +177,4 @@
 policycoreutils-2.0.43.tgz
 policycoreutils-2.0.44.tgz
 policycoreutils-2.0.46.tgz
+policycoreutils-2.0.47.tgz

policycoreutils-gui.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.60 -r 1.61 policycoreutils-gui.patch
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- policycoreutils-gui.patch	18 Apr 2008 22:56:24 -0000	1.60
+++ policycoreutils-gui.patch	7 May 2008 11:38:31 -0000	1.61
@@ -1,6 +1,6 @@
-diff -up /dev/null policycoreutils-2.0.46/gui/booleansPage.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/booleansPage.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.46/gui/booleansPage.py
+--- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/booleansPage.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,230 @@
 +#
 +# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -232,9 +232,9 @@
 +        self.load(self.filter)
 +        return True
 +        
-diff -up /dev/null policycoreutils-2.0.46/gui/fcontextPage.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/fcontextPage.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.46/gui/fcontextPage.py
+--- nsapolicycoreutils/gui/fcontextPage.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/fcontextPage.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,217 @@
 +## fcontextPage.py - show selinux mappings
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -453,9 +453,4506 @@
 +        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 -up /dev/null policycoreutils-2.0.46/gui/loginsPage.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/loginsPage.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/lockdown.glade policycoreutils-2.0.46/gui/lockdown.glade
+--- nsapolicycoreutils/gui/lockdown.glade	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/lockdown.glade	2008-05-06 14:31:45.000000000 -0400
+@@ -0,0 +1,2065 @@
++<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
++<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
++
++<glade-interface>
++<requires lib="gnome"/>
++<requires lib="bonobo"/>
++
++<widget class="GtkAboutDialog" id="aboutWindow">
++  <property name="border_width">5</property>
++  <property name="destroy_with_parent">False</property>
++  <property name="name" translatable="yes">system-config-selinux</property>
++  <property name="copyright" translatable="yes">Copyright (c)2006 Red Hat, Inc.
++Copyright (c) 2006 Dan Walsh <dwalsh at redhat.com></property>
++  <property name="wrap_license">False</property>
++  <property name="authors">Daniel Walsh <dwalsh at redhat.com>
++</property>
++  <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
++  <property name="logo">system-config-selinux.png</property>
++</widget>
++
++<widget class="GnomeApp" id="mainWindow">
++  <property name="width_request">800</property>
++  <property name="height_request">400</property>
++  <property name="title" translatable="yes">SELinux Boolean Lockdown</property>
++  <property name="type">GTK_WINDOW_TOPLEVEL</property>
++  <property name="window_position">GTK_WIN_POS_NONE</property>
++  <property name="modal">False</property>
++  <property name="resizable">True</property>
++  <property name="destroy_with_parent">False</property>
++  <property name="icon">system-config-selinux.png</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++  <property name="focus_on_map">True</property>
++  <property name="urgency_hint">False</property>
++  <property name="enable_layout_config">True</property>
++
++  <child internal-child="dock">
++    <widget class="BonoboDock" id="bonobodock2">
++      <property name="visible">True</property>
++      <property name="allow_floating">True</property>
++
++      <child>
++	<widget class="BonoboDockItem" id="bonobodockitem3">
++	  <property name="visible">True</property>
++	  <property name="shadow_type">GTK_SHADOW_NONE</property>
++
++	  <child>
++	    <widget class="GtkMenuBar" id="menubar1">
++	      <property name="visible">True</property>
++	      <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
++	      <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
++
++	      <child>
++		<widget class="GtkMenuItem" id="file1">
++		  <property name="visible">True</property>
++		  <property name="stock_item">GNOMEUIINFO_MENU_FILE_TREE</property>
++
++		  <child>
++		    <widget class="GtkMenu" id="file1_menu">
++
++		      <child>
++			<widget class="GtkImageMenuItem" id="forward_menu_item">
++			  <property name="visible">True</property>
++			  <property name="label" translatable="yes">_Forward</property>
++			  <property name="use_underline">True</property>
++			  <signal name="activate" handler="on_forward_clicked" last_modification_time="Thu, 24 Apr 2008 10:18:41 GMT"/>
++			  <accelerator key="f" modifiers="GDK_CONTROL_MASK" signal="activate"/>
++
++			  <child internal-child="image">
++			    <widget class="GtkImage" id="image17">
++			      <property name="visible">True</property>
++			      <property name="stock">gtk-media-next</property>
++			      <property name="icon_size">1</property>
++			      <property name="xalign">0.5</property>
++			      <property name="yalign">0.5</property>
++			      <property name="xpad">0</property>
++			      <property name="ypad">0</property>
++			    </widget>
++			  </child>
++			</widget>
++		      </child>
++
++		      <child>
++			<widget class="GtkImageMenuItem" id="previous_menu_item">
++			  <property name="visible">True</property>
++			  <property name="label" translatable="yes">_Previous</property>
++			  <property name="use_underline">True</property>
++			  <signal name="activate" handler="on_previous_clicked" last_modification_time="Thu, 24 Apr 2008 10:18:41 GMT"/>
++			  <accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
++
++			  <child internal-child="image">
++			    <widget class="GtkImage" id="image18">
++			      <property name="visible">True</property>
++			      <property name="stock">gtk-media-previous</property>
++			      <property name="icon_size">1</property>
++			      <property name="xalign">0.5</property>
++			      <property name="yalign">0.5</property>
++			      <property name="xpad">0</property>
++			      <property name="ypad">0</property>
++			    </widget>
++			  </child>
++			</widget>
++		      </child>
++
++		      <child>
++			<widget class="GtkImageMenuItem" id="cancel">
++			  <property name="visible">True</property>
++			  <property name="label" translatable="yes">Cancel</property>
++			  <property name="use_underline">True</property>
++			  <signal name="activate" handler="on_cancel_clicked" last_modification_time="Thu, 24 Apr 2008 10:18:41 GMT"/>
++			  <accelerator key="c" modifiers="GDK_CONTROL_MASK" signal="activate"/>
++
++			  <child internal-child="image">
++			    <widget class="GtkImage" id="image19">
++			      <property name="visible">True</property>
++			      <property name="stock">gtk-cancel</property>
++			      <property name="icon_size">1</property>
++			      <property name="xalign">0.5</property>
++			      <property name="yalign">0.5</property>
++			      <property name="xpad">0</property>
++			      <property name="ypad">0</property>
++			    </widget>
++			  </child>
++			</widget>
++		      </child>
++		    </widget>
++		  </child>
++		</widget>
++	      </child>
++
++	      <child>
++		<widget class="GtkMenuItem" id="help1">
++		  <property name="visible">True</property>
++		  <property name="stock_item">GNOMEUIINFO_MENU_HELP_TREE</property>
++
++		  <child>
++		    <widget class="GtkMenu" id="help1_menu">
++
++		      <child>
++			<widget class="GtkImageMenuItem" id="about">
++			  <property name="visible">True</property>
++			  <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
++			  <signal name="activate" handler="on_about_activate" last_modification_time="Fri, 06 Oct 2006 13:58:02 GMT"/>
++			</widget>
++		      </child>
++		    </widget>
++		  </child>
++		</widget>
++	      </child>
++	    </widget>
++	  </child>
++	</widget>
++	<packing>
++	  <property name="placement">BONOBO_DOCK_TOP</property>
++	  <property name="band">0</property>
[...4774 lines suppressed...]
@@ -10561,9 +15078,9 @@
 +EXECUTABLE	--	gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0)
 +"""
 +
-diff -up /dev/null policycoreutils-2.0.46/gui/templates/__init__.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/templates/__init__.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.46/gui/templates/__init__.py
+--- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/__init__.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -10583,9 +15100,9 @@
 +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
-diff -up /dev/null policycoreutils-2.0.46/gui/templates/network.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/templates/network.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.46/gui/templates/network.py
+--- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/network.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -10667,9 +15184,9 @@
 +corenet_udp_bind_all_unreserved_ports(TEMPLATETYPE_t)
 +"""
 +
-diff -up /dev/null policycoreutils-2.0.46/gui/templates/rw.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/templates/rw.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.46/gui/templates/rw.py
+--- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/rw.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,128 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10799,10 +15316,10 @@
 +fc_dir="""
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0)
 +"""
-diff -up /dev/null policycoreutils-2.0.46/gui/templates/script.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/templates/script.py	2008-04-18 13:24:17.000000000 -0400
-@@ -0,0 +1,91 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.46/gui/templates/script.py
+--- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/script.py	2008-05-06 14:31:45.000000000 -0400
+@@ -0,0 +1,105 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
 +#
@@ -10880,23 +15397,37 @@
 +"""
 +
 +restorecon="""\
++# Fixing the file context on FILENAME
 +/sbin/restorecon -F -R -v FILENAME
 +"""
 +
 +tcp_ports="""\
++# Adding SELinux tcp port to port PORTNUM
 +/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p tcp PORTNUM
 +"""
 +
 +udp_ports="""\
++# Adding SELinux udp port to port PORTNUM
 +/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
 +users="""\
-+/usr/sbin/semanage user -a -P  TEMPLATETYPE -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
++# Adding SELinux user TEMPLATETYPE_u
++/usr/sbin/semanage user -a -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
++"""
++
++eusers="""\
++# Adding roles to SELinux user TEMPLATETYPE_u
++/usr/sbin/semanage user -m -R "TEMPLATETYPE_rROLES" TEMPLATETYPE_u
++"""
++
++admin_trans="""\
++# Adding roles to SELinux user USER
++/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER
 +"""
-diff -up /dev/null policycoreutils-2.0.46/gui/templates/semodule.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/templates/semodule.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.46/gui/templates/semodule.py
+--- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/semodule.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -10939,9 +15470,9 @@
 +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM
 +"""
 +
-diff -up /dev/null policycoreutils-2.0.46/gui/templates/tmp.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/templates/tmp.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.46/gui/templates/tmp.py
+--- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/tmp.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11040,9 +15571,9 @@
 +	TEMPLATETYPE_manage_tmp($1)
 +"""
 +
-diff -up /dev/null policycoreutils-2.0.46/gui/templates/user.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/templates/user.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.46/gui/templates/user.py
+--- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/user.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11226,9 +15757,9 @@
 +te_newrole_rules="""
 +seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +"""
-diff -up /dev/null policycoreutils-2.0.46/gui/templates/var_lib.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/templates/var_lib.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.46/gui/templates/var_lib.py
+--- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/var_lib.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11388,9 +15919,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
 +"""
-diff -up /dev/null policycoreutils-2.0.46/gui/templates/var_log.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/templates/var_log.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.46/gui/templates/var_log.py
+--- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/var_log.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11502,9 +16033,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0)
 +"""
-diff -up /dev/null policycoreutils-2.0.46/gui/templates/var_run.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/templates/var_run.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.46/gui/templates/var_run.py
+--- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/var_run.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11624,9 +16155,9 @@
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
 +"""
 +
-diff -up /dev/null policycoreutils-2.0.46/gui/templates/var_spool.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/templates/var_spool.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.46/gui/templates/var_spool.py
+--- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/templates/var_spool.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -11757,9 +16288,9 @@
 +fc_dir="""\
 +FILENAME(/.*)?			gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0)
 +"""
-diff -up /dev/null policycoreutils-2.0.46/gui/translationsPage.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/translationsPage.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.46/gui/translationsPage.py
+--- nsapolicycoreutils/gui/translationsPage.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/translationsPage.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,118 @@
 +## translationsPage.py - show selinux translations
 +## Copyright (C) 2006 Red Hat, Inc.
@@ -11879,9 +16410,9 @@
 +        store, iter = self.view.get_selection().get_selected()
 +        self.store.set_value(iter, 0, level)
 +        self.store.set_value(iter, 1, translation)
-diff -up /dev/null policycoreutils-2.0.46/gui/usersPage.py
---- /dev/null	2008-04-18 15:30:34.773004687 -0400
-+++ policycoreutils-2.0.46/gui/usersPage.py	2008-04-18 13:24:17.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.46/gui/usersPage.py
+--- nsapolicycoreutils/gui/usersPage.py	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.46/gui/usersPage.py	2008-05-06 14:31:45.000000000 -0400
 @@ -0,0 +1,150 @@
 +## usersPage.py - show selinux mappings
 +## Copyright (C) 2006,2007,2008 Red Hat, Inc.

policycoreutils-po.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.30 -r 1.31 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- policycoreutils-po.patch	21 Jan 2008 21:04:52 -0000	1.30
+++ policycoreutils-po.patch	7 May 2008 11:38:31 -0000	1.31
@@ -1,16 +1,16 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.35/po/af.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.46/po/af.po
 --- nsapolicycoreutils/po/af.po	2007-07-16 14:20:42.000000000 -0400
-+++ policycoreutils-2.0.35/po/af.po	2008-01-11 16:25:09.000000000 -0500
++++ policycoreutils-2.0.46/po/af.po	2008-04-30 12:16:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-11-21 14:21-0500\n"
-+"POT-Creation-Date: 2007-09-14 10:36-0400\n"
++"POT-Creation-Date: 2008-03-20 10:33-0400\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
  "Language-Team: LANGUAGE <LL at li.org>\n"
-@@ -16,1013 +16,3357 @@
+@@ -16,1013 +16,3244 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
@@ -25,7 +25,7 @@
  msgstr ""
  
 -#: ../load_policy/load_policy.c:66
-+#: ../run_init/run_init.c:126 ../newrole/newrole.c:1170
++#: ../run_init/run_init.c:126 ../newrole/newrole.c:1187
  #, c-format
 -msgid "%s:  Can't load policy:  %s\n"
 +msgid "failed to initialize PAM\n"
@@ -39,18 +39,18 @@
  msgstr ""
  
 -#: ../newrole/newrole.c:218 ../run_init/run_init.c:162
-+#: ../run_init/run_init.c:162 ../newrole/newrole.c:334
++#: ../run_init/run_init.c:162 ../newrole/newrole.c:338
  msgid "Password:"
  msgstr ""
  
 -#: ../newrole/newrole.c:243 ../run_init/run_init.c:197
-+#: ../run_init/run_init.c:197 ../newrole/newrole.c:359
++#: ../run_init/run_init.c:197 ../newrole/newrole.c:363
  #, c-format
  msgid "Cannot find your entry in the shadow passwd file.\n"
  msgstr ""
  
 -#: ../newrole/newrole.c:250 ../run_init/run_init.c:203
-+#: ../run_init/run_init.c:203 ../newrole/newrole.c:366
++#: ../run_init/run_init.c:203 ../newrole/newrole.c:370
  #, c-format
  msgid "getpass cannot open /dev/tty\n"
  msgstr ""
@@ -91,7 +91,7 @@
  msgstr ""
  
 -#: ../newrole/newrole.c:444 ../newrole/newrole.c:519
-+#: ../run_init/run_init.c:405 ../newrole/newrole.c:1302
++#: ../run_init/run_init.c:405 ../newrole/newrole.c:1321
  #, c-format
 -msgid "Error setting capabilities, aborting\n"
 +msgid "Could not set exec context to %s.\n"
@@ -100,363 +100,365 @@
 -#: ../newrole/newrole.c:450
 -#, c-format
 -msgid "Error setting KEEPCAPS, aborting\n"
-+#: ../audit2allow/audit2allow:209
++#: ../audit2allow/audit2allow:216
 +msgid "******************** IMPORTANT ***********************\n"
  msgstr ""
  
 -#: ../newrole/newrole.c:458 ../newrole/newrole.c:531
 -#, c-format
 -msgid "Error dropping capabilities, aborting\n"
-+#: ../audit2allow/audit2allow:210
++#: ../audit2allow/audit2allow:217
 +msgid "To make this policy package active, execute:"
  msgstr ""
  
 -#: ../newrole/newrole.c:464 ../newrole/newrole.c:562
 -#, c-format
 -msgid "Error changing uid, aborting.\n"
-+#: ../semanage/seobject.py:135
-+msgid "translations not supported on non-MLS machines"
++#: ../semanage/seobject.py:111 ../semanage/seobject.py:115
++msgid "global"
  msgstr ""
  
 -#: ../newrole/newrole.c:470 ../newrole/newrole.c:525 ../newrole/newrole.c:557
 -#, c-format
 -msgid "Error resetting KEEPCAPS, aborting\n"
-+#: ../semanage/seobject.py:142
-+#, python-format
-+msgid "Unable to open %s: translations not supported on non-MLS machines"
++#: ../semanage/seobject.py:170
++msgid "translations not supported on non-MLS machines"
  msgstr ""
  
 -#: ../newrole/newrole.c:477
 -#, c-format
 -msgid "Error dropping SETUID capability, aborting\n"
-+#: ../semanage/seobject.py:175
-+msgid "Level"
++#: ../semanage/seobject.py:177
++#, python-format
++msgid "Unable to open %s: translations not supported on non-MLS machines: %s"
  msgstr ""
  
 -#: ../newrole/newrole.c:482 ../newrole/newrole.c:536
 -#, c-format
 -msgid "Error freeing caps\n"
-+#: ../semanage/seobject.py:175 ../gui/system-config-selinux.glade:651
-+#: ../gui/translationsPage.py:43 ../gui/translationsPage.py:59
-+msgid "Translation"
++#: ../semanage/seobject.py:210
++msgid "Level"
  msgstr ""
  
 -#: ../newrole/newrole.c:580
 -#, c-format
 -msgid "Error connecting to audit system.\n"
-+#: ../semanage/seobject.py:183 ../semanage/seobject.py:197
-+#, python-format
-+msgid "Translations can not contain spaces '%s' "
++#: ../semanage/seobject.py:210 ../gui/system-config-selinux.glade:651
++#: ../gui/translationsPage.py:43 ../gui/translationsPage.py:59
++msgid "Translation"
  msgstr ""
  
 -#: ../newrole/newrole.c:586
 -#, c-format
 -msgid "Error allocating memory.\n"
-+#: ../semanage/seobject.py:186
++#: ../semanage/seobject.py:218 ../semanage/seobject.py:232
 +#, python-format
-+msgid "Invalid Level '%s' "
++msgid "Translations can not contain spaces '%s' "
  msgstr ""
  
 -#: ../newrole/newrole.c:593
 -#, c-format
 -msgid "Error sending audit message.\n"
-+#: ../semanage/seobject.py:189
++#: ../semanage/seobject.py:221
 +#, python-format
-+msgid "%s already defined in translations"
++msgid "Invalid Level '%s' "
  msgstr ""
  
 -#: ../newrole/newrole.c:634 ../newrole/newrole.c:978
 -#, c-format
 -msgid "Could not determine enforcing mode.\n"
-+#: ../semanage/seobject.py:201
++#: ../semanage/seobject.py:224
 +#, python-format
-+msgid "%s not defined in translations"
++msgid "%s already defined in translations"
  msgstr ""
  
 -#: ../newrole/newrole.c:641
 -#, c-format
 -msgid "Error!  Could not open %s.\n"
-+#: ../semanage/seobject.py:219
-+msgid "Could not create semanage handle"
++#: ../semanage/seobject.py:236
++#, python-format
++msgid "%s not defined in translations"
  msgstr ""
  
 -#: ../newrole/newrole.c:646
 -#, c-format
 -msgid "%s!  Could not get current context for %s, not relabeling tty.\n"
-+#: ../semanage/seobject.py:225
-+msgid "SELinux policy is not managed or store cannot be accessed."
++#: ../semanage/seobject.py:254
++msgid "Could not create semanage handle"
  msgstr ""
  
 -#: ../newrole/newrole.c:656
 -#, c-format
 -msgid "%s!  Could not get new context for %s, not relabeling tty.\n"
-+#: ../semanage/seobject.py:230
-+msgid "Cannot read policy store."
++#: ../semanage/seobject.py:263
++msgid "SELinux policy is not managed or store cannot be accessed."
  msgstr ""
  
 -#: ../newrole/newrole.c:666
 -#, c-format
 -msgid "%s!  Could not set new context for %s\n"
-+#: ../semanage/seobject.py:235
-+msgid "Could not establish semanage connection"
++#: ../semanage/seobject.py:268
[...487606 lines suppressed...]
  msgstr ""
  
 -#: ../semanage/seobject.py:1099 ../semanage/seobject.py:1144
 -#, python-format
 -msgid "File context for %s is not defined"
-+#: ../gui/system-config-selinux.glade:2606
-+msgid "Modify SELinux User"
++#: ../gui/system-config-selinux.glade:2167
++msgid "Add SELinux User Mapping"
  msgstr ""
  
 -#: ../semanage/seobject.py:1103
 -#, python-format
 -msgid "Could not query file context for %s"
-+#: ../gui/system-config-selinux.glade:2739
-+msgid "label40"
++#: ../gui/system-config-selinux.glade:2183
++msgid "Modify SELinux User Mapping"
  msgstr ""
  
 -#: ../semanage/seobject.py:1120 ../semanage/seobject.py:1124
 -#, python-format
 -msgid "Could not modify file context for %s"
-+#: ../gui/system-config-selinux.glade:2776
-+msgid "Add Network Port"
++#: ../gui/system-config-selinux.glade:2199
++msgid "Delete SELinux User Mapping"
  msgstr ""
  
 -#: ../semanage/seobject.py:1142
 -#, python-format
 -msgid "File context for %s is defined in policy, cannot be deleted"
-+#: ../gui/system-config-selinux.glade:2792
-+msgid "Edit Network Port"
++#: ../gui/system-config-selinux.glade:2316
++msgid "label39"
  msgstr ""
  
 -#: ../semanage/seobject.py:1152 ../semanage/seobject.py:1156
 -#, python-format
 -msgid "Could not delete file context for %s"
-+#: ../gui/system-config-selinux.glade:2808
-+msgid "Delete Network Port"
++#: ../gui/system-config-selinux.glade:2353
++msgid "Add Translation"
  msgstr ""
  
 -#: ../semanage/seobject.py:1164
 -msgid "Could not list file contexts"
-+#: ../gui/system-config-selinux.glade:2851
-+msgid "Group/ungroup network ports by SELinux type."
++#: ../gui/system-config-selinux.glade:2369
++msgid "Modify Translation"
  msgstr ""
  
 -#: ../semanage/seobject.py:1168
 -msgid "Could not list local file contexts"
-+#: ../gui/system-config-selinux.glade:2897
-+msgid "Group View"
++#: ../gui/system-config-selinux.glade:2385
++msgid "Delete Translation"
  msgstr ""
  
 -#: ../semanage/seobject.py:1203
 -msgid "Requires value"
-+#: ../gui/system-config-selinux.glade:3035
-+msgid "label42"
++#: ../gui/system-config-selinux.glade:2502
++msgid "label41"
  msgstr ""
  
 -#: ../semanage/seobject.py:1211 ../semanage/seobject.py:1245
 -#: ../semanage/seobject.py:1251
 -#, python-format
 -msgid "Could not check if boolean %s is defined"
-+#: ../gui/system-config-selinux.glade:3072
-+msgid "Generate new policy module"
++#: ../gui/system-config-selinux.glade:2555
++msgid "Modify SELinux User"
  msgstr ""
  
 -#: ../semanage/seobject.py:1213 ../semanage/seobject.py:1247
 -#, python-format
 -msgid "Boolean %s is not defined"
-+#: ../gui/system-config-selinux.glade:3088
-+msgid "Load policy module"
++#: ../gui/system-config-selinux.glade:2688
++msgid "label40"
  msgstr ""
  
 -#: ../semanage/seobject.py:1217
 -#, python-format
 -msgid "Could not query file context %s"
-+#: ../gui/system-config-selinux.glade:3104
-+msgid "Remove loadable policy module"
++#: ../gui/system-config-selinux.glade:2725
++msgid "Add Network Port"
  msgstr ""
  
 -#: ../semanage/seobject.py:1229 ../semanage/seobject.py:1233
 -#, python-format
 -msgid "Could not modify boolean %s"
-+#: ../gui/system-config-selinux.glade:3140
-+msgid ""
-+"Enable additional audit rules, that are normally not reported in the log "
-+"files."
++#: ../gui/system-config-selinux.glade:2741
++msgid "Edit Network Port"
  msgstr ""
  
 -#: ../semanage/seobject.py:1253
 -#, python-format
 -msgid "Boolean %s is defined in policy, cannot be deleted"
-+#: ../gui/system-config-selinux.glade:3141
-+msgid "Enable Audit"
++#: ../gui/system-config-selinux.glade:2757
++msgid "Delete Network Port"
  msgstr ""
  
 -#: ../semanage/seobject.py:1261 ../semanage/seobject.py:1265
 -#, python-format
 -msgid "Could not delete boolean %s"
-+#: ../gui/system-config-selinux.glade:3158
-+msgid ""
-+"Disable additional audit rules, that are normally not reported in the log "
-+"files."
++#: ../gui/system-config-selinux.glade:2793
++#: ../gui/system-config-selinux.glade:2811
++msgid "Toggle between Customized and All Ports"
  msgstr ""
  
 -#: ../semanage/seobject.py:1273
 -msgid "Could not list booleans"
-+#: ../gui/system-config-selinux.glade:3159
-+msgid "Disable Audit"
++#: ../gui/system-config-selinux.glade:2930
++msgid "label42"
  msgstr ""
  
 -#: ../audit2allow/audit2allow:183
 -#, c-format
 -msgid "Generating type enforcment file: %s.te"
-+#: ../gui/system-config-selinux.glade:3277
-+msgid "label44"
++#: ../gui/system-config-selinux.glade:2967
++msgid "Generate new policy module"
  msgstr ""
  
 -#: ../audit2allow/audit2allow:189 ../audit2allow/audit2allow:194
 -msgid "Compiling policy"
-+#: ../gui/translationsPage.py:53
-+msgid "Sensitvity Level"
++#: ../gui/system-config-selinux.glade:2983
++msgid "Load policy module"
  msgstr ""
  
 -#: ../audit2allow/audit2allow:205
-+#: ../gui/usersPage.py:55
- msgid ""
+-msgid ""
 -"\n"
 -"******************** IMPORTANT ***********************\n"
-+"Labeling\n"
-+"Prefix"
++#: ../gui/system-config-selinux.glade:2999
++msgid "Remove loadable policy module"
  msgstr ""
  
 -#: ../audit2allow/audit2allow:206
 -#, c-format
-+#: ../gui/usersPage.py:58
++#: ../gui/system-config-selinux.glade:3035
  msgid ""
 -"In order to load this newly created policy package into the kernel,\n"
 -"you are required to execute \n"
 -"\n"
 -"semodule -i %s.pp\n"
 -"\n"
-+"MLS/\n"
-+"MCS Level"
++"Enable/Disable additional audit rules, that are normally not reported in the "
++"log files."
  msgstr ""
  
 -#: ../audit2allow/audit2allow:211
 -#, c-format
 -msgid "Options Error: %s "
-+#: ../gui/usersPage.py:162
++#: ../gui/system-config-selinux.glade:3154
++msgid "label44"
++msgstr ""
++
++#: ../gui/translationsPage.py:53
++msgid "Sensitvity Level"
++msgstr ""
++
++#: ../gui/usersPage.py:138
 +#, python-format
 +msgid "SELinux user '%s' is required"
  msgstr ""

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- policycoreutils-rhat.patch	8 Apr 2008 13:54:34 -0000	1.360
+++ policycoreutils-rhat.patch	7 May 2008 11:38:40 -0000	1.361
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.46/Makefile
 --- nsapolicycoreutils/Makefile	2007-12-19 06:02:52.000000000 -0500
-+++ policycoreutils-2.0.46/Makefile	2008-04-08 09:35:27.000000000 -0400
++++ policycoreutils-2.0.46/Makefile	2008-05-06 14:31:44.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
@@ -9,7 +9,7 @@
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.46/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2007-07-16 14:20:41.000000000 -0400
-+++ policycoreutils-2.0.46/restorecond/restorecond.c	2008-04-08 09:35:27.000000000 -0400
++++ policycoreutils-2.0.46/restorecond/restorecond.c	2008-05-06 14:31:44.000000000 -0400
 @@ -210,9 +210,10 @@
  			}
  
@@ -36,33 +36,21 @@
  	}
  	free(scontext);
  	close(fd);
-diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.46/semanage/semanage.8
---- nsapolicycoreutils/semanage/semanage.8	2008-04-08 09:37:21.000000000 -0400
-+++ policycoreutils-2.0.46/semanage/semanage.8	2008-04-08 09:35:46.000000000 -0400
-@@ -3,7 +3,9 @@
- semanage \- SELinux Policy Management tool
- 
- .SH "SYNOPSIS"
--.B semanage {login|user|port|interface|fcontext|translation} \-l [\-n]
-+.B semanage {boolean|login|user|port|interface|fcontext|translation} \-{l|D} [\-n] 
-+.br
-+.B semanage boolean \-{d|m} [\-T] boolean
- .br
- .B semanage login \-{a|d|m} [\-sr] login_name
- .br
-@@ -43,6 +45,9 @@
- .I                \-d, \-\-delete     
- Delete a OBJECT record NAME
- .TP
-+.I                \-D, \-\-deleteall
-+Remove all OBJECTS local customizations
-+.TP
- .I                \-f, \-\-ftype
- File Type.   This is used with fcontext.
- Requires a file type as shown in the mode field by ls, e.g. use -d to match only directories or -- to match only regular files.
+diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.46/restorecond/restorecond.init
+--- nsapolicycoreutils/restorecond/restorecond.init	2007-07-16 14:20:41.000000000 -0400
++++ policycoreutils-2.0.46/restorecond/restorecond.init	2008-05-06 14:32:03.000000000 -0400
+@@ -2,7 +2,7 @@
+ #
+ # restorecond:		Daemon used to maintain path file context
+ #
+-# chkconfig:	2345 12 87
++# chkconfig:	- 12 87
+ # description:	restorecond uses inotify to look for creation of new files \
+ # listed in the /etc/selinux/restorecond.conf file, and restores the \
+ # correct security context.
 diff --exclude-from=exclude --exclude=sepolgen-1.0.11 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.46/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2008-01-24 14:41:25.000000000 -0500
-+++ policycoreutils-2.0.46/semanage/seobject.py	2008-04-08 09:35:27.000000000 -0400
+--- nsapolicycoreutils/semanage/seobject.py	2008-05-06 14:33:04.000000000 -0400
++++ policycoreutils-2.0.46/semanage/seobject.py	2008-05-06 14:31:44.000000000 -0400
 @@ -464,7 +464,7 @@
  	def __init__(self, store = ""):
  		semanageRecords.__init__(self, store)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -r1.517 -r1.518
--- policycoreutils.spec	18 Apr 2008 22:56:24 -0000	1.517
+++ policycoreutils.spec	7 May 2008 11:38:40 -0000	1.518
@@ -5,8 +5,8 @@
 %define	sepolgenver	1.0.11
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.46
-Release: 5%{?dist}
+Version: 2.0.47
+Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -112,6 +112,7 @@
 Requires: policycoreutils = %{version}-%{release} 
 Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas 
 Requires: usermode, rhpl
+Requires: setools-console
 Requires: python >= 2.4
 BuildRequires: desktop-file-utils
 
@@ -191,6 +192,17 @@
 fi
 
 %changelog
+
+* Wed May 7 2008 Dan Walsh <dwalsh at redhat.com> 2.0.47-1
+- Make restorecond not start by default
+- Fix polgengui to allow defining of confined roles.
+- Add patches from Lubomir Rintel <lkundrak at v3.sk> 
+  * Add necessary runtime dependencies on setools-console for -gui
+  * separate stderr when run seinfo commands
+- Update to upstream
+  * Update semanage man page for booleans from Dan Walsh.
+  * Add further error checking to seobject.py for setting booleans.
+
 * Fri Apr 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.0.46-5
 - Uninvasive (ie no string or widget changes) HIG approximations 
   in selinux-polgenui


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- sources	18 Mar 2008 20:59:17 -0000	1.183
+++ sources	7 May 2008 11:38:40 -0000	1.184
@@ -1,2 +1,2 @@
 3fed5cd04ee67c0f86e3cc6825261819  sepolgen-1.0.11.tgz
-0b3033cf8a538eb9570ddd26009d667c  policycoreutils-2.0.46.tgz
+14e21910c0bee70d2527a52eff6d8928  policycoreutils-2.0.47.tgz




More information about the fedora-extras-commits mailing list