rpms/policycoreutils/F-12 policycoreutils-gui.patch, 1.92, 1.93 policycoreutils.spec, 1.647, 1.648

Daniel J Walsh dwalsh at fedoraproject.org
Thu Oct 1 16:05:58 UTC 2009


Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7083

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-7
- Fixes Templates


policycoreutils-gui.patch:
 Makefile                    |   41 
 booleansPage.py             |  247 +++
 domainsPage.py              |  154 +
 fcontextPage.py             |  223 ++
 html_util.py                |  164 ++
 lockdown.glade              |  771 +++++++++
 lockdown.gladep             |    7 
 lockdown.py                 |  382 ++++
 loginsPage.py               |  185 ++
 mappingsPage.py             |   56 
 modulesPage.py              |  190 ++
 polgen.glade                | 3305 ++++++++++++++++++++++++++++++++++++++++++
 polgen.gladep               |    7 
 polgen.py                   | 1188 +++++++++++++++
 polgengui.py                |  627 ++++++++
 portsPage.py                |  259 +++
 selinux.tbl                 |  234 +++
 semanagePage.py             |  168 ++
 statusPage.py               |  190 ++
 system-config-selinux.glade | 3403 ++++++++++++++++++++++++++++++++++++++++++++
 system-config-selinux.py    |  189 ++
 templates/__init__.py       |   18 
 templates/boolean.py        |   40 
 templates/etc_rw.py         |  129 +
 templates/executable.py     |  368 ++++
 templates/network.py        |   80 +
 templates/rw.py             |  127 +
 templates/script.py         |   99 +
 templates/semodule.py       |   41 
 templates/tmp.py            |   97 +
 templates/user.py           |  182 ++
 templates/var_lib.py        |  158 ++
 templates/var_log.py        |  110 +
 templates/var_run.py        |  118 +
 templates/var_spool.py      |  129 +
 translationsPage.py         |  118 +
 usersPage.py                |  150 +
 37 files changed, 13954 insertions(+)

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-gui.patch,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- policycoreutils-gui.patch	1 Oct 2009 15:39:04 -0000	1.92
+++ policycoreutils-gui.patch	1 Oct 2009 16:05:57 -0000	1.93
@@ -12074,7 +12074,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/boolean.py policycoreutils-2.0.74/gui/templates/boolean.py
 --- nsapolicycoreutils/gui/templates/boolean.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/boolean.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,40 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12118,7 +12118,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/etc_rw.py policycoreutils-2.0.74/gui/templates/etc_rw.py
 --- nsapolicycoreutils/gui/templates/etc_rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-09-30 11:32:23.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/etc_rw.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12149,9 +12149,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_etc_rw_t)
 +"""
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t TEMPLATETYPE_etc_rw_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t TEMPLATETYPE_etc_rw_t)
-+files_etc_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_etc_rw_t, { file dir })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++files_etc_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_etc_rw_t, { file dir })
 +"""
 +
 +########################### Interface File #############################
@@ -12211,7 +12211,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_etc_rw_t;
 +	')
 +
-+        manage_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
++        manage_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
 +	files_search_etc($1)
 +')
 +
@@ -12230,9 +12230,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_etc_rw_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
-+         manage_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_etc_rw_t,TEMPLATETYPE_etc_rw_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++         manage_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_etc_rw_t, TEMPLATETYPE_etc_rw_t)
 +')
 +
 +"""
@@ -12251,7 +12251,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.74/gui/templates/executable.py
 --- nsapolicycoreutils/gui/templates/executable.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/executable.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/executable.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,368 @@
 +# Copyright (C) 2007-2009 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12464,7 +12464,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;
 +	')
 +
-+	domtrans_pattern($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
++	domtrans_pattern($1, TEMPLATETYPE_exec_t, TEMPLATETYPE_t)
 +')
 +
 +"""
@@ -12540,7 +12540,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_initrc_exec_t;
 +	')
 +
-+	init_labeled_script_domtrans($1,TEMPLATETYPE_initrc_exec_t)
++	init_labeled_script_domtrans($1, TEMPLATETYPE_initrc_exec_t)
 +')
 +"""
 +
@@ -12623,7 +12623,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.74/gui/templates/__init__.py
 --- nsapolicycoreutils/gui/templates/__init__.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/__init__.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,18 @@
 +#
 +# Copyright (C) 2007 Red Hat, Inc.
@@ -12645,7 +12645,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.74/gui/templates/network.py
 --- nsapolicycoreutils/gui/templates/network.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/network.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/network.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,80 @@
 +te_port_types="""
 +type TEMPLATETYPE_port_t;
@@ -12729,7 +12729,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.74/gui/templates/rw.py
 --- nsapolicycoreutils/gui/templates/rw.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/rw.py	2009-09-30 11:32:29.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/rw.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,127 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12760,8 +12760,8 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +"""
 +
 +########################### Interface File #############################
@@ -12821,7 +12821,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_rw_t;
 +	')
 +
-+         manage_files_pattern($1, TEMPLATETYPE_rw_t TEMPLATETYPE_rw_t)
++         manage_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +')
 +
 +########################################
@@ -12839,9 +12839,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_rw_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
-+         manage_files_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_rw_t,TEMPLATETYPE_rw_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++         manage_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_rw_t, TEMPLATETYPE_rw_t)
 +')
 +
 +"""
@@ -12860,7 +12860,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
 --- nsapolicycoreutils/gui/templates/script.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/script.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/script.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,99 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -12963,7 +12963,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
 --- nsapolicycoreutils/gui/templates/semodule.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/semodule.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,41 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13008,7 +13008,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.74/gui/templates/tmp.py
 --- nsapolicycoreutils/gui/templates/tmp.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-09-30 11:32:04.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/tmp.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,97 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13039,9 +13039,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t TEMPLATETYPE_tmp_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t TEMPLATETYPE_tmp_t)
-+files_tmp_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_tmp_t, { file dir })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++files_tmp_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_tmp_t, { file dir })
 +"""
 +
 +if_rules="""
@@ -13097,9 +13097,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_tmp_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
-+         manage_files_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_tmp_t,TEMPLATETYPE_tmp_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++         manage_files_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_tmp_t, TEMPLATETYPE_tmp_t)
 +')
 +"""
 +
@@ -13109,7 +13109,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/user.py policycoreutils-2.0.74/gui/templates/user.py
 --- nsapolicycoreutils/gui/templates/user.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/user.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/user.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,182 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13238,7 +13238,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_transition_rules="""
 +optional_policy(`
-+	APPLICATION_role(TEMPLATETYPE_r,TEMPLATETYPE_t)
++	APPLICATION_role(TEMPLATETYPE_r, TEMPLATETYPE_t)
 +')
 +"""
 +
@@ -13282,7 +13282,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_admin_domain_rules="""
 +optional_policy(`
-+	APPLICATION_admin(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
++	APPLICATION_admin(TEMPLATETYPE_t, TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
 +')
 +"""
 +
@@ -13291,11 +13291,11 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 +
 +te_newrole_rules="""
-+seutil_run_newrole(TEMPLATETYPE_t,TEMPLATETYPE_r,{ TEMPLATETYPE_devpts_t TEMPLATETYPE_tty_device_t })
++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.74/gui/templates/var_lib.py
 --- nsapolicycoreutils/gui/templates/var_lib.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_lib.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,158 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13333,7 +13333,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +te_stream_rules="""\
 +allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:sock_file manage_sock_file_perms;
-+files_var_lib_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t, sock_file)
++files_var_lib_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_lib_t, sock_file)
 +"""
 +
 +
@@ -13412,9 +13412,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_var_lib_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
-+         manage_files_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_var_lib_t,TEMPLATETYPE_var_lib_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
++         manage_files_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_var_lib_t, TEMPLATETYPE_var_lib_t)
 +')
 +
 +"""
@@ -13457,7 +13457,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.74/gui/templates/var_log.py
 --- nsapolicycoreutils/gui/templates/var_log.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_log.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,110 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13551,9 +13551,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_log_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
-+         manage_files_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_log_t,TEMPLATETYPE_log_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
++         manage_files_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_log_t, TEMPLATETYPE_log_t)
 +')
 +"""
 +
@@ -13571,7 +13571,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +"""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.74/gui/templates/var_run.py
 --- nsapolicycoreutils/gui/templates/var_run.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-09-20 21:26:37.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_run.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,118 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13604,12 +13604,12 @@ diff --exclude-from=exclude -N -u -r nsa
 +te_rules="""
 +manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t,  TEMPLATETYPE_var_run_t)
 +manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t,  TEMPLATETYPE_var_run_t)
-+files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, { file dir })
++files_pid_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t, { file dir })
 +"""
 +
 +te_stream_rules="""
 +allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:sock_file manage_sock_file_perms;
-+files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, sock_file)
++files_pid_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_var_run_t, sock_file)
 +"""
 +
 +if_rules="""
@@ -13647,9 +13647,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_var_run_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
-+         manage_files_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_var_run_t,TEMPLATETYPE_var_run_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
++         manage_files_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_var_run_t, TEMPLATETYPE_var_run_t)
 +')
 +
 +"""
@@ -13693,7 +13693,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.74/gui/templates/var_spool.py
 --- nsapolicycoreutils/gui/templates/var_spool.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-09-30 11:31:43.000000000 -0400
++++ policycoreutils-2.0.74/gui/templates/var_spool.py	2009-10-01 12:03:05.000000000 -0400
 @@ -0,0 +1,129 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -13724,10 +13724,10 @@ diff --exclude-from=exclude -N -u -r nsa
 +files_type(TEMPLATETYPE_spool_t)
 +"""
 +te_rules="""
-+manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
-+manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
-+manage_lnk_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t TEMPLATETYPE_spool_t)
-+files_spool_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_spool_t, { file dir sock_file })
++manage_dirs_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++manage_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++manage_lnk_files_pattern(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++files_spool_filetrans(TEMPLATETYPE_t, TEMPLATETYPE_spool_t, { file dir sock_file })
 +"""
 +
 +########################### Interface File #############################
@@ -13787,7 +13787,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +	')
 +
 +	files_search_spool($1)
-+        manage_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++        manage_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
 +')
 +
 +########################################
@@ -13805,9 +13805,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +		type TEMPLATETYPE_spool_t;
 +	')
 +
-+         manage_dirs_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
-+         manage_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
-+         manage_lnk_files_pattern($1,TEMPLATETYPE_spool_t,TEMPLATETYPE_spool_t)
++         manage_dirs_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++         manage_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
++         manage_lnk_files_pattern($1, TEMPLATETYPE_spool_t, TEMPLATETYPE_spool_t)
 +')
 +
 +"""


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -p -r1.647 -r1.648
--- policycoreutils.spec	1 Oct 2009 15:39:11 -0000	1.647
+++ policycoreutils.spec	1 Oct 2009 16:05:57 -0000	1.648
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,9 @@ fi
 exit 0
 
 %changelog
+* Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-7
+- Fixes Templates
+
 * Thu Oct 1 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-6
 - Fixes for polgengui to handle tcp ports correctly
 - Fix semanage node -a




More information about the fedora-extras-commits mailing list