diff --git a/.cvsignore b/.cvsignore
index 6138424..f897339 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -154,3 +154,4 @@ serefpolicy-3.5.9.tgz
 serefpolicy-3.5.10.tgz
 serefpolicy-3.5.11.tgz
 serefpolicy-3.5.12.tgz
+serefpolicy-3.5.13.tgz
diff --git a/policy-20080710.patch b/policy-20080710.patch
index 59081c2..0c5febc 100644
--- a/policy-20080710.patch
+++ b/policy-20080710.patch
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.12/Makefile
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.5.13/Makefile
 --- nsaserefpolicy/Makefile	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.12/Makefile	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/Makefile	2008-10-17 10:31:26.000000000 -0400
 @@ -311,20 +311,22 @@
  
  # parse-rolemap modulename,outputfile
@@ -45,9 +45,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Mak
  $(appdir)/%: $(appconf)/%
  	@mkdir -p $(appdir)
  	$(verbose) $(INSTALL) -m 644 $< $@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.12/Rules.modular
---- nsaserefpolicy/Rules.modular	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.12/Rules.modular	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.5.13/Rules.modular
+--- nsaserefpolicy/Rules.modular	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/Rules.modular	2008-10-17 10:31:26.000000000 -0400
 @@ -73,8 +73,8 @@
  $(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
  	@echo "Compliling $(NAME) $(@F) module"
@@ -77,9 +77,26 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Rul
  
  $(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
  $(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.12/config/appconfig-mcs/default_contexts
+@@ -192,6 +192,16 @@
+ 
+ ########################################
+ #
++# Remove the dontaudit rules from the base.conf
++#
++enableaudit: $(base_conf)
++	@test -d $(tmpdir) || mkdir -p $(tmpdir)
++	@echo "Removing dontaudit rules from $(^F)"
++	$(verbose) $(GREP) -v dontaudit $(base_conf) > $(tmpdir)/base.audit
++	$(verbose) mv $(tmpdir)/base.audit $(base_conf)
++
++########################################
++#
+ # Appconfig files
+ #
+ $(appdir)/customizable_types: $(base_conf)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.5.13/config/appconfig-mcs/default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-mcs/default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mcs/default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -101,15 +118,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.12/config/appconfig-mcs/failsafe_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context
 --- nsaserefpolicy/config/appconfig-mcs/failsafe_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-mcs/failsafe_context	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mcs/failsafe_context	2008-10-17 10:31:26.000000000 -0400
 @@ -1 +1 @@
 -sysadm_r:sysadm_t:s0
 +system_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.12/config/appconfig-mcs/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/config/appconfig-mcs/guest_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mcs/guest_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,6 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
@@ -117,9 +134,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +system_r:crond_t:s0		guest_r:guest_t:s0
 +system_r:initrc_su_t:s0		guest_r:guest_t:s0
 +guest_r:guest_t:s0		guest_r:guest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.12/config/appconfig-mcs/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-mcs/root_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mcs/root_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -1,11 +1,7 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
 +system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -134,9 +151,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.12/config/appconfig-mcs/staff_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-mcs/staff_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mcs/staff_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -1,10 +1,12 @@
  system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
  system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -151,9 +168,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
  sysadm_r:sysadm_su_t:s0		sysadm_r:sysadm_t:s0 
  sysadm_r:sysadm_sudo_t:s0	sysadm_r:sysadm_t:s0
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.12/config/appconfig-mcs/unconfined_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mcs/unconfined_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -6,4 +6,6 @@
  system_r:sshd_t:s0		unconfined_r:unconfined_t:s0
  system_r:sysadm_su_t:s0		unconfined_r:unconfined_t:s0
@@ -161,9 +178,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +system_r:initrc_su_t:s0		unconfined_r:unconfined_t:s0
 +unconfined_r:unconfined_t:s0	unconfined_r:unconfined_t:s0
  system_r:xdm_t:s0		unconfined_r:unconfined_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.12/config/appconfig-mcs/user_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-mcs/user_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mcs/user_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -1,8 +1,9 @@
  system_r:local_login_t:s0	user_r:user_t:s0
  system_r:remote_login_t:s0	user_r:user_t:s0
@@ -176,15 +193,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 -
 +system_r:initrc_su_t:s0		user_r:user_t:s0
 +user_r:user_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.12/config/appconfig-mcs/userhelper_context
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context
 --- nsaserefpolicy/config/appconfig-mcs/userhelper_context	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-mcs/userhelper_context	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mcs/userhelper_context	2008-10-17 10:31:26.000000000 -0400
 @@ -1 +1 @@
 -system_u:sysadm_r:sysadm_t:s0
 +system_u:system_r:unconfined_t:s0	
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.12/config/appconfig-mcs/xguest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/config/appconfig-mcs/xguest_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mcs/xguest_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -193,9 +210,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +system_r:xdm_t		xguest_r:xguest_t:s0
 +system_r:initrc_su_t:s0	xguest_r:xguest_t:s0
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.12/config/appconfig-mls/default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/default_contexts serefpolicy-3.5.13/config/appconfig-mls/default_contexts
 --- nsaserefpolicy/config/appconfig-mls/default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-mls/default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mls/default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -1,15 +1,6 @@
 -system_r:crond_t:s0		user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
 -system_r:local_login_t:s0	user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
@@ -217,17 +234,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 -user_r:user_su_t:s0		user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
 -user_r:user_sudo_t:s0		sysadm_r:sysadm_t:s0 user_r:user_t:s0
 +system_r:xdm_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.12/config/appconfig-mls/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/config/appconfig-mls/guest_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mls/guest_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t:s0	guest_r:guest_t:s0
 +system_r:remote_login_t:s0	guest_r:guest_t:s0
 +system_r:sshd_t:s0		guest_r:guest_t:s0
 +system_r:crond_t:s0		guest_r:guest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.12/config/appconfig-mls/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/root_default_contexts serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-mls/root_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mls/root_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -1,11 +1,11 @@
 -system_r:crond_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
 -system_r:local_login_t:s0	unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -246,9 +263,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
  #
 -#system_r:sshd_t:s0		unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
 +#system_r:sshd_t:s0		sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.12/config/appconfig-mls/staff_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-mls/staff_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mls/staff_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -1,7 +1,7 @@
  system_r:local_login_t:s0	staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
  system_r:remote_login_t:s0	staff_r:staff_t:s0
@@ -258,9 +275,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
  system_r:xdm_t:s0		staff_r:staff_t:s0
  staff_r:staff_su_t:s0		staff_r:staff_t:s0
  staff_r:staff_sudo_t:s0		staff_r:staff_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.12/config/appconfig-mls/user_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-mls/user_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mls/user_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -1,7 +1,7 @@
  system_r:local_login_t:s0	user_r:user_t:s0
  system_r:remote_login_t:s0	user_r:user_t:s0
@@ -270,9 +287,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
  system_r:xdm_t:s0		user_r:user_t:s0
  user_r:user_su_t:s0		user_r:user_t:s0
  user_r:user_sudo_t:s0		user_r:user_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.12/config/appconfig-mls/xguest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-mls/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/config/appconfig-mls/xguest_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-mls/xguest_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,7 @@
 +system_r:local_login_t	xguest_r:xguest_t:s0
 +system_r:remote_login_t	xguest_r:xguest_t:s0
@@ -281,17 +298,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
 +system_r:xdm_t		xguest_r:xguest_t:s0
 +system_r:initrc_su_t:s0	xguest_r:xguest_t:s0
 +xguest_r:xguest_t:s0	xguest_r:xguest_t:s0
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.12/config/appconfig-standard/guest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/config/appconfig-standard/guest_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-standard/guest_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,4 @@
 +system_r:local_login_t	guest_r:guest_t
 +system_r:remote_login_t	guest_r:guest_t
 +system_r:sshd_t		guest_r:guest_t
 +system_r:crond_t	guest_r:guest_crond_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.12/config/appconfig-standard/root_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/root_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-standard/root_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-standard/root_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -1,11 +1,7 @@
  system_r:crond_t	unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
  system_r:local_login_t  unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -305,9 +322,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
  #
 -#system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
 +system_r:sshd_t	unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.5.12/config/appconfig-standard/staff_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/staff_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-standard/staff_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-standard/staff_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -1,7 +1,7 @@
  system_r:local_login_t		staff_r:staff_t sysadm_r:sysadm_t
  system_r:remote_login_t		staff_r:staff_t
@@ -317,9 +334,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
  system_r:xdm_t			staff_r:staff_t
  staff_r:staff_su_t		staff_r:staff_t
  staff_r:staff_sudo_t		staff_r:staff_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.12/config/appconfig-standard/user_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/user_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/user_u_default_contexts	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/config/appconfig-standard/user_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-standard/user_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -1,7 +1,7 @@
  system_r:local_login_t		user_r:user_t
  system_r:remote_login_t		user_r:user_t
@@ -329,18 +346,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/con
  system_r:xdm_t			user_r:user_t
  user_r:user_su_t		user_r:user_t
  user_r:user_sudo_t		user_r:user_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.12/config/appconfig-standard/xguest_u_default_contexts
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts
 --- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/config/appconfig-standard/xguest_u_default_contexts	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/config/appconfig-standard/xguest_u_default_contexts	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,5 @@
 +system_r:local_login_t	xguest_r:xguest_t
 +system_r:remote_login_t	xguest_r:xguest_t
 +system_r:sshd_t		xguest_r:xguest_t
 +system_r:crond_t	xguest_r:xguest_crond_t
 +system_r:xdm_t		xguest_r:xguest_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.5.12/policy/flask/access_vectors
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.5.13/policy/flask/access_vectors
 --- nsaserefpolicy/policy/flask/access_vectors	2008-08-07 11:15:00.000000000 -0400
-+++ serefpolicy-3.5.12/policy/flask/access_vectors	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/flask/access_vectors	2008-10-17 10:31:26.000000000 -0400
 @@ -616,6 +616,7 @@
  	nlmsg_write
  	nlmsg_relay
@@ -349,9 +366,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  }
  
  class netlink_ip6fw_socket
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.12/policy/global_tunables
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.5.13/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/global_tunables	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/global_tunables	2008-10-17 10:31:26.000000000 -0400
 @@ -34,7 +34,7 @@
  
  ## <desc>
@@ -390,9 +407,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +gen_tunable(allow_console_login,false)
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.5.12/policy/mls
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.5.13/policy/mls
 --- nsaserefpolicy/policy/mls	2008-09-24 09:07:29.000000000 -0400
-+++ serefpolicy-3.5.12/policy/mls	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/mls	2008-10-17 10:31:26.000000000 -0400
 @@ -381,11 +381,18 @@
  	 ( t1 == mlsxwinread ));
  
@@ -413,9 +430,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # No MLS restrictions: x_drawable { show hide override }
  
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.5.12/policy/modules/admin/anaconda.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.5.13/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/anaconda.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/anaconda.te	2008-10-17 10:31:26.000000000 -0400
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -424,9 +441,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  unprivuser_home_dir_filetrans_home_content(anaconda_t, { dir file lnk_file fifo_file sock_file })
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.5.12/policy/modules/admin/certwatch.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.5.13/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2008-10-08 19:00:27.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/certwatch.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/certwatch.te	2008-10-17 10:31:26.000000000 -0400
 @@ -27,6 +27,8 @@
  
  fs_list_inotifyfs(certwatch_t)
@@ -436,9 +453,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  libs_use_ld_so(certwatch_t)
  libs_use_shared_libs(certwatch_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.5.12/policy/modules/admin/consoletype.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.5.13/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/consoletype.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/consoletype.te	2008-10-17 10:31:26.000000000 -0400
 @@ -8,9 +8,11 @@
  
  type consoletype_t;
@@ -462,9 +479,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  term_use_all_terms(consoletype_t)
  
  init_use_fds(consoletype_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.5.12/policy/modules/admin/kismet.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.5.13/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2008-10-14 11:58:10.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/kismet.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/kismet.te	2008-10-17 10:31:26.000000000 -0400
 @@ -28,8 +28,9 @@
  allow kismet_t self:capability { net_admin net_raw setuid setgid };
  allow kismet_t self:fifo_file rw_file_perms;
@@ -497,9 +514,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  auth_use_nsswitch(kismet_t)
  
  files_read_etc_files(kismet_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.5.12/policy/modules/admin/logwatch.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.5.13/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/logwatch.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/logwatch.te	2008-10-17 10:31:26.000000000 -0400
 @@ -54,18 +54,19 @@
  domain_read_all_domains_state(logwatch_t)
  
@@ -529,9 +546,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	samba_read_log(logwatch_t)
 +	samba_read_share_files(logwatch_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.5.12/policy/modules/admin/netutils.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.5.13/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2008-10-14 11:58:10.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/netutils.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/netutils.te	2008-10-17 10:31:26.000000000 -0400
 @@ -149,6 +149,10 @@
  ')
  
@@ -543,9 +560,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	pcmcia_use_cardmgr_fds(ping_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.5.12/policy/modules/admin/prelink.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.5.13/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/prelink.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/prelink.te	2008-10-17 10:31:26.000000000 -0400
 @@ -26,7 +26,7 @@
  # Local policy
  #
@@ -603,9 +620,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	unconfined_domain(prelink_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.5.12/policy/modules/admin/rpm.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.5.13/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/rpm.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/rpm.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -11,7 +11,8 @@
  
  /usr/sbin/system-install-packages --	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -634,9 +651,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  # SuSE
  ifdef(`distro_suse', `
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.5.12/policy/modules/admin/rpm.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.5.13/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/rpm.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/rpm.if	2008-10-17 10:31:26.000000000 -0400
 @@ -152,6 +152,24 @@
  
  ########################################
@@ -942,9 +959,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow $1 rpm_t:process signull;
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.5.12/policy/modules/admin/rpm.te
---- nsaserefpolicy/policy/modules/admin/rpm.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/rpm.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.5.13/policy/modules/admin/rpm.te
+--- nsaserefpolicy/policy/modules/admin/rpm.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/rpm.te	2008-10-17 10:31:26.000000000 -0400
 @@ -31,6 +31,9 @@
  files_type(rpm_var_lib_t)
  typealias rpm_var_lib_t alias var_lib_rpm_t;
@@ -965,7 +982,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow rpm_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow rpm_t self:process { getattr setexec setfscreate setrlimit };
  allow rpm_t self:fd use;
-@@ -89,8 +93,12 @@
+@@ -68,6 +72,8 @@
+ allow rpm_t self:sem create_sem_perms;
+ allow rpm_t self:msgq create_msgq_perms;
+ allow rpm_t self:msg { send receive };
++allow rpm_t self:dir search;
++allow rpm_t self:file rw_file_perms;;
+ 
+ allow rpm_t rpm_log_t:file manage_file_perms;
+ logging_log_filetrans(rpm_t, rpm_log_t, file)
+@@ -87,8 +93,12 @@
  manage_files_pattern(rpm_t, rpm_var_lib_t, rpm_var_lib_t)
  files_var_lib_filetrans(rpm_t, rpm_var_lib_t, dir)
  
@@ -978,7 +1004,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  corecmd_exec_all_executables(rpm_t)
  
-@@ -117,6 +125,7 @@
+@@ -115,6 +125,7 @@
  fs_manage_nfs_symlinks(rpm_t)
  fs_getattr_all_fs(rpm_t)
  fs_search_auto_mountpoints(rpm_t)
@@ -986,7 +1012,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  mls_file_read_all_levels(rpm_t)
  mls_file_write_all_levels(rpm_t)
-@@ -179,10 +188,20 @@
+@@ -177,10 +188,20 @@
  ')
  
  optional_policy(`
@@ -1007,7 +1033,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	prelink_domtrans(rpm_t)
  ')
  
-@@ -190,6 +209,7 @@
+@@ -188,6 +209,7 @@
  	unconfined_domain(rpm_t)
  	# yum-updatesd requires this
  	unconfined_dbus_chat(rpm_t)
@@ -1015,7 +1041,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ifdef(`TODO',`
-@@ -215,8 +235,8 @@
+@@ -213,8 +235,8 @@
  # rpm-script Local policy
  #
  
@@ -1026,7 +1052,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow rpm_script_t self:fd use;
  allow rpm_script_t self:fifo_file rw_fifo_file_perms;
  allow rpm_script_t self:unix_dgram_socket create_socket_perms;
-@@ -227,12 +247,15 @@
+@@ -225,12 +247,15 @@
  allow rpm_script_t self:sem create_sem_perms;
  allow rpm_script_t self:msgq create_msgq_perms;
  allow rpm_script_t self:msg { send receive };
@@ -1042,7 +1068,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  files_tmp_filetrans(rpm_script_t, rpm_script_tmp_t, { file dir })
  
  manage_dirs_pattern(rpm_script_t, rpm_script_tmpfs_t, rpm_script_tmpfs_t)
-@@ -285,6 +308,7 @@
+@@ -283,6 +308,7 @@
  auth_use_nsswitch(rpm_script_t)
  # ideally we would not need this
  auth_manage_all_files_except_shadow(rpm_script_t)
@@ -1050,7 +1076,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  corecmd_exec_all_executables(rpm_script_t)
  
-@@ -298,6 +322,7 @@
+@@ -296,6 +322,7 @@
  files_exec_etc_files(rpm_script_t)
  files_read_etc_runtime_files(rpm_script_t)
  files_exec_usr_files(rpm_script_t)
@@ -1058,7 +1084,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  init_domtrans_script(rpm_script_t)
  
-@@ -317,6 +342,7 @@
+@@ -315,6 +342,7 @@
  seutil_domtrans_loadpolicy(rpm_script_t)
  seutil_domtrans_setfiles(rpm_script_t)
  seutil_domtrans_semanage(rpm_script_t)
@@ -1066,7 +1092,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  userdom_use_all_users_fds(rpm_script_t)
  
-@@ -335,6 +361,10 @@
+@@ -333,6 +361,10 @@
  ')
  
  optional_policy(`
@@ -1077,7 +1103,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	tzdata_domtrans(rpm_t)
  	tzdata_domtrans(rpm_script_t)
  ')
-@@ -342,6 +372,7 @@
+@@ -340,6 +372,7 @@
  optional_policy(`
  	unconfined_domain(rpm_script_t)
  	unconfined_domtrans(rpm_script_t)
@@ -1085,9 +1111,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	optional_policy(`
  		java_domtrans(rpm_script_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.5.12/policy/modules/admin/su.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-3.5.13/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/su.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/su.if	2008-10-17 10:31:26.000000000 -0400
 @@ -41,15 +41,13 @@
  
  	allow $2 $1_su_t:process signal;
@@ -1243,9 +1269,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  #######################################
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.5.12/policy/modules/admin/sudo.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.5.13/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/sudo.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/sudo.if	2008-10-17 11:35:51.000000000 -0400
 @@ -55,7 +55,7 @@
  	#
  
@@ -1255,7 +1281,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	allow $1_sudo_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  	allow $1_sudo_t self:process { setexec setrlimit };
  	allow $1_sudo_t self:fd use;
-@@ -68,33 +68,35 @@
+@@ -68,33 +68,36 @@
  	allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms;
  	allow $1_sudo_t self:unix_dgram_socket sendto;
  	allow $1_sudo_t self:unix_stream_socket connectto;
@@ -1279,6 +1305,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	kernel_link_key($1_sudo_t)
  
  	dev_read_urand($1_sudo_t)
++	dev_rw_generic_usb_dev($1_sudo_t)
  
  	fs_search_auto_mountpoints($1_sudo_t)
  	fs_getattr_xattr_fs($1_sudo_t)
@@ -1295,7 +1322,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	domain_use_interactive_fds($1_sudo_t)
  	domain_sigchld_interactive_fds($1_sudo_t)
-@@ -106,32 +108,50 @@
+@@ -106,32 +109,50 @@
  	files_getattr_usr_files($1_sudo_t)
  	# for some PAM modules and for cwd
  	files_dontaudit_search_home($1_sudo_t)
@@ -1358,9 +1385,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	term_relabel_all_user_ttys($1_sudo_t)
 +	term_relabel_all_user_ptys($1_sudo_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.5.12/policy/modules/admin/tmpreaper.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.5.13/policy/modules/admin/tmpreaper.te
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/tmpreaper.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/tmpreaper.te	2008-10-17 10:31:26.000000000 -0400
 @@ -22,12 +22,16 @@
  dev_read_urand(tmpreaper_t)
  
@@ -1405,9 +1432,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	unconfined_domain(tmpreaper_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.5.12/policy/modules/admin/usermanage.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.5.13/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/usermanage.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/usermanage.te	2008-10-17 10:31:26.000000000 -0400
 @@ -97,6 +97,7 @@
  
  # allow checking if a shell is executable
@@ -1478,9 +1505,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	unconfined_domain(useradd_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.if serefpolicy-3.5.12/policy/modules/admin/vbetool.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.if serefpolicy-3.5.13/policy/modules/admin/vbetool.if
 --- nsaserefpolicy/policy/modules/admin/vbetool.if	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/vbetool.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/vbetool.if	2008-10-17 10:31:26.000000000 -0400
 @@ -18,3 +18,34 @@
  	corecmd_search_bin($1)
  	domtrans_pattern($1, vbetool_exec_t, vbetool_t)
@@ -1516,9 +1543,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	role $2 types vbetool_t;
 +	allow vbetool_t $3:chr_file rw_term_perms;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.5.12/policy/modules/admin/vbetool.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.5.13/policy/modules/admin/vbetool.te
 --- nsaserefpolicy/policy/modules/admin/vbetool.te	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/vbetool.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/vbetool.te	2008-10-17 10:31:26.000000000 -0400
 @@ -23,6 +23,9 @@
  dev_rwx_zero(vbetool_t)
  dev_read_sysfs(vbetool_t)
@@ -1538,9 +1565,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	xserver_exec_pid(vbetool_t)
 +	xserver_write_pid(vbetool_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.if serefpolicy-3.5.12/policy/modules/admin/vpn.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.if serefpolicy-3.5.13/policy/modules/admin/vpn.if
 --- nsaserefpolicy/policy/modules/admin/vpn.if	2008-10-08 19:00:27.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/admin/vpn.if	2008-10-16 14:46:43.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/admin/vpn.if	2008-10-17 10:31:26.000000000 -0400
 @@ -53,6 +53,24 @@
  
  ########################################
@@ -1591,18 +1618,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Send and receive messages from
  ##	Vpnc over dbus.
  ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.fc serefpolicy-3.5.12/policy/modules/apps/ethereal.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.fc serefpolicy-3.5.13/policy/modules/apps/ethereal.fc
 --- nsaserefpolicy/policy/modules/apps/ethereal.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/ethereal.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/ethereal.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.ethereal(/.*)? 		gen_context(system_u:object_r:ROLE_ethereal_home_t,s0)
 +HOME_DIR/\.ethereal(/.*)? 		gen_context(system_u:object_r:ethereal_home_t,s0)
  
  /usr/sbin/ethereal.*		--	gen_context(system_u:object_r:ethereal_exec_t,s0)
  /usr/sbin/tethereal.*		--	gen_context(system_u:object_r:tethereal_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.if serefpolicy-3.5.12/policy/modules/apps/ethereal.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.if serefpolicy-3.5.13/policy/modules/apps/ethereal.if
 --- nsaserefpolicy/policy/modules/apps/ethereal.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/ethereal.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/ethereal.if	2008-10-17 10:31:26.000000000 -0400
 @@ -35,6 +35,7 @@
  template(`ethereal_per_role_template',`
  
@@ -1706,9 +1733,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  #######################################
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.te serefpolicy-3.5.12/policy/modules/apps/ethereal.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.te serefpolicy-3.5.13/policy/modules/apps/ethereal.te
 --- nsaserefpolicy/policy/modules/apps/ethereal.te	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/ethereal.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/ethereal.te	2008-10-17 10:31:26.000000000 -0400
 @@ -16,6 +16,13 @@
  type tethereal_tmp_t;
  files_tmp_file(tethereal_tmp_t)
@@ -1723,9 +1750,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
  #
  # Tethereal policy
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.if serefpolicy-3.5.12/policy/modules/apps/games.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.if serefpolicy-3.5.13/policy/modules/apps/games.if
 --- nsaserefpolicy/policy/modules/apps/games.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/games.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/games.if	2008-10-17 10:31:26.000000000 -0400
 @@ -130,10 +130,10 @@
  
  	sysnet_read_config($1_games_t)
@@ -1765,9 +1792,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	rw_files_pattern($1, games_data_t, games_data_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.5.12/policy/modules/apps/gnome.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.5.13/policy/modules/apps/gnome.fc
 --- nsaserefpolicy/policy/modules/apps/gnome.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/gnome.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/gnome.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -1,8 +1,10 @@
 -HOME_DIR/\.config/gtk-.*	gen_context(system_u:object_r:ROLE_gnome_home_t,s0)
 -HOME_DIR/\.gconf(d)?(/.*)?	gen_context(system_u:object_r:ROLE_gconf_home_t,s0)
@@ -1785,9 +1812,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +# Don't use because toolchain is broken
 +#/usr/libexec/gconfd-2 	--	gen_context(system_u:object_r:gconfd_exec_t,s0)
 +HOME_DIR/.pulse(/.*)?		gen_context(system_u:object_r:gnome_home_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.5.12/policy/modules/apps/gnome.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.5.13/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/gnome.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/gnome.if	2008-10-17 10:31:26.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		type gconfd_exec_t, gconf_etc_t;
@@ -2035,9 +2062,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	# Connect to pulseaudit server
 +	stream_connect_pattern($1, gnome_home_t, gnome_home_t, $2)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.5.12/policy/modules/apps/gnome.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.5.13/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/gnome.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/gnome.te	2008-10-17 10:31:26.000000000 -0400
 @@ -8,8 +8,34 @@
  
  attribute gnomedomain;
@@ -2076,9 +2103,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +# Local Policy
 +#
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-3.5.12/policy/modules/apps/gpg.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-3.5.13/policy/modules/apps/gpg.fc
 --- nsaserefpolicy/policy/modules/apps/gpg.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/gpg.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/gpg.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -1,9 +1,9 @@
 -HOME_DIR/\.gnupg(/.+)?		gen_context(system_u:object_r:ROLE_gpg_secret_t,s0)
 +HOME_DIR/\.gnupg(/.+)?		gen_context(system_u:object_r:gpg_secret_t,s0)
@@ -2093,9 +2120,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -/usr/lib/gnupg/gpgkeys.* --	gen_context(system_u:object_r:gpg_helper_exec_t,s0)
 +/usr/lib(64)?/gnupg/.*	--	gen_context(system_u:object_r:gpg_exec_t,s0)
 +/usr/lib(64)?/gnupg/gpgkeys.* --	gen_context(system_u:object_r:gpg_helper_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-3.5.12/policy/modules/apps/gpg.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-3.5.13/policy/modules/apps/gpg.if
 --- nsaserefpolicy/policy/modules/apps/gpg.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/gpg.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/gpg.if	2008-10-17 10:31:26.000000000 -0400
 @@ -37,6 +37,9 @@
  template(`gpg_per_role_template',`
  	gen_require(`
@@ -2432,9 +2459,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.5.12/policy/modules/apps/gpg.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.5.13/policy/modules/apps/gpg.te
 --- nsaserefpolicy/policy/modules/apps/gpg.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/gpg.te	2008-10-15 10:23:21.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/gpg.te	2008-10-17 10:31:26.000000000 -0400
 @@ -15,15 +15,255 @@
  gen_tunable(gpg_agent_env_file, false)
  
@@ -2695,9 +2722,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	xserver_stream_connect_xdm_xserver(gpg_pinentry_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.5.12/policy/modules/apps/java.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.5.13/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/java.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/java.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -3,14 +3,15 @@
  #
  /opt/(.*/)?bin/java[^/]* --	gen_context(system_u:object_r:java_exec_t,s0)
@@ -2729,9 +2756,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/lib64/jvm/java(.*/)bin(/.*)? -- gen_context(system_u:object_r:java_exec_t,s0)
 +
 +/usr/bin/octave-[^/]*  	--	gen_context(system_u:object_r:java_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.5.12/policy/modules/apps/java.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.5.13/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/java.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/java.if	2008-10-17 10:31:26.000000000 -0400
 @@ -32,7 +32,7 @@
  ##	</summary>
  ## </param>
@@ -3005,9 +3032,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	ca_exec($1, java_exec_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.5.12/policy/modules/apps/java.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.5.13/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/java.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/java.te	2008-10-17 10:31:26.000000000 -0400
 @@ -6,16 +6,10 @@
  # Declarations
  #
@@ -3057,15 +3084,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	xserver_rw_xdm_xserver_shm(java_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.5.12/policy/modules/apps/livecd.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.5.13/policy/modules/apps/livecd.fc
 --- nsaserefpolicy/policy/modules/apps/livecd.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/livecd.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/livecd.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,2 @@
 +
 +/usr/bin/livecd-creator	--	gen_context(system_u:object_r:livecd_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.if serefpolicy-3.5.12/policy/modules/apps/livecd.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.if serefpolicy-3.5.13/policy/modules/apps/livecd.if
 --- nsaserefpolicy/policy/modules/apps/livecd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/livecd.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/livecd.if	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,56 @@
 +
 +## <summary>policy for livecd</summary>
@@ -3123,9 +3150,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	seutil_run_setfiles_mac(livecd_t, $2, $3)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.te serefpolicy-3.5.12/policy/modules/apps/livecd.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.te serefpolicy-3.5.13/policy/modules/apps/livecd.te
 --- nsaserefpolicy/policy/modules/apps/livecd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/livecd.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/livecd.te	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,26 @@
 +policy_module(livecd, 1.0.0)
 +
@@ -3153,9 +3180,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +seutil_domtrans_setfiles_mac(livecd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-3.5.12/policy/modules/apps/loadkeys.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-3.5.13/policy/modules/apps/loadkeys.te
 --- nsaserefpolicy/policy/modules/apps/loadkeys.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/loadkeys.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/loadkeys.te	2008-10-17 10:31:26.000000000 -0400
 @@ -32,7 +32,6 @@
  term_dontaudit_use_console(loadkeys_t)
  term_use_unallocated_ttys(loadkeys_t)
@@ -3172,9 +3199,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +unprivuser_dontaudit_write_home_content_files(loadkeys_t)
 +unprivuser_dontaudit_list_home_dirs(loadkeys_t)
 +sysadm_dontaudit_list_home_dirs(loadkeys_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.5.12/policy/modules/apps/mono.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.5.13/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/mono.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/mono.if	2008-10-17 10:31:26.000000000 -0400
 @@ -21,7 +21,106 @@
  
  ########################################
@@ -3292,9 +3319,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	')
  
  	corecmd_search_bin($1)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.5.12/policy/modules/apps/mono.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.5.13/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/mono.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/mono.te	2008-10-17 10:31:26.000000000 -0400
 @@ -15,7 +15,7 @@
  # Local policy
  #
@@ -3312,9 +3339,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	xserver_rw_xdm_xserver_shm(mono_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.fc serefpolicy-3.5.12/policy/modules/apps/mozilla.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.fc serefpolicy-3.5.13/policy/modules/apps/mozilla.fc
 --- nsaserefpolicy/policy/modules/apps/mozilla.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/mozilla.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/mozilla.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -1,8 +1,8 @@
 -HOME_DIR/\.galeon(/.*)?			gen_context(system_u:object_r:ROLE_mozilla_home_t,s0)
 -HOME_DIR/\.java(/.*)?			gen_context(system_u:object_r:ROLE_mozilla_home_t,s0)
@@ -3343,9 +3370,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /usr/lib(64)?/[^/]*firefox[^/]*/firefox-bin -- gen_context(system_u:object_r:mozilla_exec_t,s0)
 +/usr/lib/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0)
 +/usr/lib64/[^/]*firefox[^/]*/firefox -- gen_context(system_u:object_r:mozilla_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.5.12/policy/modules/apps/mozilla.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.5.13/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/mozilla.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/mozilla.if	2008-10-17 10:31:26.000000000 -0400
 @@ -35,7 +35,10 @@
  template(`mozilla_per_role_template',`
  	gen_require(`
@@ -3823,9 +3850,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	allow $2 $1_mozilla_t:unix_stream_socket connectto;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.5.12/policy/modules/apps/mozilla.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.5.13/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/mozilla.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/mozilla.te	2008-10-17 10:31:26.000000000 -0400
 @@ -6,15 +6,20 @@
  # Declarations
  #
@@ -3854,9 +3881,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +typealias mozilla_tmp_t alias unconfined_mozilla_tmp_t;
 +typealias mozilla_home_t alias user_mozilla_home_t;
 +typealias mozilla_tmp_t alias user_mozilla_tmp_t;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.fc serefpolicy-3.5.12/policy/modules/apps/mplayer.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.fc serefpolicy-3.5.13/policy/modules/apps/mplayer.fc
 --- nsaserefpolicy/policy/modules/apps/mplayer.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/mplayer.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/mplayer.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -1,13 +1,8 @@
  #
 -# /etc
@@ -3872,9 +3899,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 -HOME_DIR/\.mplayer(/.*)?        gen_context(system_u:object_r:ROLE_mplayer_home_t,s0)
 +HOME_DIR/\.mplayer(/.*)?        gen_context(system_u:object_r:mplayer_home_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.if serefpolicy-3.5.12/policy/modules/apps/mplayer.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.if serefpolicy-3.5.13/policy/modules/apps/mplayer.if
 --- nsaserefpolicy/policy/modules/apps/mplayer.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/mplayer.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/mplayer.if	2008-10-17 10:31:26.000000000 -0400
 @@ -34,7 +34,8 @@
  #
  template(`mplayer_per_role_template',`
@@ -4017,9 +4044,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	read_files_pattern($2, $1_mplayer_home_t, $1_mplayer_home_t)
 +	read_files_pattern($2, mplayer_home_t, mplayer_home_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.te serefpolicy-3.5.12/policy/modules/apps/mplayer.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.te serefpolicy-3.5.13/policy/modules/apps/mplayer.te
 --- nsaserefpolicy/policy/modules/apps/mplayer.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/mplayer.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/mplayer.te	2008-10-17 10:31:26.000000000 -0400
 @@ -22,3 +22,7 @@
  type mplayer_exec_t;
  corecmd_executable_file(mplayer_exec_t)
@@ -4028,9 +4055,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +type mplayer_home_t alias user_mplayer_rw_t;
 +userdom_user_home_content(user, mplayer_home_t)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.fc serefpolicy-3.5.12/policy/modules/apps/nsplugin.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.fc serefpolicy-3.5.13/policy/modules/apps/nsplugin.fc
 --- nsaserefpolicy/policy/modules/apps/nsplugin.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/nsplugin.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/nsplugin.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,9 @@
 +
 +/usr/lib(64)?/nspluginwrapper/npviewer.bin	--	gen_context(system_u:object_r:nsplugin_exec_t,s0)
@@ -4041,10 +4068,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +HOME_DIR/\.macromedia(/.*)?		gen_context(system_u:object_r:nsplugin_home_t,s0)
 +HOME_DIR/\.gstreamer-.*			gen_context(system_u:object_r:nsplugin_home_t,s0)
 +HOME_DIR/\.config/totem(/.*)?			gen_context(system_u:object_r:nsplugin_home_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.5.12/policy/modules/apps/nsplugin.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.5.13/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/nsplugin.if	2008-10-14 15:00:15.000000000 -0400
-@@ -0,0 +1,290 @@
++++ serefpolicy-3.5.13/policy/modules/apps/nsplugin.if	2008-10-17 16:15:42.000000000 -0400
+@@ -0,0 +1,295 @@
 +
 +## <summary>policy for nsplugin</summary>
 +
@@ -4161,6 +4188,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	userdom_use_user_terminals($1, nsplugin_t)
 +	userdom_use_user_terminals($1, nsplugin_config_t)
++	userdom_dontaudit_setattr_user_home_content_files($1, nsplugin_t)
++
++	optional_policy(`
++		dbus_dontaudit_connectto_user_bus($1, nsplugin_t)
++	')
 +
 +	xserver_common_app($1, nsplugin_t)
 +')
@@ -4335,10 +4367,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	can_exec($1, nsplugin_rw_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.5.12/policy/modules/apps/nsplugin.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.5.13/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/nsplugin.te	2008-10-15 16:26:12.000000000 -0400
-@@ -0,0 +1,247 @@
++++ serefpolicy-3.5.13/policy/modules/apps/nsplugin.te	2008-10-17 16:06:37.000000000 -0400
+@@ -0,0 +1,253 @@
 +
 +policy_module(nsplugin, 1.0.0)
 +
@@ -4389,7 +4421,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +#
 +dontaudit nsplugin_t self:capability sys_tty_config;
 +allow nsplugin_t self:fifo_file rw_file_perms;
-+allow nsplugin_t self:process { ptrace getsched setsched signal_perms };
++allow nsplugin_t self:process { ptrace setpgid getsched setsched signal_perms };
 +
 +allow nsplugin_t self:sem create_sem_perms;
 +allow nsplugin_t self:shm create_shm_perms;
@@ -4445,6 +4477,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +fs_getattr_tmpfs(nsplugin_t)
 +fs_getattr_xattr_fs(nsplugin_t)
 +
++storage_dontaudit_getattr_fixed_disk_dev(nsplugin_t)
++
 +term_dontaudit_getattr_all_user_ptys(nsplugin_t)
 +term_dontaudit_getattr_all_user_ttys(nsplugin_t)
 +
@@ -4562,19 +4596,23 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +tunable_policy(`use_nfs_home_dirs',`
 +	fs_manage_nfs_dirs(nsplugin_t)
 +	fs_manage_nfs_files(nsplugin_t)
++	fs_read_nfs_symlinks(nsplugin_t)
 +	fs_manage_nfs_named_pipes(nsplugin_t)
 +	fs_manage_nfs_dirs(nsplugin_config_t)
 +	fs_manage_nfs_files(nsplugin_config_t)
 +	fs_manage_nfs_named_pipes(nsplugin_config_t)
++	fs_read_nfs_symlinks(nsplugin_config_t)
 +')
 +
 +tunable_policy(`use_samba_home_dirs',`
 +	fs_manage_cifs_dirs(nsplugin_t)
 +	fs_manage_cifs_files(nsplugin_t)
++	fs_read_cifs_symlinks(nsplugin_t)
 +	fs_manage_cifs_named_pipes(nsplugin_t)
 +	fs_manage_cifs_dirs(nsplugin_config_t)
 +	fs_manage_cifs_files(nsplugin_config_t)
 +	fs_manage_cifs_named_pipes(nsplugin_config_t)
++	fs_read_cifs_symlinks(nsplugin_config_t)
 +')
 +
 +domtrans_pattern(nsplugin_config_t, nsplugin_exec_t, nsplugin_t)
@@ -4586,16 +4624,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	mozilla_read_user_home_files(user, nsplugin_config_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.fc serefpolicy-3.5.12/policy/modules/apps/openoffice.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.fc serefpolicy-3.5.13/policy/modules/apps/openoffice.fc
 --- nsaserefpolicy/policy/modules/apps/openoffice.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/openoffice.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/openoffice.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,3 @@
 +/usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:openoffice_exec_t,s0)
 +/usr/lib64/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:openoffice_exec_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.if serefpolicy-3.5.12/policy/modules/apps/openoffice.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.if serefpolicy-3.5.13/policy/modules/apps/openoffice.if
 --- nsaserefpolicy/policy/modules/apps/openoffice.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/openoffice.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/openoffice.if	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,106 @@
 +## <summary>Openoffice</summary>
 +
@@ -4703,9 +4741,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow $2 $1_openoffice_t:process { signal sigkill };
 +	allow $1_openoffice_t $2:unix_stream_socket connectto;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.te serefpolicy-3.5.12/policy/modules/apps/openoffice.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.te serefpolicy-3.5.13/policy/modules/apps/openoffice.te
 --- nsaserefpolicy/policy/modules/apps/openoffice.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/openoffice.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/openoffice.te	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,14 @@
 +
 +policy_module(openoffice, 1.0.0)
@@ -4721,17 +4759,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.fc serefpolicy-3.5.12/policy/modules/apps/podsleuth.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.fc serefpolicy-3.5.13/policy/modules/apps/podsleuth.fc
 --- nsaserefpolicy/policy/modules/apps/podsleuth.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/podsleuth.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/podsleuth.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -1,2 +1,4 @@
  
  /usr/bin/podsleuth	--	gen_context(system_u:object_r:podsleuth_exec_t,s0)
 +/usr/libexec/hal-podsleuth       --      gen_context(system_u:object_r:podsleuth_exec_t,s0)
 +/var/cache/podsleuth(/.*)?		gen_context(system_u:object_r:podsleuth_cache_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.if serefpolicy-3.5.12/policy/modules/apps/podsleuth.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.if serefpolicy-3.5.13/policy/modules/apps/podsleuth.if
 --- nsaserefpolicy/policy/modules/apps/podsleuth.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/podsleuth.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/podsleuth.if	2008-10-17 10:31:26.000000000 -0400
 @@ -16,4 +16,38 @@
  	')
  
@@ -4771,9 +4809,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	dontaudit podsleuth_t $3:chr_file rw_term_perms;
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.5.12/policy/modules/apps/podsleuth.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.5.13/policy/modules/apps/podsleuth.te
 --- nsaserefpolicy/policy/modules/apps/podsleuth.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/podsleuth.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/podsleuth.te	2008-10-17 10:31:26.000000000 -0400
 @@ -11,24 +11,55 @@
  application_domain(podsleuth_t, podsleuth_exec_t)
  role system_r types podsleuth_t;
@@ -4832,17 +4870,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  miscfiles_read_localization(podsleuth_t)
  
  dbus_system_bus_client_template(podsleuth, podsleuth_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.5.12/policy/modules/apps/qemu.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.5.13/policy/modules/apps/qemu.fc
 --- nsaserefpolicy/policy/modules/apps/qemu.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/qemu.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/qemu.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -1,2 +1,4 @@
  /usr/bin/qemu	--	gen_context(system_u:object_r:qemu_exec_t,s0)
  /usr/bin/qemu-kvm --	gen_context(system_u:object_r:qemu_exec_t,s0)
 +
 +/var/cache/libvirt(/.*)? -- gen_context(system_u:object_r:qemu_cache_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.if serefpolicy-3.5.12/policy/modules/apps/qemu.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.if serefpolicy-3.5.13/policy/modules/apps/qemu.if
 --- nsaserefpolicy/policy/modules/apps/qemu.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/qemu.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/qemu.if	2008-10-17 10:31:26.000000000 -0400
 @@ -48,6 +48,91 @@
  	allow qemu_t $3:chr_file rw_file_perms;
  ')
@@ -5213,9 +5251,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	manage_lnk_files_pattern($1_t, $1_tmpfs_t, $1_tmpfs_t)
 +	fs_tmpfs_filetrans($1_t, $1_tmpfs_t, { dir file lnk_file })
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.5.12/policy/modules/apps/qemu.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.5.13/policy/modules/apps/qemu.te
 --- nsaserefpolicy/policy/modules/apps/qemu.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/qemu.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/qemu.te	2008-10-17 10:31:26.000000000 -0400
 @@ -6,6 +6,8 @@
  # Declarations
  #
@@ -5359,9 +5397,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
  #
  # qemu_unconfined local policy
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.fc serefpolicy-3.5.12/policy/modules/apps/screen.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.fc serefpolicy-3.5.13/policy/modules/apps/screen.fc
 --- nsaserefpolicy/policy/modules/apps/screen.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/screen.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/screen.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # /home
@@ -5371,9 +5409,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  #
  # /usr
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.5.12/policy/modules/apps/screen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.5.13/policy/modules/apps/screen.if
 --- nsaserefpolicy/policy/modules/apps/screen.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/screen.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/screen.if	2008-10-17 10:31:26.000000000 -0400
 @@ -35,6 +35,7 @@
  template(`screen_per_role_template',`
  	gen_require(`
@@ -5426,9 +5464,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	
  	kernel_read_system_state($1_screen_t)
  	kernel_read_kernel_sysctls($1_screen_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.te serefpolicy-3.5.12/policy/modules/apps/screen.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.te serefpolicy-3.5.13/policy/modules/apps/screen.te
 --- nsaserefpolicy/policy/modules/apps/screen.te	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/screen.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/screen.te	2008-10-17 10:31:26.000000000 -0400
 @@ -11,3 +11,7 @@
  
  type screen_exec_t;
@@ -5437,18 +5475,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +type user_screen_ro_home_t;
 +userdom_user_home_content(user, user_screen_ro_home_t)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.fc serefpolicy-3.5.12/policy/modules/apps/thunderbird.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.fc serefpolicy-3.5.13/policy/modules/apps/thunderbird.fc
 --- nsaserefpolicy/policy/modules/apps/thunderbird.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/thunderbird.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/thunderbird.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -3,4 +3,4 @@
  #
  /usr/bin/thunderbird.*			--	gen_context(system_u:object_r:thunderbird_exec_t,s0)
  
 -HOME_DIR/\.thunderbird(/.*)?			gen_context(system_u:object_r:ROLE_thunderbird_home_t,s0)
 +HOME_DIR/\.thunderbird(/.*)?			gen_context(system_u:object_r:user_thunderbird_home_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.if serefpolicy-3.5.12/policy/modules/apps/thunderbird.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.if serefpolicy-3.5.13/policy/modules/apps/thunderbird.if
 --- nsaserefpolicy/policy/modules/apps/thunderbird.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/thunderbird.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/thunderbird.if	2008-10-17 10:31:26.000000000 -0400
 @@ -43,9 +43,9 @@
  	application_domain($1_thunderbird_t, thunderbird_exec_t)
  	role $3 types $1_thunderbird_t;
@@ -5520,9 +5558,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  		userdom_user_home_dir_filetrans($1, $1_thunderbird_t, $1_untrusted_content_tmp_t, { file dir })
  		userdom_user_home_content_filetrans($1, $1_thunderbird_t, $1_untrusted_content_tmp_t, { file dir })
  	',`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.te serefpolicy-3.5.12/policy/modules/apps/thunderbird.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.te serefpolicy-3.5.13/policy/modules/apps/thunderbird.te
 --- nsaserefpolicy/policy/modules/apps/thunderbird.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/thunderbird.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/thunderbird.te	2008-10-17 10:31:26.000000000 -0400
 @@ -8,3 +8,7 @@
  
  type thunderbird_exec_t;
@@ -5531,9 +5569,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +type user_thunderbird_home_t alias user_thunderbird_rw_t;
 +userdom_user_home_content(user, user_thunderbird_home_t)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.if serefpolicy-3.5.12/policy/modules/apps/tvtime.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.if serefpolicy-3.5.13/policy/modules/apps/tvtime.if
 --- nsaserefpolicy/policy/modules/apps/tvtime.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/tvtime.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/tvtime.if	2008-10-17 10:31:26.000000000 -0400
 @@ -35,6 +35,7 @@
  template(`tvtime_per_role_template',`
  	gen_require(`
@@ -5601,9 +5639,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	# Allow the user domain to signal/ps.
  	ps_process_pattern($2,$1_tvtime_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.te serefpolicy-3.5.12/policy/modules/apps/tvtime.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.te serefpolicy-3.5.13/policy/modules/apps/tvtime.te
 --- nsaserefpolicy/policy/modules/apps/tvtime.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/tvtime.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/tvtime.te	2008-10-17 10:31:26.000000000 -0400
 @@ -11,3 +11,9 @@
  
  type tvtime_dir_t;
@@ -5614,9 +5652,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +type user_tvtime_tmp_t;
 +files_tmp_file(user_tvtime_tmp_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.fc serefpolicy-3.5.12/policy/modules/apps/uml.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.fc serefpolicy-3.5.13/policy/modules/apps/uml.fc
 --- nsaserefpolicy/policy/modules/apps/uml.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/uml.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/uml.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -1,7 +1,7 @@
  #
  # HOME_DIR/
@@ -5626,9 +5664,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  #
  # /usr
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-3.5.12/policy/modules/apps/vmware.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.fc serefpolicy-3.5.13/policy/modules/apps/vmware.fc
 --- nsaserefpolicy/policy/modules/apps/vmware.fc	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/vmware.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/vmware.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -1,9 +1,9 @@
  #
  # HOME_DIR/
@@ -5687,9 +5725,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/vmware.* 			gen_context(system_u:object_r:vmware_var_run_t,s0)
 +/usr/lib/vmware-tools/sbin32/vmware.*	--	gen_context(system_u:object_r:vmware_host_exec_t,s0)
 +/usr/lib/vmware-tools/sbin64/vmware.*	--	gen_context(system_u:object_r:vmware_host_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.if serefpolicy-3.5.12/policy/modules/apps/vmware.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.if serefpolicy-3.5.13/policy/modules/apps/vmware.if
 --- nsaserefpolicy/policy/modules/apps/vmware.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/vmware.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/vmware.if	2008-10-17 10:31:26.000000000 -0400
 @@ -47,11 +47,8 @@
  	domain_entry_file($1_vmware_t, vmware_exec_t)
  	role $3 types $1_vmware_t;
@@ -5719,10 +5757,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	allow $1_vmware_t $1_vmware_tmp_t:file execute;
  	manage_dirs_pattern($1_vmware_t, $1_vmware_tmp_t, $1_vmware_tmp_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.5.12/policy/modules/apps/vmware.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.5.13/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/vmware.te	2008-10-14 15:00:15.000000000 -0400
-@@ -10,14 +10,14 @@
++++ serefpolicy-3.5.13/policy/modules/apps/vmware.te	2008-10-17 10:31:26.000000000 -0400
+@@ -10,6 +10,9 @@
  type vmware_exec_t;
  corecmd_executable_file(vmware_exec_t)
  
@@ -5732,24 +5770,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # VMWare host programs
  type vmware_host_t;
  type vmware_host_exec_t;
- init_daemon_domain(vmware_host_t, vmware_host_exec_t)
- 
--type vmware_log_t;
--logging_log_file(vmware_log_t)
--
- # Systemwide configuration files
- type vmware_sys_conf_t;
- files_type(vmware_sys_conf_t)
-@@ -25,6 +25,9 @@
- type vmware_var_run_t;
- files_pid_file(vmware_var_run_t)
- 
-+type vmware_log_t;
-+logging_log_file(vmware_log_t)
-+
- ########################################
- #
- # VMWare host local policy
 @@ -32,7 +35,7 @@
  
  allow vmware_host_t self:capability { setgid setuid net_raw };
@@ -5768,20 +5788,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  kernel_read_kernel_sysctls(vmware_host_t)
  kernel_list_proc(vmware_host_t)
  kernel_read_proc_symlinks(vmware_host_t)
-@@ -98,8 +103,6 @@
- 
- sysadm_dontaudit_search_home_dirs(vmware_host_t)
- 
--netutils_domtrans_ping(vmware_host_t)
--
- optional_policy(`
- 	seutil_sigchld_newrole(vmware_host_t)
- 
-@@ -108,3 +111,14 @@
+@@ -108,3 +113,13 @@
  optional_policy(`
  	udev_read_db(vmware_host_t)
  ')
-+netutils_domtrans_ping(vmware_host_t)
 +
 +optional_policy(`
 +	unconfined_domain(vmware_host_t)
@@ -5792,17 +5802,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-3.5.12/policy/modules/apps/wine.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-3.5.13/policy/modules/apps/wine.fc
 --- nsaserefpolicy/policy/modules/apps/wine.fc	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/wine.fc	2008-10-15 13:39:34.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/wine.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -2,3 +2,4 @@
  
  /opt/cxoffice/bin/wine		--	gen_context(system_u:object_r:wine_exec_t,s0)
  /opt/picasa/wine/bin/wine	--	gen_context(system_u:object_r:wine_exec_t,s0)
 +/opt/google/picasa(/.*)?/bin/wine.*	--	gen_context(system_u:object_r:wine_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.5.12/policy/modules/apps/wine.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.5.13/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2008-08-07 11:15:02.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/wine.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/wine.if	2008-10-17 10:31:26.000000000 -0400
 @@ -49,3 +49,53 @@
  	role $2 types wine_t;
  	allow wine_t $3:chr_file rw_term_perms;
@@ -5857,9 +5867,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +		xserver_rw_xdm_xserver_shm($1_wine_t)
 +	')
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.5.12/policy/modules/apps/wine.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.5.13/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/wine.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/wine.te	2008-10-17 10:31:26.000000000 -0400
 @@ -9,6 +9,7 @@
  type wine_t;
  type wine_exec_t;
@@ -5886,9 +5896,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	xserver_rw_xdm_xserver_shm(wine_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wireshark.if serefpolicy-3.5.12/policy/modules/apps/wireshark.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wireshark.if serefpolicy-3.5.13/policy/modules/apps/wireshark.if
 --- nsaserefpolicy/policy/modules/apps/wireshark.if	2008-08-07 11:15:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/apps/wireshark.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/wireshark.if	2008-10-17 10:31:26.000000000 -0400
 @@ -134,7 +134,7 @@
  
  	sysnet_read_config($1_wireshark_t)
@@ -5898,16 +5908,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	
  	tunable_policy(`use_nfs_home_dirs',`
  		fs_manage_nfs_dirs($1_wireshark_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.fc serefpolicy-3.5.12/policy/modules/apps/wm.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.fc serefpolicy-3.5.13/policy/modules/apps/wm.fc
 --- nsaserefpolicy/policy/modules/apps/wm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/wm.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/wm.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,3 @@
 +/usr/bin/twm		--	gen_context(system_u:object_r:wm_exec_t,s0)
 +/usr/bin/openbox	--	gen_context(system_u:object_r:wm_exec_t,s0)
 +/usr/bin/metacity	--	gen_context(system_u:object_r:wm_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.if serefpolicy-3.5.12/policy/modules/apps/wm.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.if serefpolicy-3.5.13/policy/modules/apps/wm.if
 --- nsaserefpolicy/policy/modules/apps/wm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/wm.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/wm.if	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,178 @@
 +## <summary>Window Manager.</summary>
 +
@@ -6087,9 +6097,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	can_exec($1, wm_exec_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.te serefpolicy-3.5.12/policy/modules/apps/wm.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wm.te serefpolicy-3.5.13/policy/modules/apps/wm.te
 --- nsaserefpolicy/policy/modules/apps/wm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/apps/wm.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/apps/wm.te	2008-10-17 10:31:26.000000000 -0400
 @@ -0,0 +1,10 @@
 +policy_module(wm,0.0.4)
 +
@@ -6101,9 +6111,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +type wm_exec_t;
 +
 +wm_domain_template(user,xdm)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.5.12/policy/modules/kernel/corecommands.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.5.13/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/corecommands.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/corecommands.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -129,6 +129,8 @@
  /opt/vmware/workstation/lib/lib/wrapper-gtk24\.sh -- gen_context(system_u:object_r:bin_t,s0)
  ')
@@ -6141,9 +6151,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/lib64/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:bin_t,s0)
 +
 +/usr/lib/oracle/xe/apps(/.*)?  gen_context(system_u:object_r:bin_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.5.12/policy/modules/kernel/corecommands.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.5.13/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/corecommands.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/corecommands.if	2008-10-17 10:31:26.000000000 -0400
 @@ -894,6 +894,7 @@
  
  	read_lnk_files_pattern($1, bin_t, bin_t)
@@ -6152,9 +6162,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.5.12/policy/modules/kernel/corenetwork.te.in
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.5.13/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2008-10-14 11:58:07.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/corenetwork.te.in	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/corenetwork.te.in	2008-10-17 10:31:26.000000000 -0400
 @@ -93,6 +93,7 @@
  network_port(distccd, tcp,3632,s0)
  network_port(dns, udp,53,s0, tcp,53,s0)
@@ -6224,9 +6234,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  network_port(whois, tcp,43,s0, udp,43,s0)
  network_port(xdmcp, udp,177,s0, tcp,177,s0)
  network_port(xen, tcp,8002,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.5.12/policy/modules/kernel/devices.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.5.13/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2008-10-08 21:42:58.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/devices.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/devices.fc	2008-10-17 10:31:26.000000000 -0400
 @@ -1,7 +1,7 @@
  
  /dev			-d	gen_context(system_u:object_r:device_t,s0)
@@ -6346,9 +6356,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  /dev/pts(/.*)?			<<none>>
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.5.12/policy/modules/kernel/devices.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.5.13/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2008-10-08 21:42:58.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/devices.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/devices.if	2008-10-17 10:31:27.000000000 -0400
 @@ -65,7 +65,7 @@
  
  	relabelfrom_dirs_pattern($1, device_t, device_node)
@@ -6816,9 +6826,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	rw_chr_files_pattern($1, device_t, qemu_device_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.5.12/policy/modules/kernel/devices.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-3.5.13/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2008-10-08 21:42:58.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/devices.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/devices.te	2008-10-17 10:31:27.000000000 -0400
 @@ -32,6 +32,12 @@
  type apm_bios_t;
  dev_node(apm_bios_t)
@@ -6884,9 +6894,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Type for /dev/pmu 
  #
  type power_device_t;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.5.12/policy/modules/kernel/domain.if
---- nsaserefpolicy/policy/modules/kernel/domain.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/domain.if	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.5.13/policy/modules/kernel/domain.if
+--- nsaserefpolicy/policy/modules/kernel/domain.if	2008-10-16 17:21:13.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/domain.if	2008-10-17 10:31:27.000000000 -0400
 @@ -1247,18 +1247,34 @@
  ##	</summary>
  ## </param>
@@ -6925,9 +6935,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Allow specified type to receive labeled
  ##	networking packets from all domains, over
  ##	all protocols (TCP, UDP, etc)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.5.12/policy/modules/kernel/domain.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.5.13/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/domain.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/domain.te	2008-10-17 10:31:27.000000000 -0400
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -7009,9 +7019,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +# broken kernel
 +dontaudit can_change_object_identity can_change_object_identity:key link;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.5.12/policy/modules/kernel/files.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.5.13/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/files.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/files.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -32,6 +32,7 @@
  /boot/lost\+found	-d	gen_context(system_u:object_r:lost_found_t,mls_systemhigh)
  /boot/lost\+found/.*		<<none>>
@@ -7028,9 +7038,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /etc/issue		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /etc/issue\.net		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /etc/localtime		-l	gen_context(system_u:object_r:etc_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.5.12/policy/modules/kernel/files.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.5.13/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/files.if	2008-10-15 16:25:10.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/files.if	2008-10-17 10:31:27.000000000 -0400
 @@ -110,6 +110,11 @@
  ## </param>
  #
@@ -7366,9 +7376,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	manage_lnk_files_pattern($1,var_run_t,var_run_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.5.12/policy/modules/kernel/files.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.5.13/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2008-10-14 11:58:07.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/files.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/files.te	2008-10-17 10:31:27.000000000 -0400
 @@ -52,11 +52,14 @@
  #
  # etc_t is the type of the system etc directories.
@@ -7405,9 +7415,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ########################################
  #
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.5.12/policy/modules/kernel/filesystem.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.5.13/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/filesystem.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/filesystem.if	2008-10-17 10:31:27.000000000 -0400
 @@ -535,6 +535,24 @@
  
  ########################################
@@ -7840,9 +7850,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	dontaudit $1 fusefs_t:file manage_file_perms;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.5.12/policy/modules/kernel/filesystem.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.5.13/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2008-10-14 11:58:07.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/filesystem.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/filesystem.te	2008-10-17 10:31:27.000000000 -0400
 @@ -21,7 +21,6 @@
  
  # Use xattrs for the following filesystem types.
@@ -7879,9 +7889,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ########################################
  #
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.5.12/policy/modules/kernel/kernel.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.5.13/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/kernel.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/kernel.if	2008-10-17 10:56:51.000000000 -0400
 @@ -1198,6 +1198,7 @@
  	')
  
@@ -7935,9 +7945,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Unconfined access to kernel module resources.
  ## </summary>
  ## <param name="domain">
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.5.12/policy/modules/kernel/kernel.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.5.13/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/kernel.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/kernel.te	2008-10-17 10:31:27.000000000 -0400
 @@ -63,6 +63,15 @@
  genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0)
  
@@ -7971,9 +7981,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  tunable_policy(`read_default_t',`
  	files_list_default(kernel_t)
  	files_read_default_files(kernel_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.5.12/policy/modules/kernel/selinux.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.5.13/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2008-10-10 15:53:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/selinux.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/selinux.if	2008-10-17 10:31:27.000000000 -0400
 @@ -164,6 +164,7 @@
  		type security_t;
  	')
@@ -8064,9 +8074,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	fs_type($1)
 +	mls_trusted_object($1)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-3.5.12/policy/modules/kernel/selinux.te
---- nsaserefpolicy/policy/modules/kernel/selinux.te	2008-10-14 11:58:07.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/selinux.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-3.5.13/policy/modules/kernel/selinux.te
+--- nsaserefpolicy/policy/modules/kernel/selinux.te	2008-10-16 17:21:13.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/selinux.te	2008-10-17 10:31:27.000000000 -0400
 @@ -10,6 +10,7 @@
  attribute can_setenforce;
  attribute can_setsecparam;
@@ -8087,9 +8097,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  neverallow ~{ selinux_unconfined_type can_load_policy } security_t:security load_policy;
  neverallow ~{ selinux_unconfined_type can_setenforce } security_t:security setenforce;
  neverallow ~{ selinux_unconfined_type can_setsecparam } security_t:security setsecparam;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.5.12/policy/modules/kernel/storage.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.5.13/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2008-10-08 19:00:23.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/storage.fc	2008-10-16 14:21:31.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/storage.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -36,7 +36,7 @@
  /dev/pg[0-3]		-c	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/ps3d.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
@@ -8099,9 +8109,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /dev/rd.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
  ifdef(`distro_redhat', `
  /dev/root		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.5.12/policy/modules/kernel/terminal.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.5.13/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2008-08-07 11:15:01.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/kernel/terminal.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/kernel/terminal.if	2008-10-17 10:31:27.000000000 -0400
 @@ -250,9 +250,11 @@
  interface(`term_dontaudit_use_console',`
  	gen_require(`
@@ -8114,14 +8124,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.fc serefpolicy-3.5.12/policy/modules/roles/guest.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.fc serefpolicy-3.5.13/policy/modules/roles/guest.fc
 --- nsaserefpolicy/policy/modules/roles/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/guest.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/guest.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1 @@
 +# file contexts handled by userdomain and genhomedircon
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.if serefpolicy-3.5.12/policy/modules/roles/guest.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.if serefpolicy-3.5.13/policy/modules/roles/guest.if
 --- nsaserefpolicy/policy/modules/roles/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/guest.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/guest.if	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,161 @@
 +## <summary>Least privledge terminal user role</summary>
 +
@@ -8284,9 +8294,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	read_files_pattern($1, { guest_home_dir_t guest_home_t }, guest_home_t)
 +	read_lnk_files_pattern($1, { guest_home_dir_t guest_home_t }, guest_home_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.te serefpolicy-3.5.12/policy/modules/roles/guest.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.te serefpolicy-3.5.13/policy/modules/roles/guest.te
 --- nsaserefpolicy/policy/modules/roles/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/guest.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/guest.te	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,35 @@
 +
 +policy_module(guest, 1.0.0)
@@ -8323,14 +8333,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	mozilla_per_role_template(xguest, xguest_t, xguest_r)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.fc serefpolicy-3.5.12/policy/modules/roles/logadm.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.fc serefpolicy-3.5.13/policy/modules/roles/logadm.fc
 --- nsaserefpolicy/policy/modules/roles/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/logadm.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/logadm.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1 @@
 +# file contexts handled by userdomain and genhomedircon
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.if serefpolicy-3.5.12/policy/modules/roles/logadm.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.if serefpolicy-3.5.13/policy/modules/roles/logadm.if
 --- nsaserefpolicy/policy/modules/roles/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/logadm.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/logadm.if	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,44 @@
 +## <summary>Audit administrator role</summary>
 +
@@ -8376,9 +8386,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +template(`logadm_role_change_to_template',`
 +	userdom_role_change_template(logadm, $1)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.te serefpolicy-3.5.12/policy/modules/roles/logadm.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/logadm.te serefpolicy-3.5.13/policy/modules/roles/logadm.te
 --- nsaserefpolicy/policy/modules/roles/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/logadm.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/logadm.te	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,20 @@
 +
 +policy_module(logadm, 1.0.0)
@@ -8400,9 +8410,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +allow logadm_t self:capability { dac_override dac_read_search kill sys_ptrace sys_nice };
 +
 +logging_admin(logadm_t, logadm_r, { logadm_devpts_t logadm_tty_device_t })
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.5.12/policy/modules/roles/staff.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.5.13/policy/modules/roles/staff.te
 --- nsaserefpolicy/policy/modules/roles/staff.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/roles/staff.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/staff.te	2008-10-17 10:31:27.000000000 -0400
 @@ -8,23 +8,55 @@
  
  role staff_r;
@@ -8460,9 +8470,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	webadm_role_change_template(staff)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.if serefpolicy-3.5.12/policy/modules/roles/sysadm.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.if serefpolicy-3.5.13/policy/modules/roles/sysadm.if
 --- nsaserefpolicy/policy/modules/roles/sysadm.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/roles/sysadm.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/sysadm.if	2008-10-17 10:31:27.000000000 -0400
 @@ -334,10 +334,10 @@
  #
  interface(`sysadm_getattr_home_dirs',`
@@ -8641,9 +8651,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ########################################
  ## <summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.5.12/policy/modules/roles/sysadm.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.5.13/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/roles/sysadm.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/sysadm.te	2008-10-17 10:31:27.000000000 -0400
 @@ -171,6 +171,10 @@
  ')
  
@@ -8655,9 +8665,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	kudzu_run(sysadm_t, sysadm_r, { sysadm_tty_device_t sysadm_devpts_t })
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.if serefpolicy-3.5.12/policy/modules/roles/unprivuser.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.if serefpolicy-3.5.13/policy/modules/roles/unprivuser.if
 --- nsaserefpolicy/policy/modules/roles/unprivuser.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/roles/unprivuser.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/unprivuser.if	2008-10-17 10:31:27.000000000 -0400
 @@ -62,6 +62,26 @@
  	files_home_filetrans($1, user_home_dir_t, dir)
  ')
@@ -9301,9 +9311,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	')
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.5.12/policy/modules/roles/unprivuser.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.5.13/policy/modules/roles/unprivuser.te
 --- nsaserefpolicy/policy/modules/roles/unprivuser.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/roles/unprivuser.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/unprivuser.te	2008-10-17 10:31:27.000000000 -0400
 @@ -13,3 +13,19 @@
  
  userdom_unpriv_user_template(user)
@@ -9324,14 +9334,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	setroubleshoot_dontaudit_stream_connect(user_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.fc serefpolicy-3.5.12/policy/modules/roles/webadm.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.fc serefpolicy-3.5.13/policy/modules/roles/webadm.fc
 --- nsaserefpolicy/policy/modules/roles/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/webadm.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/webadm.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1 @@
 +# No webadm file contexts.
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.if serefpolicy-3.5.12/policy/modules/roles/webadm.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.if serefpolicy-3.5.13/policy/modules/roles/webadm.if
 --- nsaserefpolicy/policy/modules/roles/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/webadm.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/webadm.if	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,44 @@
 +## <summary>Policy for webadm role</summary>
 +
@@ -9377,9 +9387,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +template(`webadm_role_change_to_template',`
 +	userdom_role_change_template(webadm, $1)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.te serefpolicy-3.5.12/policy/modules/roles/webadm.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/webadm.te serefpolicy-3.5.13/policy/modules/roles/webadm.te
 --- nsaserefpolicy/policy/modules/roles/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/webadm.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/webadm.te	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,65 @@
 +
 +policy_module(webadm, 1.0.0)
@@ -9446,14 +9456,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +   unprivuser_write_tmp_files(webadm_t)
 +')
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.fc serefpolicy-3.5.12/policy/modules/roles/xguest.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.fc serefpolicy-3.5.13/policy/modules/roles/xguest.fc
 --- nsaserefpolicy/policy/modules/roles/xguest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/xguest.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/xguest.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1 @@
 +# file contexts handled by userdomain and genhomedircon
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.if serefpolicy-3.5.12/policy/modules/roles/xguest.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.if serefpolicy-3.5.13/policy/modules/roles/xguest.if
 --- nsaserefpolicy/policy/modules/roles/xguest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/xguest.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/xguest.if	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,161 @@
 +## <summary>Least privledge X Windows user role</summary>
 +
@@ -9616,9 +9626,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	read_files_pattern($1, { xguest_home_dir_t xguest_home_t }, xguest_home_t)
 +	read_lnk_files_pattern($1, { xguest_home_dir_t xguest_home_t }, xguest_home_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.5.12/policy/modules/roles/xguest.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.5.13/policy/modules/roles/xguest.te
 --- nsaserefpolicy/policy/modules/roles/xguest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/roles/xguest.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/roles/xguest.te	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,82 @@
 +
 +policy_module(xguest, 1.0.0)
@@ -9702,9 +9712,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +		bluetooth_dbus_chat(xguest_t)
 +	')
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.if serefpolicy-3.5.12/policy/modules/services/aide.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aide.if serefpolicy-3.5.13/policy/modules/services/aide.if
 --- nsaserefpolicy/policy/modules/services/aide.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/aide.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/aide.if	2008-10-17 10:31:27.000000000 -0400
 @@ -70,9 +70,11 @@
  	allow $1 aide_t:process { ptrace signal_perms };
  	ps_process_pattern($1, aide_t)
@@ -9719,9 +9729,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	manage_files_pattern($1, aide_log_t, aide_log_t)
 +	admin_pattern($1, aide_log_t, aide_log_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.5.12/policy/modules/services/apache.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.5.13/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2008-10-03 11:12:14.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/apache.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/apache.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,12 +1,13 @@
 -HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_ROLE_content_t,s0)
 +HOME_DIR/((www)|(web)|(public_html)|(public_git))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0)
@@ -9803,9 +9813,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +#viewvc file context
 +/var/spool/viewvc(/.*)?  		gen_context(system_u:object_r:httpd_sys_content_rw_t,s0)
 +/var/www/html/[^/]*/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.5.12/policy/modules/services/apache.if
---- nsaserefpolicy/policy/modules/services/apache.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/apache.if	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.5.13/policy/modules/services/apache.if
+--- nsaserefpolicy/policy/modules/services/apache.if	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/apache.if	2008-10-17 10:31:27.000000000 -0400
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -10210,6 +10220,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
+@@ -790,7 +733,7 @@
+ 	')
+ 
+ 	allow $1 httpd_modules_t:dir list_dir_perms;
+-	allow $1 httpd_modules_t:lnk_file read_lnk_file_perms;
++	allow $1 httpd_modules_t:lnk_file read_file_perms;
+ 	can_exec($1,httpd_modules_t)
+ ')
+ 
 @@ -838,6 +781,32 @@
  
  ########################################
@@ -10456,9 +10475,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	')
 +	typeattribute $1  httpd_rw_content;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.5.12/policy/modules/services/apache.te
---- nsaserefpolicy/policy/modules/services/apache.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/apache.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.5.13/policy/modules/services/apache.te
+--- nsaserefpolicy/policy/modules/services/apache.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/apache.te	2008-10-17 10:31:27.000000000 -0400
 @@ -20,6 +20,8 @@
  # Declarations
  #
@@ -10590,7 +10609,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Apache-httpd needs to be able to send signals to the log rotate procs.
 @@ -260,9 +308,9 @@
  
- allow httpd_t httpd_suexec_exec_t:file { getattr read };
+ allow httpd_t httpd_suexec_exec_t:file read_file_perms;
  
 -allow httpd_t httpd_sys_content_t:dir list_dir_perms;
 -read_files_pattern(httpd_t, httpd_sys_content_t, httpd_sys_content_t)
@@ -10884,7 +10903,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -590,6 +721,8 @@
+@@ -584,12 +715,14 @@
+ append_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
+ read_files_pattern(httpd_suexec_t, httpd_log_t, httpd_log_t)
+ 
+-allow httpd_suexec_t httpd_t:fifo_file getattr;
++allow httpd_suexec_t httpd_t:fifo_file read_fifo_file_perms;
+ 
+ manage_dirs_pattern(httpd_suexec_t, httpd_suexec_tmp_t, httpd_suexec_tmp_t)
  manage_files_pattern(httpd_suexec_t, httpd_suexec_tmp_t, httpd_suexec_tmp_t)
  files_tmp_filetrans(httpd_suexec_t, httpd_suexec_tmp_t, { file dir })
  
@@ -10961,7 +10987,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  dontaudit httpd_sys_script_t httpd_config_t:dir search;
  
--allow httpd_sys_script_t httpd_squirrelmail_t:file { append read };
+-allow httpd_sys_script_t httpd_squirrelmail_t:file { append_file_perms read_file_perms };
 +apache_read_squirrelmail_data(httpd_sys_script_t)
 +apache_append_squirrelmail_data(httpd_sys_script_t)
  
@@ -10974,7 +11000,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +sysnet_read_config(httpd_sys_script_t)
 +
  ifdef(`distro_redhat',`
- 	allow httpd_sys_script_t httpd_log_t:file { getattr append };
+ 	allow httpd_sys_script_t httpd_log_t:file append_file_perms;
  ')
  
 -tunable_policy(`httpd_enable_homedirs',`
@@ -11097,17 +11123,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +manage_dirs_pattern(httpd_t,httpdcontent,httpd_rw_content)
 +manage_files_pattern(httpd_t,httpdcontent,httpd_rw_content)
 +manage_lnk_files_pattern(httpd_t,httpdcontent,httpd_rw_content)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.fc serefpolicy-3.5.12/policy/modules/services/arpwatch.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.fc serefpolicy-3.5.13/policy/modules/services/arpwatch.fc
 --- nsaserefpolicy/policy/modules/services/arpwatch.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/arpwatch.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/arpwatch.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,3 +1,4 @@
 +/etc/rc\.d/init\.d/arpwatch	--	gen_context(system_u:object_r:arpwatch_initrc_exec_t,s0)
  
  #
  # /usr
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.if serefpolicy-3.5.12/policy/modules/services/arpwatch.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.if serefpolicy-3.5.13/policy/modules/services/arpwatch.if
 --- nsaserefpolicy/policy/modules/services/arpwatch.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/arpwatch.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/arpwatch.if	2008-10-17 10:31:27.000000000 -0400
 @@ -90,3 +90,45 @@
  
  	dontaudit $1 arpwatch_t:packet_socket { read write };
@@ -11154,9 +11180,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_list_pids($1)
 +	admin_pattern($1, arpwatch_var_run_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-3.5.12/policy/modules/services/arpwatch.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-3.5.13/policy/modules/services/arpwatch.te
 --- nsaserefpolicy/policy/modules/services/arpwatch.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/arpwatch.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/arpwatch.te	2008-10-17 10:31:27.000000000 -0400
 @@ -13,6 +13,9 @@
  type arpwatch_data_t;
  files_type(arpwatch_data_t)
@@ -11167,18 +11193,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  type arpwatch_tmp_t;
  files_tmp_file(arpwatch_tmp_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.fc serefpolicy-3.5.12/policy/modules/services/asterisk.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.fc serefpolicy-3.5.13/policy/modules/services/asterisk.fc
 --- nsaserefpolicy/policy/modules/services/asterisk.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/asterisk.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/asterisk.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,4 +1,5 @@
  /etc/asterisk(/.*)?		gen_context(system_u:object_r:asterisk_etc_t,s0)
 +/etc/rc\.d/init\.d/asterisk	--	gen_context(system_u:object_r:asterisk_initrc_exec_t,s0)
  
  /usr/sbin/asterisk	--	gen_context(system_u:object_r:asterisk_exec_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.if serefpolicy-3.5.12/policy/modules/services/asterisk.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.if serefpolicy-3.5.13/policy/modules/services/asterisk.if
 --- nsaserefpolicy/policy/modules/services/asterisk.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/asterisk.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/asterisk.if	2008-10-17 10:31:27.000000000 -0400
 @@ -1 +1,54 @@
  ## <summary>Asterisk IP telephony server</summary>
 +
@@ -11234,9 +11260,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	admin_pattern($1, asterisk_var_run_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.5.12/policy/modules/services/asterisk.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.5.13/policy/modules/services/asterisk.te
 --- nsaserefpolicy/policy/modules/services/asterisk.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/asterisk.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/asterisk.te	2008-10-17 10:31:27.000000000 -0400
 @@ -13,6 +13,9 @@
  type asterisk_etc_t;
  files_config_file(asterisk_etc_t)
@@ -11247,18 +11273,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  type asterisk_log_t;
  logging_log_file(asterisk_log_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.fc serefpolicy-3.5.12/policy/modules/services/audioentropy.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.fc serefpolicy-3.5.13/policy/modules/services/audioentropy.fc
 --- nsaserefpolicy/policy/modules/services/audioentropy.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/audioentropy.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/audioentropy.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -2,3 +2,5 @@
  # /usr
  #
  /usr/sbin/audio-entropyd	--	gen_context(system_u:object_r:entropyd_exec_t,s0)
 +
 +/var/run/audio-entropyd\.pid	--	gen_context(system_u:object_r:entropyd_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-3.5.12/policy/modules/services/audioentropy.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/audioentropy.te serefpolicy-3.5.13/policy/modules/services/audioentropy.te
 --- nsaserefpolicy/policy/modules/services/audioentropy.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/audioentropy.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/audioentropy.te	2008-10-17 10:31:27.000000000 -0400
 @@ -35,6 +35,7 @@
  dev_read_rand(entropyd_t)
  dev_write_rand(entropyd_t)
@@ -11267,9 +11293,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  fs_getattr_all_fs(entropyd_t)
  fs_search_auto_mountpoints(entropyd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.5.12/policy/modules/services/automount.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.5.13/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/automount.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/automount.te	2008-10-17 10:31:27.000000000 -0400
 @@ -71,6 +71,7 @@
  files_mounton_all_mountpoints(automount_t)
  files_mount_all_file_type_fs(automount_t)
@@ -11295,9 +11321,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	kerberos_read_config(automount_t)
  	kerberos_dontaudit_write_config(automount_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.fc serefpolicy-3.5.12/policy/modules/services/avahi.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.fc serefpolicy-3.5.13/policy/modules/services/avahi.fc
 --- nsaserefpolicy/policy/modules/services/avahi.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/avahi.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/avahi.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,5 +1,9 @@
 +/etc/rc\.d/init\.d/avahi.*	--	gen_context(system_u:object_r:avahi_initrc_exec_t,s0)
  
@@ -11308,9 +11334,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/avahi-daemon(/.*)? 		gen_context(system_u:object_r:avahi_var_run_t,s0)
 +
 +/usr/lib/avahi-autoipd(/.*)		gen_context(system_u:object_r:avahi_var_lib_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-3.5.12/policy/modules/services/avahi.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.if serefpolicy-3.5.13/policy/modules/services/avahi.if
 --- nsaserefpolicy/policy/modules/services/avahi.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/avahi.if	2008-10-16 14:48:40.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/avahi.if	2008-10-17 10:31:27.000000000 -0400
 @@ -2,6 +2,103 @@
  
  ########################################
@@ -11454,9 +11480,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_list_pids($1)
 +	admin_pattern($1, avahi_var_run_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.5.12/policy/modules/services/avahi.te
---- nsaserefpolicy/policy/modules/services/avahi.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/avahi.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.5.13/policy/modules/services/avahi.te
+--- nsaserefpolicy/policy/modules/services/avahi.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/avahi.te	2008-10-17 10:31:27.000000000 -0400
 @@ -10,6 +10,12 @@
  type avahi_exec_t;
  init_daemon_domain(avahi_t, avahi_exec_t)
@@ -11476,7 +11502,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  dontaudit avahi_t self:capability sys_tty_config;
 -allow avahi_t self:process { setrlimit signal_perms setcap };
 +allow avahi_t self:process { setrlimit signal_perms getcap setcap };
- allow avahi_t self:fifo_file { read write };
+ allow avahi_t self:fifo_file rw_fifo_file_perms;
  allow avahi_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow avahi_t self:unix_dgram_socket create_socket_perms;
  allow avahi_t self:tcp_socket create_stream_socket_perms;
@@ -11506,18 +11532,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-3.5.12/policy/modules/services/bind.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-3.5.13/policy/modules/services/bind.fc
 --- nsaserefpolicy/policy/modules/services/bind.fc	2008-09-24 09:07:28.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/bind.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/bind.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,4 +1,4 @@
 -/etc/rc.d/init.d/named	--	gen_context(system_u:object_r:named_initrc_exec_t,s0)
 +/etc/rc\.d/init\.d/named	--	gen_context(system_u:object_r:named_initrc_exec_t,s0)
  /etc/rndc.*		--	gen_context(system_u:object_r:named_conf_t,s0)
  /etc/rndc\.key 		-- 	gen_context(system_u:object_r:dnssec_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.5.12/policy/modules/services/bind.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.5.13/policy/modules/services/bind.if
 --- nsaserefpolicy/policy/modules/services/bind.if	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/bind.if	2008-10-16 14:45:01.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/bind.if	2008-10-17 10:31:27.000000000 -0400
 @@ -38,6 +38,42 @@
  
  ########################################
@@ -11642,10 +11668,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_list_pids($1)
 +	admin_pattern($1, named_var_run_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.5.12/policy/modules/services/bind.te
---- nsaserefpolicy/policy/modules/services/bind.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/bind.te	2008-10-14 15:00:15.000000000 -0400
-@@ -249,6 +249,8 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.te serefpolicy-3.5.13/policy/modules/services/bind.te
+--- nsaserefpolicy/policy/modules/services/bind.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/bind.te	2008-10-17 10:31:27.000000000 -0400
+@@ -247,6 +247,8 @@
  sysnet_read_config(ndc_t)
  sysnet_dns_name_resolve(ndc_t)
  
@@ -11654,9 +11680,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # for /etc/rndc.key
  ifdef(`distro_redhat',`
  	allow ndc_t named_conf_t:dir search;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.fc serefpolicy-3.5.12/policy/modules/services/bluetooth.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.fc serefpolicy-3.5.13/policy/modules/services/bluetooth.fc
 --- nsaserefpolicy/policy/modules/services/bluetooth.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/bluetooth.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/bluetooth.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -3,6 +3,9 @@
  #
  /etc/bluetooth(/.*)?		gen_context(system_u:object_r:bluetooth_conf_t,s0)
@@ -11672,9 +11698,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/lib/bluetooth(/.*)?	gen_context(system_u:object_r:bluetooth_var_lib_t,s0)
  /var/run/sdp		-s	gen_context(system_u:object_r:bluetooth_var_run_t,s0)
 +/var/run/bluetoothd_address	gen_context(system_u:object_r:bluetooth_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-3.5.12/policy/modules/services/bluetooth.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-3.5.13/policy/modules/services/bluetooth.if
 --- nsaserefpolicy/policy/modules/services/bluetooth.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/bluetooth.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/bluetooth.if	2008-10-17 10:31:27.000000000 -0400
 @@ -226,3 +226,56 @@
  	dontaudit $1 bluetooth_helper_domain:dir search;
  	dontaudit $1 bluetooth_helper_domain:file { read getattr };
@@ -11732,9 +11758,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_list_pids($1)
 +	admin_pattern($1, bluetooth_var_run_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.5.12/policy/modules/services/bluetooth.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.5.13/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/bluetooth.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/bluetooth.te	2008-10-17 10:31:27.000000000 -0400
 @@ -20,6 +20,9 @@
  type bluetooth_helper_exec_t;
  application_executable_file(bluetooth_helper_exec_t)
@@ -11809,9 +11835,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.5.12/policy/modules/services/clamav.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-3.5.13/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/clamav.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/clamav.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,20 +1,22 @@
  /etc/clamav(/.*)?			gen_context(system_u:object_r:clamd_etc_t,s0)
 +/etc/rc\.d/init\.d/clamd-wrapper	--	gen_context(system_u:object_r:clamd_initrc_exec_t,s0)
@@ -11840,9 +11866,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/log/clamd.*			gen_context(system_u:object_r:clamd_var_log_t,s0)
  
  /var/spool/amavisd/clamd\.sock	-s	gen_context(system_u:object_r:clamd_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-3.5.12/policy/modules/services/clamav.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-3.5.13/policy/modules/services/clamav.if
 --- nsaserefpolicy/policy/modules/services/clamav.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/clamav.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/clamav.if	2008-10-17 10:31:27.000000000 -0400
 @@ -38,6 +38,27 @@
  
  ########################################
@@ -11959,9 +11985,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	admin_pattern($1, freshclam_var_log_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.5.12/policy/modules/services/clamav.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.5.13/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/clamav.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/clamav.te	2008-10-17 10:31:27.000000000 -0400
 @@ -13,7 +13,10 @@
  
  # configuration files
@@ -12051,9 +12077,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	mailscanner_manage_spool(clamscan_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-3.5.12/policy/modules/services/consolekit.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-3.5.13/policy/modules/services/consolekit.fc
 --- nsaserefpolicy/policy/modules/services/consolekit.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/consolekit.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/consolekit.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,3 +1,6 @@
  /usr/sbin/console-kit-daemon	--	gen_context(system_u:object_r:consolekit_exec_t,s0)
  
@@ -12061,9 +12087,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/run/ConsoleKit(/.*)?	--	gen_context(system_u:object_r:consolekit_var_run_t,s0)
 +
 +/var/log/ConsoleKit(/.*)?	gen_context(system_u:object_r:consolekit_log_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.5.12/policy/modules/services/consolekit.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.5.13/policy/modules/services/consolekit.if
 --- nsaserefpolicy/policy/modules/services/consolekit.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/consolekit.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/consolekit.if	2008-10-17 10:31:27.000000000 -0400
 @@ -38,3 +38,24 @@
  	allow $1 consolekit_t:dbus send_msg;
  	allow consolekit_t $1:dbus send_msg;
@@ -12089,9 +12115,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.5.12/policy/modules/services/consolekit.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.5.13/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/consolekit.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/consolekit.te	2008-10-17 10:31:27.000000000 -0400
 @@ -13,6 +13,9 @@
  type consolekit_var_run_t;
  files_pid_file(consolekit_var_run_t)
@@ -12205,9 +12231,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	fs_dontaudit_rw_cifs_files(consolekit_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.fc serefpolicy-3.5.12/policy/modules/services/courier.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.fc serefpolicy-3.5.13/policy/modules/services/courier.fc
 --- nsaserefpolicy/policy/modules/services/courier.fc	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/courier.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/courier.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -19,5 +19,5 @@
  /var/lib/courier(/.*)?			--	gen_context(system_u:object_r:courier_var_lib_t,s0)
  
@@ -12215,9 +12241,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -
  /var/spool/courier(/.*)?			gen_context(system_u:object_r:courier_spool_t,s0)
 +/var/spool/authdaemon(/.*)?			gen_context(system_u:object_r:courier_spool_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.5.12/policy/modules/services/courier.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.5.13/policy/modules/services/courier.te
 --- nsaserefpolicy/policy/modules/services/courier.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/courier.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/courier.te	2008-10-17 10:31:27.000000000 -0400
 @@ -10,6 +10,7 @@
  
  type courier_etc_t;
@@ -12236,9 +12262,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
  #
  # Calendar (PCP) local policy
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.5.12/policy/modules/services/cron.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.5.13/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/cron.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/cron.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -17,6 +17,8 @@
  /var/run/fcron\.fifo		-s	gen_context(system_u:object_r:crond_var_run_t,s0)
  /var/run/fcron\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
@@ -12255,9 +12281,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/lib/misc(/.*)?			gen_context(system_u:object_r:system_crond_var_lib_t,s0)
 +
 +/var/lib/glpi/files(/.*)?		gen_context(system_u:object_r:cron_var_lib_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.5.12/policy/modules/services/cron.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.5.13/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/cron.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/cron.if	2008-10-17 10:31:27.000000000 -0400
 @@ -35,39 +35,24 @@
  #
  template(`cron_per_role_template',`
@@ -12607,9 +12633,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	read_files_pattern($1, system_crond_var_lib_t,  system_crond_var_lib_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.5.12/policy/modules/services/cron.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.5.13/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/cron.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/cron.te	2008-10-17 10:31:27.000000000 -0400
 @@ -12,14 +12,6 @@
  
  ## <desc>
@@ -12881,9 +12907,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	userdom_priveleged_home_dir_manager(system_crond_t)
  ')
 -') dnl end TODO
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.5.12/policy/modules/services/cups.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.5.13/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/cups.fc	2008-10-15 08:41:30.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/cups.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -8,24 +8,35 @@
  /etc/cups/ppd/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/cups/ppds\.dat	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
@@ -12952,9 +12978,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/local/linuxprinter/ppd(/.*)?      gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 +
 +/usr/lib/cups/backend/cups-pdf	--	gen_context(system_u:object_r:cups_pdf_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-3.5.12/policy/modules/services/cups.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-3.5.13/policy/modules/services/cups.if
 --- nsaserefpolicy/policy/modules/services/cups.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/cups.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/cups.if	2008-10-17 10:31:27.000000000 -0400
 @@ -20,6 +20,30 @@
  
  ########################################
@@ -13080,9 +13106,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	admin_pattern($1, hplip_var_run_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.5.12/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/cups.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.5.13/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/cups.te	2008-10-17 10:31:27.000000000 -0400
 @@ -20,6 +20,12 @@
  type cupsd_etc_t;
  files_config_file(cupsd_etc_t)
@@ -13152,15 +13178,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  manage_dirs_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
  manage_files_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t)
  filetrans_pattern(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t, file)
-@@ -104,7 +128,7 @@
+@@ -104,8 +128,8 @@
  
  # allow cups to execute its backend scripts
  can_exec(cupsd_t, cupsd_exec_t)
 -allow cupsd_t cupsd_exec_t:dir search;
+-allow cupsd_t cupsd_exec_t:lnk_file read;
 +allow cupsd_t cupsd_exec_t:dir search_dir_perms;
- allow cupsd_t cupsd_exec_t:lnk_file read;
++allow cupsd_t cupsd_exec_t:lnk_file read_lnk_file_perms;
  
  manage_files_pattern(cupsd_t, cupsd_log_t, cupsd_log_t)
+ allow cupsd_t cupsd_log_t:dir setattr;
 @@ -116,13 +140,20 @@
  manage_fifo_files_pattern(cupsd_t, cupsd_tmp_t, cupsd_tmp_t)
  files_tmp_filetrans(cupsd_t, cupsd_tmp_t, { file dir fifo_file })
@@ -13181,7 +13209,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -read_files_pattern(cupsd_t, hplip_etc_t, hplip_etc_t)
 -
 +allow cupsd_t hplip_t:process sigkill;
- allow cupsd_t hplip_var_run_t:file { read getattr };
+ allow cupsd_t hplip_var_run_t:file read_file_perms;
  
  stream_connect_pattern(cupsd_t, ptal_var_run_t, ptal_var_run_t, ptal_t)
 @@ -149,44 +180,49 @@
@@ -13473,18 +13501,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +sysadm_dontaudit_read_home_content_files(cups_pdf_t)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.5.12/policy/modules/services/cvs.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.5.13/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/cvs.te	2008-10-14 15:01:34.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/cvs.te	2008-10-17 10:31:27.000000000 -0400
 @@ -115,4 +115,5 @@
  	read_files_pattern(httpd_cvs_script_t, cvs_data_t, cvs_data_t)
  	manage_dirs_pattern(httpd_cvs_script_t, cvs_tmp_t, cvs_tmp_t)
  	manage_files_pattern(httpd_cvs_script_t, cvs_tmp_t, cvs_tmp_t)
 +	files_tmp_filetrans(httpd_cvs_script_t, cvs_tmp_t, { file dir })
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.fc serefpolicy-3.5.12/policy/modules/services/dbus.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.fc serefpolicy-3.5.13/policy/modules/services/dbus.fc
 --- nsaserefpolicy/policy/modules/services/dbus.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dbus.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dbus.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -4,6 +4,9 @@
  /usr/bin/dbus-daemon(-1)? --	gen_context(system_u:object_r:system_dbusd_exec_t,s0)
  /bin/dbus-daemon 	--	gen_context(system_u:object_r:system_dbusd_exec_t,s0)
@@ -13495,18 +13523,24 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/lib/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_lib_t,s0)
  
  /var/run/dbus(/.*)?		gen_context(system_u:object_r:system_dbusd_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.5.12/policy/modules/services/dbus.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.5.13/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dbus.if	2008-10-14 15:00:15.000000000 -0400
-@@ -53,6 +53,7 @@
++++ serefpolicy-3.5.13/policy/modules/services/dbus.if	2008-10-17 17:55:07.000000000 -0400
+@@ -53,19 +53,19 @@
  	gen_require(`
  		type system_dbusd_exec_t, system_dbusd_t, dbusd_etc_t;
  		class dbus { send_msg acquire_svc };
 +		attribute dbusd_unconfined;
++		attribute dbusd_userbus;
  	')
  
  	##############################
-@@ -64,8 +65,6 @@
+ 	#
+ 	# Delcarations
+ 	#
+-	type $1_dbusd_t;
++	type $1_dbusd_t, dbusd_userbus;
+ 	domain_type($1_dbusd_t)
  	domain_entry_file($1_dbusd_t, system_dbusd_exec_t)
  	role $3 types $1_dbusd_t;
  
@@ -13515,7 +13549,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	type $1_dbusd_tmp_t;
  	files_tmp_file($1_dbusd_tmp_t)
  
-@@ -84,14 +83,19 @@
+@@ -84,14 +84,19 @@
  	allow $1_dbusd_t self:tcp_socket create_stream_socket_perms;
  	allow $1_dbusd_t self:netlink_selinux_socket create_socket_perms;
  
@@ -13539,7 +13573,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	allow $1_dbusd_t dbusd_etc_t:dir list_dir_perms;
  	read_files_pattern($1_dbusd_t, dbusd_etc_t, dbusd_etc_t)
-@@ -102,10 +106,9 @@
+@@ -102,10 +107,9 @@
  	files_tmp_filetrans($1_dbusd_t, $1_dbusd_tmp_t, { file dir })
  
  	domtrans_pattern($2, system_dbusd_exec_t, $1_dbusd_t)
@@ -13552,7 +13586,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	allow $1_dbusd_t $2:process sigkill;
  	allow $2 $1_dbusd_t:fd use;
  	allow $2 $1_dbusd_t:fifo_file rw_fifo_file_perms;
-@@ -115,8 +118,8 @@
+@@ -115,8 +119,8 @@
  	kernel_read_kernel_sysctls($1_dbusd_t)
  
  	corecmd_list_bin($1_dbusd_t)
@@ -13562,7 +13596,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	corecmd_read_bin_pipes($1_dbusd_t)
  	corecmd_read_bin_sockets($1_dbusd_t)
  
-@@ -139,6 +142,7 @@
+@@ -139,6 +143,7 @@
  
  	fs_getattr_romfs($1_dbusd_t)
  	fs_getattr_xattr_fs($1_dbusd_t)
@@ -13570,7 +13604,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	selinux_get_fs_mount($1_dbusd_t)
  	selinux_validate_context($1_dbusd_t)
-@@ -161,12 +165,24 @@
+@@ -161,12 +166,24 @@
  	seutil_read_config($1_dbusd_t)
  	seutil_read_default_contexts($1_dbusd_t)
  
@@ -13596,7 +13630,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	tunable_policy(`read_default_t',`
  		files_list_default($1_dbusd_t)
  		files_read_default_files($1_dbusd_t)
-@@ -180,9 +196,17 @@
+@@ -180,9 +197,17 @@
  	')
  
  	optional_policy(`
@@ -13614,7 +13648,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  #######################################
-@@ -207,14 +231,12 @@
+@@ -207,14 +232,12 @@
  		type system_dbusd_t, system_dbusd_t;
  		type system_dbusd_var_run_t, system_dbusd_var_lib_t;
  		class dbus send_msg;
@@ -13632,7 +13666,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	read_files_pattern($2, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
  	files_search_var_lib($2)
-@@ -223,6 +245,10 @@
+@@ -223,6 +246,10 @@
  	files_search_pids($2)
  	stream_connect_pattern($2, system_dbusd_var_run_t, system_dbusd_var_run_t, system_dbusd_t)
  	dbus_read_config($2)
@@ -13643,7 +13677,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  #######################################
-@@ -251,18 +277,16 @@
+@@ -251,18 +278,16 @@
  template(`dbus_user_bus_client_template',`
  	gen_require(`
  		type $1_dbusd_t;
@@ -13664,7 +13698,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -292,6 +316,55 @@
+@@ -292,6 +317,55 @@
  
  ########################################
  ## <summary>
@@ -13720,7 +13754,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Read dbus configuration.
  ## </summary>
  ## <param name="domain">
-@@ -366,3 +439,75 @@
+@@ -366,3 +440,99 @@
  
  	allow $1 system_dbusd_t:dbus *;
  ')
@@ -13763,7 +13797,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	gen_require(`
 +		type system_dbusd_t;
 +		role system_r;
-+
 +	')
 +
 +	domain_type($1)
@@ -13796,14 +13829,40 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow $1 system_dbusd_t:tcp_socket { read write };
 +	allow $1 system_dbusd_t:fd use;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.5.12/policy/modules/services/dbus.te
---- nsaserefpolicy/policy/modules/services/dbus.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dbus.te	2008-10-14 15:00:15.000000000 -0400
-@@ -9,9 +9,10 @@
++
++########################################
++## <summary>
++##	connectto a message on user/application specific DBUS.
++## </summary>
++## <param name="domain_prefix">
++##	<summary>
++##	The prefix of the domain (e.g., user
++##	is the prefix for user_t).
++##	</summary>
++## </param>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++template(`dbus_dontaudit_connectto_user_bus',`
++	gen_require(`
++		attribute dbusd_userbus;
++	')
++
++
++	dontaudit $2 dbusd_userbus:unix_stream_socket connectto;
++')
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.5.13/policy/modules/services/dbus.te
+--- nsaserefpolicy/policy/modules/services/dbus.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dbus.te	2008-10-17 17:54:43.000000000 -0400
+@@ -9,9 +9,11 @@
  #
  # Delcarations
  #
 +attribute dbusd_unconfined;
++attribute dbusd_userbus;
  
  type dbusd_etc_t alias etc_dbusd_t;
 -files_type(dbusd_etc_t)
@@ -13811,7 +13870,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  type system_dbusd_t alias dbusd_t;
  type system_dbusd_exec_t;
-@@ -21,11 +22,23 @@
+@@ -21,11 +23,23 @@
  files_tmp_file(system_dbusd_tmp_t)
  
  type system_dbusd_var_lib_t;
@@ -13836,16 +13895,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##############################
  #
  # Local policy
-@@ -35,7 +48,7 @@
+@@ -35,7 +49,7 @@
  # cjp: dac_override should probably go in a distro_debian
  allow system_dbusd_t self:capability { dac_override setgid setpcap setuid };
  dontaudit system_dbusd_t self:capability sys_tty_config;
 -allow system_dbusd_t self:process { getattr signal_perms setcap };
 +allow system_dbusd_t self:process { getattr signal_perms setpgid getcap setcap };
- allow system_dbusd_t self:fifo_file { read write };
+ allow system_dbusd_t self:fifo_file rw_fifo_file_perms;
  allow system_dbusd_t self:dbus { send_msg acquire_svc };
  allow system_dbusd_t self:unix_stream_socket { connectto create_stream_socket_perms connectto };
-@@ -43,6 +56,8 @@
+@@ -43,6 +57,8 @@
  # Receive notifications of policy reloads and enforcing status changes.
  allow system_dbusd_t self:netlink_selinux_socket { create bind read };
  
@@ -13854,7 +13913,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow system_dbusd_t dbusd_etc_t:dir list_dir_perms;
  read_files_pattern(system_dbusd_t, dbusd_etc_t, dbusd_etc_t)
  read_lnk_files_pattern(system_dbusd_t, dbusd_etc_t, dbusd_etc_t)
-@@ -65,6 +80,8 @@
+@@ -65,6 +81,8 @@
  
  fs_getattr_all_fs(system_dbusd_t)
  fs_search_auto_mountpoints(system_dbusd_t)
@@ -13863,7 +13922,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  selinux_get_fs_mount(system_dbusd_t)
  selinux_validate_context(system_dbusd_t)
-@@ -81,7 +98,6 @@
+@@ -81,7 +99,6 @@
  corecmd_list_bin(system_dbusd_t)
  corecmd_read_bin_pipes(system_dbusd_t)
  corecmd_read_bin_sockets(system_dbusd_t)
@@ -13871,7 +13930,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  domain_use_interactive_fds(system_dbusd_t)
  
-@@ -91,6 +107,9 @@
+@@ -91,6 +108,9 @@
  
  init_use_fds(system_dbusd_t)
  init_use_script_ptys(system_dbusd_t)
@@ -13881,7 +13940,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  libs_use_ld_so(system_dbusd_t)
  libs_use_shared_libs(system_dbusd_t)
-@@ -122,9 +141,38 @@
+@@ -122,9 +142,38 @@
  ')
  
  optional_policy(`
@@ -13920,9 +13979,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +		xserver_rw_xdm_xserver_shm(unconfined_dbusd_t)
 +	')
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.if serefpolicy-3.5.12/policy/modules/services/dcc.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.if serefpolicy-3.5.13/policy/modules/services/dcc.if
 --- nsaserefpolicy/policy/modules/services/dcc.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dcc.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dcc.if	2008-10-17 10:31:27.000000000 -0400
 @@ -72,6 +72,24 @@
  
  ########################################
@@ -13948,9 +14007,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Execute dcc_client in the dcc_client domain, and
  ##	allow the specified role the dcc_client domain.
  ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.5.12/policy/modules/services/dcc.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.5.13/policy/modules/services/dcc.te
 --- nsaserefpolicy/policy/modules/services/dcc.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dcc.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dcc.te	2008-10-17 10:31:27.000000000 -0400
 @@ -105,6 +105,8 @@
  files_read_etc_files(cdcc_t)
  files_read_etc_runtime_files(cdcc_t)
@@ -14120,17 +14179,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	seutil_sigchld_newrole(dccm_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.fc serefpolicy-3.5.12/policy/modules/services/dhcp.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.fc serefpolicy-3.5.13/policy/modules/services/dhcp.fc
 --- nsaserefpolicy/policy/modules/services/dhcp.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dhcp.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dhcp.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,3 +1,4 @@
 +/etc/rc\.d/init\.d/dhcpd	--	gen_context(system_u:object_r:dhcpd_initrc_exec_t,s0)
  
  /usr/sbin/dhcpd.*		--	gen_context(system_u:object_r:dhcpd_exec_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.if serefpolicy-3.5.12/policy/modules/services/dhcp.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.if serefpolicy-3.5.13/policy/modules/services/dhcp.if
 --- nsaserefpolicy/policy/modules/services/dhcp.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dhcp.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dhcp.if	2008-10-17 10:31:27.000000000 -0400
 @@ -19,3 +19,63 @@
  	sysnet_search_dhcp_state($1)
  	allow $1 dhcpd_state_t:file setattr;
@@ -14195,9 +14254,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_list_pids($1)
 +	admin_pattern($1, dhcpd_var_run_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-3.5.12/policy/modules/services/dhcp.te
---- nsaserefpolicy/policy/modules/services/dhcp.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dhcp.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-3.5.13/policy/modules/services/dhcp.te
+--- nsaserefpolicy/policy/modules/services/dhcp.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dhcp.te	2008-10-17 10:31:27.000000000 -0400
 @@ -10,6 +10,9 @@
  type dhcpd_exec_t;
  init_daemon_domain(dhcpd_t, dhcpd_exec_t)
@@ -14216,7 +14275,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +allow dhcpd_t self:capability { net_raw sys_resource };
  dontaudit dhcpd_t self:capability { net_admin sys_tty_config };
  allow dhcpd_t self:process signal_perms;
- allow dhcpd_t self:fifo_file { read write getattr };
+ allow dhcpd_t self:fifo_file rw_fifo_file_perms;
  allow dhcpd_t self:unix_dgram_socket create_socket_perms;
  allow dhcpd_t self:unix_stream_socket create_socket_perms;
 -allow dhcpd_t self:netlink_route_socket r_netlink_socket_perms;
@@ -14263,9 +14322,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	seutil_sigchld_newrole(dhcpd_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.fc serefpolicy-3.5.12/policy/modules/services/dnsmasq.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.fc serefpolicy-3.5.13/policy/modules/services/dnsmasq.fc
 --- nsaserefpolicy/policy/modules/services/dnsmasq.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dnsmasq.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dnsmasq.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,4 +1,7 @@
 +/etc/rc\.d/init\.d/dnsmasq	--	gen_context(system_u:object_r:dnsmasq_initrc_exec_t,s0)
 +
@@ -14274,9 +14333,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/lib/misc/dnsmasq\.leases	--	gen_context(system_u:object_r:dnsmasq_lease_t,s0)
 +/var/lib/dnsmasq(/.*)?		gen_context(system_u:object_r:dnsmasq_lease_t,s0)
  /var/run/dnsmasq\.pid		--	gen_context(system_u:object_r:dnsmasq_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.if serefpolicy-3.5.12/policy/modules/services/dnsmasq.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.if serefpolicy-3.5.13/policy/modules/services/dnsmasq.if
 --- nsaserefpolicy/policy/modules/services/dnsmasq.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dnsmasq.if	2008-10-16 14:44:18.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dnsmasq.if	2008-10-17 10:31:27.000000000 -0400
 @@ -1 +1,137 @@
  ## <summary>dnsmasq DNS forwarder and DHCP server</summary>
 +
@@ -14415,9 +14474,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_list_pids($1)
 +	admin_pattern($1, dnsmasq_var_run_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.5.12/policy/modules/services/dnsmasq.te
---- nsaserefpolicy/policy/modules/services/dnsmasq.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dnsmasq.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.5.13/policy/modules/services/dnsmasq.te
+--- nsaserefpolicy/policy/modules/services/dnsmasq.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dnsmasq.te	2008-10-17 10:31:27.000000000 -0400
 @@ -10,6 +10,9 @@
  type dnsmasq_exec_t;
  init_daemon_domain(dnsmasq_t, dnsmasq_exec_t)
@@ -14434,7 +14493,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  dontaudit dnsmasq_t self:capability sys_tty_config;
 -allow dnsmasq_t self:process { setcap signal_perms };
 +allow dnsmasq_t self:process { getcap setcap signal_perms };
- allow dnsmasq_t self:fifo_file { read write };
+ allow dnsmasq_t self:fifo_file rw_fifo_file_perms;
  allow dnsmasq_t self:netlink_route_socket { bind create nlmsg_read read write };
  allow dnsmasq_t self:tcp_socket create_stream_socket_perms;
 @@ -32,7 +35,7 @@
@@ -14464,9 +14523,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	virt_manage_lib_files(dnsmasq_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.5.12/policy/modules/services/dovecot.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.5.13/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dovecot.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dovecot.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -6,6 +6,7 @@
  /etc/dovecot\.passwd.*			gen_context(system_u:object_r:dovecot_passwd_t,s0)
  
@@ -14504,9 +14563,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/log/dovecot\.log.*			gen_context(system_u:object_r:dovecot_var_log_t,s0)
  
 +/var/spool/dovecot(/.*)?		gen_context(system_u:object_r:dovecot_spool_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-3.5.12/policy/modules/services/dovecot.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.if serefpolicy-3.5.13/policy/modules/services/dovecot.if
 --- nsaserefpolicy/policy/modules/services/dovecot.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dovecot.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dovecot.if	2008-10-17 10:31:27.000000000 -0400
 @@ -21,7 +21,46 @@
  
  ########################################
@@ -14616,9 +14675,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.5.12/policy/modules/services/dovecot.te
---- nsaserefpolicy/policy/modules/services/dovecot.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/dovecot.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.5.13/policy/modules/services/dovecot.te
+--- nsaserefpolicy/policy/modules/services/dovecot.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/dovecot.te	2008-10-17 10:31:27.000000000 -0400
 @@ -15,12 +15,21 @@
  domain_entry_file(dovecot_auth_t, dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -14695,9 +14754,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow dovecot_auth_t self:unix_stream_socket create_stream_socket_perms;
  
 -allow dovecot_auth_t dovecot_t:unix_stream_socket { getattr accept read write ioctl };
-+allow dovecot_auth_t dovecot_t:unix_stream_socket { getattr accept read write ioctl connectto };
++allow dovecot_auth_t dovecot_t:unix_stream_socket rw_socket_perms;
  
- allow dovecot_auth_t dovecot_passwd_t:file { getattr read };
+ allow dovecot_auth_t dovecot_passwd_t:file read_file_perms;
  
 +manage_dirs_pattern(dovecot_auth_t, dovecot_auth_tmp_t, dovecot_auth_tmp_t)
 +manage_files_pattern(dovecot_auth_t, dovecot_auth_tmp_t, dovecot_auth_tmp_t)
@@ -14788,9 +14847,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	mta_manage_spool(dovecot_deliver_t)
  ')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.if serefpolicy-3.5.12/policy/modules/services/exim.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.if serefpolicy-3.5.13/policy/modules/services/exim.if
 --- nsaserefpolicy/policy/modules/services/exim.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/exim.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/exim.if	2008-10-17 10:31:27.000000000 -0400
 @@ -97,6 +97,26 @@
  
  ########################################
@@ -14842,9 +14901,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	manage_dirs_pattern($1, exim_spool_t, exim_spool_t)
 +	files_search_spool($1)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.5.12/policy/modules/services/exim.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.5.13/policy/modules/services/exim.te
 --- nsaserefpolicy/policy/modules/services/exim.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/exim.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/exim.te	2008-10-17 10:31:27.000000000 -0400
 @@ -21,9 +21,20 @@
  ## </desc>
  gen_tunable(exim_manage_user_files, false)
@@ -14871,10 +14930,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  #
  
 -allow exim_t self:capability { dac_override dac_read_search setuid setgid fowner chown };
--allow exim_t self:fifo_file rw_fifo_file_perms;
 +allow exim_t self:capability { chown dac_override dac_read_search fowner setuid setgid sys_resource  };
 +allow exim_t self:process { setrlimit setpgid };
-+allow exim_t self:fifo_file rw_file_perms;
+ allow exim_t self:fifo_file rw_fifo_file_perms;
  allow exim_t self:unix_stream_socket create_stream_socket_perms;
  allow exim_t self:tcp_socket create_stream_socket_perms;
 +allow exim_t self:udp_socket create_socket_perms;
@@ -15012,9 +15070,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	spamassassin_exec(exim_t)
 +	spamassassin_exec_client(exim_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.if serefpolicy-3.5.12/policy/modules/services/fetchmail.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.if serefpolicy-3.5.13/policy/modules/services/fetchmail.if
 --- nsaserefpolicy/policy/modules/services/fetchmail.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/fetchmail.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/fetchmail.if	2008-10-17 10:31:27.000000000 -0400
 @@ -21,10 +21,10 @@
  	ps_process_pattern($1, fetchmail_t)
  
@@ -15029,9 +15087,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	manage_files_pattern($1, fetchmail_var_run_t, fetchmail_var_run_t)
 +	admin_pattern($1, fetchmail_var_run_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.5.12/policy/modules/services/fetchmail.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.5.13/policy/modules/services/fetchmail.te
 --- nsaserefpolicy/policy/modules/services/fetchmail.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/fetchmail.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/fetchmail.te	2008-10-17 10:31:27.000000000 -0400
 @@ -91,6 +91,10 @@
  ')
  
@@ -15043,9 +15101,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	seutil_sigchld_newrole(fetchmail_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.5.12/policy/modules/services/ftp.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.5.13/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/ftp.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/ftp.te	2008-10-17 10:31:27.000000000 -0400
 @@ -226,6 +226,11 @@
  	userdom_manage_all_users_home_content_dirs(ftpd_t)
  	userdom_manage_all_users_home_content_files(ftpd_t)
@@ -15084,15 +15142,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	seutil_sigchld_newrole(ftpd_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.fc serefpolicy-3.5.12/policy/modules/services/gamin.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.fc serefpolicy-3.5.13/policy/modules/services/gamin.fc
 --- nsaserefpolicy/policy/modules/services/gamin.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/gamin.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/gamin.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,2 @@
 +
 +/usr/libexec/gam_server	--	gen_context(system_u:object_r:gamin_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.if serefpolicy-3.5.12/policy/modules/services/gamin.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.if serefpolicy-3.5.13/policy/modules/services/gamin.if
 --- nsaserefpolicy/policy/modules/services/gamin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/gamin.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/gamin.if	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,57 @@
 +
 +## <summary>policy for gamin</summary>
@@ -15151,9 +15209,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	allow $1 gamin_t:unix_stream_socket connectto;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.te serefpolicy-3.5.12/policy/modules/services/gamin.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gamin.te serefpolicy-3.5.13/policy/modules/services/gamin.te
 --- nsaserefpolicy/policy/modules/services/gamin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/gamin.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/gamin.te	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,39 @@
 +policy_module(gamin, 1.0.0)
 +
@@ -15194,16 +15252,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +miscfiles_read_localization(gamin_t)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.fc serefpolicy-3.5.12/policy/modules/services/gnomeclock.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.fc serefpolicy-3.5.13/policy/modules/services/gnomeclock.fc
 --- nsaserefpolicy/policy/modules/services/gnomeclock.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/gnomeclock.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/gnomeclock.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,3 @@
 +
 +/usr/libexec/gnome-clock-applet-mechanism	--	gen_context(system_u:object_r:gnomeclock_exec_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.if serefpolicy-3.5.12/policy/modules/services/gnomeclock.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.if serefpolicy-3.5.13/policy/modules/services/gnomeclock.if
 --- nsaserefpolicy/policy/modules/services/gnomeclock.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/gnomeclock.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/gnomeclock.if	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,75 @@
 +
 +## <summary>policy for gnomeclock</summary>
@@ -15280,9 +15338,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow $1 gnomeclock_t:dbus send_msg;
 +	allow gnomeclock_t $1:dbus send_msg;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.te serefpolicy-3.5.12/policy/modules/services/gnomeclock.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gnomeclock.te serefpolicy-3.5.13/policy/modules/services/gnomeclock.te
 --- nsaserefpolicy/policy/modules/services/gnomeclock.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/gnomeclock.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/gnomeclock.te	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,55 @@
 +policy_module(gnomeclock, 1.0.0)
 +########################################
@@ -15339,9 +15397,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	polkit_read_lib(gnomeclock_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.5.12/policy/modules/services/hal.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.5.13/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/hal.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/hal.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -9,6 +9,7 @@
  /usr/libexec/hal-system-sonypic	 	--	gen_context(system_u:object_r:hald_sonypic_exec_t,s0)
  /usr/libexec/hald-addon-macbookpro-backlight --	gen_context(system_u:object_r:hald_mac_exec_t,s0)
@@ -15359,9 +15417,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  /var/run/hald(/.*)?				gen_context(system_u:object_r:hald_var_run_t,s0)
  /var/run/haldaemon\.pid	--	 		gen_context(system_u:object_r:hald_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.5.12/policy/modules/services/hal.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.5.13/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/hal.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/hal.if	2008-10-17 10:31:27.000000000 -0400
 @@ -302,3 +302,42 @@
  	files_search_pids($1)
  	allow $1 hald_var_run_t:file rw_file_perms;
@@ -15405,9 +15463,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	read_lnk_files_pattern($1, hald_t, hald_t)
 +	dontaudit $1 hald_t:process ptrace;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.5.12/policy/modules/services/hal.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.5.13/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/hal.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/hal.te	2008-10-17 10:31:27.000000000 -0400
 @@ -49,6 +49,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -15516,9 +15574,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Should be removed when this is fixed
 -#cron_read_system_job_lib_files(hald_t)
 +cron_read_system_job_lib_files(hald_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.fc serefpolicy-3.5.12/policy/modules/services/inetd.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.fc serefpolicy-3.5.13/policy/modules/services/inetd.fc
 --- nsaserefpolicy/policy/modules/services/inetd.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/inetd.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/inetd.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,6 +1,8 @@
  
  /usr/sbin/identd	--	gen_context(system_u:object_r:inetd_child_exec_t,s0)
@@ -15528,9 +15586,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /usr/sbin/inetd		--	gen_context(system_u:object_r:inetd_exec_t,s0)
  /usr/sbin/rlinetd	--	gen_context(system_u:object_r:inetd_exec_t,s0)
  /usr/sbin/xinetd	--	gen_context(system_u:object_r:inetd_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.5.12/policy/modules/services/inetd.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.5.13/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/inetd.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/inetd.te	2008-10-17 10:31:27.000000000 -0400
 @@ -136,6 +136,7 @@
  domain_use_interactive_fds(inetd_t)
  
@@ -15547,9 +15605,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  auth_use_nsswitch(inetd_child_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.5.12/policy/modules/services/kerberos.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.5.13/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/kerberos.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/kerberos.te	2008-10-17 10:31:27.000000000 -0400
 @@ -298,6 +298,7 @@
  corenet_tcp_sendrecv_all_nodes(kpropd_t)
  corenet_tcp_sendrecv_all_ports(kpropd_t)
@@ -15558,9 +15616,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  dev_read_urand(kpropd_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-3.5.12/policy/modules/services/ldap.te
---- nsaserefpolicy/policy/modules/services/ldap.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/ldap.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-3.5.13/policy/modules/services/ldap.te
+--- nsaserefpolicy/policy/modules/services/ldap.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/ldap.te	2008-10-17 10:31:27.000000000 -0400
 @@ -121,7 +121,7 @@
  sysadm_dontaudit_search_home_dirs(slapd_t)
  
@@ -15570,9 +15628,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.fc serefpolicy-3.5.12/policy/modules/services/lpd.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.fc serefpolicy-3.5.13/policy/modules/services/lpd.fc
 --- nsaserefpolicy/policy/modules/services/lpd.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/lpd.fc	2008-10-15 08:33:26.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/lpd.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -3,6 +3,8 @@
  #
  /dev/printer		-s	gen_context(system_u:object_r:printer_t,s0)
@@ -15598,17 +15656,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/spool/lpd(/.*)?		gen_context(system_u:object_r:print_spool_t,s0)
  /var/run/lprng(/.*)?		gen_context(system_u:object_r:lpd_var_run_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.fc serefpolicy-3.5.12/policy/modules/services/mailman.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.fc serefpolicy-3.5.13/policy/modules/services/mailman.fc
 --- nsaserefpolicy/policy/modules/services/mailman.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/mailman.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mailman.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -31,3 +31,4 @@
  /var/lock/mailman(/.*)?			gen_context(system_u:object_r:mailman_lock_t,s0)
  /var/spool/mailman(/.*)?		gen_context(system_u:object_r:mailman_data_t,s0)
  ')
 +/usr/lib/mailman/mail/mailman --	gen_context(system_u:object_r:mailman_mail_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-3.5.12/policy/modules/services/mailman.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-3.5.13/policy/modules/services/mailman.if
 --- nsaserefpolicy/policy/modules/services/mailman.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/mailman.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mailman.if	2008-10-17 10:31:27.000000000 -0400
 @@ -31,6 +31,12 @@
  	allow mailman_$1_t self:tcp_socket create_stream_socket_perms;
  	allow mailman_$1_t self:udp_socket create_socket_perms;
@@ -15656,9 +15714,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Append to mailman logs.
  ## </summary>
  ## <param name="domain">
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.5.12/policy/modules/services/mailman.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.5.13/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/mailman.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mailman.te	2008-10-17 10:31:27.000000000 -0400
 @@ -53,10 +53,9 @@
  	apache_use_fds(mailman_cgi_t)
  	apache_dontaudit_append_log(mailman_cgi_t)
@@ -15712,15 +15770,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  optional_policy(`
  	cron_system_entry(mailman_queue_t, mailman_queue_exec_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.fc serefpolicy-3.5.12/policy/modules/services/mailscanner.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.fc serefpolicy-3.5.13/policy/modules/services/mailscanner.fc
 --- nsaserefpolicy/policy/modules/services/mailscanner.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/mailscanner.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mailscanner.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,2 @@
 +/var/spool/MailScanner(/.*)?	gen_context(system_u:object_r:mailscanner_spool_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.if serefpolicy-3.5.12/policy/modules/services/mailscanner.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.if serefpolicy-3.5.13/policy/modules/services/mailscanner.if
 --- nsaserefpolicy/policy/modules/services/mailscanner.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/mailscanner.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mailscanner.if	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,59 @@
 +## <summary>Anti-Virus and Anti-Spam Filter</summary>
 +
@@ -15781,18 +15839,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_search_spool($1)
 +	manage_files_pattern($1, mailscanner_spool_t, mailscanner_spool_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.te serefpolicy-3.5.12/policy/modules/services/mailscanner.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailscanner.te serefpolicy-3.5.13/policy/modules/services/mailscanner.te
 --- nsaserefpolicy/policy/modules/services/mailscanner.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/mailscanner.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mailscanner.te	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,5 @@
 +
 +policy_module(mailscanner, 1.0.0)
 +
 +type mailscanner_spool_t;
 +files_type(mailscanner_spool_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.5.12/policy/modules/services/mta.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.5.13/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2008-09-12 10:48:05.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/mta.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mta.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -22,7 +22,3 @@
  /var/spool/imap(/.*)?		gen_context(system_u:object_r:mail_spool_t,s0)
  /var/spool/(client)?mqueue(/.*)? gen_context(system_u:object_r:mqueue_spool_t,s0)
@@ -15801,9 +15859,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -#ifdef(`postfix.te', `', `
 -#/var/spool/postfix(/.*)?	gen_context(system_u:object_r:mail_spool_t,s0)
 -#')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.5.12/policy/modules/services/mta.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.5.13/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/mta.if	2008-10-14 15:06:51.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mta.if	2008-10-17 10:31:27.000000000 -0400
 @@ -133,6 +133,15 @@
  		sendmail_create_log($1_mail_t)
  	')
@@ -15854,7 +15912,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	')
  ')
  
-@@ -893,6 +911,25 @@
+@@ -893,6 +910,25 @@
  
  ########################################
  ## <summary>
@@ -15880,9 +15938,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Create, read, write, and delete
  ##	mail queue files.
  ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.5.12/policy/modules/services/mta.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.5.13/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/mta.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mta.te	2008-10-17 10:31:27.000000000 -0400
 @@ -39,34 +39,50 @@
  #
  
@@ -16015,9 +16073,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
  	# why is mail delivered to a directory of type arpwatch_data_t?
  	arpwatch_search_data(mailserver_delivery)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.fc serefpolicy-3.5.12/policy/modules/services/munin.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.fc serefpolicy-3.5.13/policy/modules/services/munin.fc
 --- nsaserefpolicy/policy/modules/services/munin.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/munin.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/munin.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,4 +1,5 @@
  /etc/munin(/.*)?			gen_context(system_u:object_r:munin_etc_t,s0)
 +/etc/rc\.d/init\.d/munin-node	--	gen_context(system_u:object_r:munin_initrc_exec_t,s0)
@@ -16035,9 +16093,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/www/html/munin(/.*)?		gen_context(system_u:object_r:httpd_munin_content_t,s0)
 +/var/www/html/munin/cgi(/.*)?		gen_context(system_u:object_r:httpd_munin_script_exec_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.if serefpolicy-3.5.12/policy/modules/services/munin.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.if serefpolicy-3.5.13/policy/modules/services/munin.if
 --- nsaserefpolicy/policy/modules/services/munin.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/munin.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/munin.if	2008-10-17 10:31:27.000000000 -0400
 @@ -80,3 +80,76 @@
  
  	dontaudit $1 munin_var_lib_t:dir search_dir_perms;
@@ -16115,9 +16173,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	admin_pattern($1, httpd_munin_content_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.te serefpolicy-3.5.12/policy/modules/services/munin.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.te serefpolicy-3.5.13/policy/modules/services/munin.te
 --- nsaserefpolicy/policy/modules/services/munin.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/munin.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/munin.te	2008-10-17 10:31:27.000000000 -0400
 @@ -13,6 +13,9 @@
  type munin_etc_t alias lrrd_etc_t;
  files_config_file(munin_etc_t)
@@ -16245,9 +16303,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +manage_dirs_pattern(munin_t, httpd_munin_content_t, httpd_munin_content_t)
 +manage_files_pattern(munin_t, httpd_munin_content_t, httpd_munin_content_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.fc serefpolicy-3.5.12/policy/modules/services/mysql.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.fc serefpolicy-3.5.13/policy/modules/services/mysql.fc
 --- nsaserefpolicy/policy/modules/services/mysql.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/mysql.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mysql.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -5,6 +5,7 @@
  #
  /etc/my\.cnf		--	gen_context(system_u:object_r:mysqld_etc_t,s0)
@@ -16256,9 +16314,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  #
  # /usr
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.if serefpolicy-3.5.12/policy/modules/services/mysql.if
---- nsaserefpolicy/policy/modules/services/mysql.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/mysql.if	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.if serefpolicy-3.5.13/policy/modules/services/mysql.if
+--- nsaserefpolicy/policy/modules/services/mysql.if	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mysql.if	2008-10-17 10:31:27.000000000 -0400
 @@ -53,9 +53,11 @@
  interface(`mysql_stream_connect',`
  	gen_require(`
@@ -16271,6 +16329,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
+@@ -157,7 +159,7 @@
+ 
+ 	files_search_var_lib($1)
+ 	allow $1 mysqld_db_t:dir search;
+-	allow $1 mysqld_db_t:sock_file rw_sock_file_perms;
++	allow $1 mysqld_db_t:sock_file rw_file_perms;
+ ')
+ 
+ ########################################
 @@ -178,3 +180,47 @@
  	logging_search_logs($1)
  	allow $1 mysqld_log_t:file { write append setattr ioctl };
@@ -16319,9 +16386,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	admin_pattern($1, mysqld_tmp_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.5.12/policy/modules/services/mysql.te
---- nsaserefpolicy/policy/modules/services/mysql.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/mysql.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.5.13/policy/modules/services/mysql.te
+--- nsaserefpolicy/policy/modules/services/mysql.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/mysql.te	2008-10-17 10:31:27.000000000 -0400
 @@ -19,6 +19,9 @@
  type mysqld_etc_t alias etc_mysqld_t;
  files_config_file(mysqld_etc_t)
@@ -16332,12 +16399,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  type mysqld_log_t;
  logging_log_file(mysqld_log_t)
  
-@@ -33,7 +36,8 @@
- allow mysqld_t self:capability { dac_override setgid setuid sys_resource net_bind_service };
+@@ -34,6 +37,7 @@
  dontaudit mysqld_t self:capability sys_tty_config;
  allow mysqld_t self:process { setsched getsched setrlimit signal_perms rlimitinh };
--allow mysqld_t self:fifo_file { read write };
-+allow mysqld_t self:fifo_file rw_fifo_file_perms;
+ allow mysqld_t self:fifo_file rw_fifo_file_perms;
 +allow mysqld_t self:shm create_shm_perms;
  allow mysqld_t self:unix_stream_socket create_stream_socket_perms;
  allow mysqld_t self:tcp_socket create_stream_socket_perms;
@@ -16350,9 +16415,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  domain_use_interactive_fds(mysqld_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.5.12/policy/modules/services/nagios.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.5.13/policy/modules/services/nagios.fc
 --- nsaserefpolicy/policy/modules/services/nagios.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/nagios.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/nagios.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,16 +1,19 @@
  /etc/nagios(/.*)?			gen_context(system_u:object_r:nagios_etc_t,s0)
  /etc/nagios/nrpe\.cfg		--	gen_context(system_u:object_r:nrpe_etc_t,s0)
@@ -16377,9 +16442,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 +/usr/lib(64)?/cgi-bin/nagios(/.+)?	gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.5.12/policy/modules/services/nagios.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.5.13/policy/modules/services/nagios.if
 --- nsaserefpolicy/policy/modules/services/nagios.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/nagios.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/nagios.if	2008-10-17 10:31:27.000000000 -0400
 @@ -44,7 +44,7 @@
  
  ########################################
@@ -16460,9 +16525,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	admin_pattern($1, nrpe_etc_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.5.12/policy/modules/services/nagios.te
---- nsaserefpolicy/policy/modules/services/nagios.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/nagios.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.5.13/policy/modules/services/nagios.te
+--- nsaserefpolicy/policy/modules/services/nagios.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/nagios.te	2008-10-17 10:31:27.000000000 -0400
 @@ -10,13 +10,12 @@
  type nagios_exec_t;
  init_daemon_domain(nagios_t, nagios_exec_t)
@@ -16561,9 +16626,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ########################################
  #
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.5.12/policy/modules/services/networkmanager.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.5.13/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2008-09-24 09:07:28.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/networkmanager.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/networkmanager.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,8 +1,12 @@
 +/etc/NetworkManager/dispatcher\.d(/.*)	gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0)
 +
@@ -16582,9 +16647,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/wpa_supplicant(/.*)?		gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
  /var/run/wpa_supplicant-global	-s	gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
 +/var/run/nm-dhclient.*			gen_context(system_u:object_r:NetworkManager_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.5.12/policy/modules/services/networkmanager.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.5.13/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/networkmanager.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/networkmanager.if	2008-10-17 10:31:27.000000000 -0400
 @@ -118,6 +118,24 @@
  
  ########################################
@@ -16610,9 +16675,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Read NetworkManager PID files.
  ## </summary>
  ## <param name="domain">
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.5.12/policy/modules/services/networkmanager.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.5.13/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/networkmanager.te	2008-10-16 14:35:40.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/networkmanager.te	2008-10-17 10:31:27.000000000 -0400
 @@ -33,9 +33,9 @@
  
  # networkmanager will ptrace itself if gdb is installed
@@ -16801,9 +16866,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.5.12/policy/modules/services/nis.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.5.13/policy/modules/services/nis.fc
 --- nsaserefpolicy/policy/modules/services/nis.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/nis.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/nis.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,9 +1,13 @@
  
 +/etc/rc\.d/init\.d/yppasswd	--	gen_context(system_u:object_r:nis_initrc_exec_t,s0)
@@ -16818,9 +16883,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  /usr/sbin/rpc\.yppasswdd --	gen_context(system_u:object_r:yppasswdd_exec_t,s0)
  /usr/sbin/rpc\.ypxfrd	--	gen_context(system_u:object_r:ypxfr_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.5.12/policy/modules/services/nis.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.5.13/policy/modules/services/nis.if
 --- nsaserefpolicy/policy/modules/services/nis.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/nis.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/nis.if	2008-10-17 10:31:27.000000000 -0400
 @@ -28,7 +28,7 @@
  		type var_yp_t;
  	')
@@ -16951,9 +17016,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.5.12/policy/modules/services/nis.te
---- nsaserefpolicy/policy/modules/services/nis.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/nis.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.5.13/policy/modules/services/nis.te
+--- nsaserefpolicy/policy/modules/services/nis.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/nis.te	2008-10-17 10:31:27.000000000 -0400
 @@ -44,6 +44,9 @@
  type ypxfr_exec_t;
  init_daemon_domain(ypxfr_t, ypxfr_exec_t)
@@ -17022,17 +17087,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  corenet_dontaudit_tcp_bind_all_reserved_ports(ypxfr_t)
  corenet_dontaudit_udp_bind_all_reserved_ports(ypxfr_t)
  corenet_tcp_connect_all_ports(ypxfr_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.fc serefpolicy-3.5.12/policy/modules/services/nscd.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.fc serefpolicy-3.5.13/policy/modules/services/nscd.fc
 --- nsaserefpolicy/policy/modules/services/nscd.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/nscd.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/nscd.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,3 +1,4 @@
 +/etc/rc\.d/init\.d/nscd	--	gen_context(system_u:object_r:nscd_initrc_exec_t,s0)
  
  /usr/sbin/nscd		--	gen_context(system_u:object_r:nscd_exec_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.5.12/policy/modules/services/nscd.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.5.13/policy/modules/services/nscd.if
 --- nsaserefpolicy/policy/modules/services/nscd.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/nscd.if	2008-10-16 14:11:03.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/nscd.if	2008-10-17 10:31:27.000000000 -0400
 @@ -20,6 +20,42 @@
  
  ########################################
@@ -17155,9 +17220,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	admin_pattern($1, nscd_var_run_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.5.12/policy/modules/services/nscd.te
---- nsaserefpolicy/policy/modules/services/nscd.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/nscd.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.5.13/policy/modules/services/nscd.te
+--- nsaserefpolicy/policy/modules/services/nscd.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/nscd.te	2008-10-17 10:31:27.000000000 -0400
 @@ -20,6 +20,9 @@
  type nscd_exec_t;
  init_daemon_domain(nscd_t, nscd_exec_t)
@@ -17177,7 +17242,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  dontaudit nscd_t self:capability sys_tty_config;
 -allow nscd_t self:process { getattr setsched signal_perms };
 +allow nscd_t self:process { getattr getcap setcap setsched signal_perms };
- allow nscd_t self:fifo_file { read write };
+ allow nscd_t self:fifo_file read_fifo_file_perms;
  allow nscd_t self:unix_stream_socket create_stream_socket_perms;
  allow nscd_t self:unix_dgram_socket create_socket_perms;
  allow nscd_t self:netlink_selinux_socket create_socket_perms;
@@ -17255,9 +17320,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	samba_read_config(nscd_t)
 +	samba_read_var_files(nscd_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.5.12/policy/modules/services/ntp.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.5.13/policy/modules/services/ntp.if
 --- nsaserefpolicy/policy/modules/services/ntp.if	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/ntp.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/ntp.if	2008-10-17 10:31:27.000000000 -0400
 @@ -56,6 +56,24 @@
  
  ########################################
@@ -17283,13 +17348,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	All of the rules required to administrate 
  ##	an ntp environment
  ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.5.12/policy/modules/services/ntp.te
---- nsaserefpolicy/policy/modules/services/ntp.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/ntp.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.5.13/policy/modules/services/ntp.te
+--- nsaserefpolicy/policy/modules/services/ntp.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/ntp.te	2008-10-17 10:31:27.000000000 -0400
 @@ -42,6 +42,7 @@
  dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
  allow ntpd_t self:process { signal_perms getcap setcap setsched setrlimit };
- allow ntpd_t self:fifo_file { read write getattr };
+ allow ntpd_t self:fifo_file rw_fifo_file_perms;
 +allow ntpd_t self:shm create_shm_perms;
  allow ntpd_t self:unix_dgram_socket create_socket_perms;
  allow ntpd_t self:unix_stream_socket create_socket_perms;
@@ -17303,18 +17368,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  term_use_ptmx(ntpd_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-3.5.12/policy/modules/services/oddjob.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.fc serefpolicy-3.5.13/policy/modules/services/oddjob.fc
 --- nsaserefpolicy/policy/modules/services/oddjob.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/oddjob.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/oddjob.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,4 +1,4 @@
 -/usr/lib/oddjob/mkhomedir	--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
 +/usr/lib(64)?/oddjob/mkhomedir	--	gen_context(system_u:object_r:oddjob_mkhomedir_exec_t,s0)
  
  /usr/sbin/oddjobd		--	gen_context(system_u:object_r:oddjob_exec_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-3.5.12/policy/modules/services/oddjob.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-3.5.13/policy/modules/services/oddjob.if
 --- nsaserefpolicy/policy/modules/services/oddjob.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/oddjob.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/oddjob.if	2008-10-17 10:31:27.000000000 -0400
 @@ -44,6 +44,7 @@
  	')
  
@@ -17358,9 +17423,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	role $2 types oddjob_mkhomedir_t;
 +	dontaudit oddjob_mkhomedir_t $3:chr_file rw_term_perms;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.5.12/policy/modules/services/oddjob.te
---- nsaserefpolicy/policy/modules/services/oddjob.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/oddjob.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.5.13/policy/modules/services/oddjob.te
+--- nsaserefpolicy/policy/modules/services/oddjob.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/oddjob.te	2008-10-17 10:31:27.000000000 -0400
 @@ -10,14 +10,21 @@
  type oddjob_exec_t;
  domain_type(oddjob_t)
@@ -17390,7 +17455,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 +allow oddjob_mkhomedir_t self:capability { chown fowner fsetid dac_override };
 +allow oddjob_mkhomedir_t self:process setfscreate;
- allow oddjob_mkhomedir_t self:fifo_file { read write };
+ allow oddjob_mkhomedir_t self:fifo_file rw_fifo_file_perms;
  allow oddjob_mkhomedir_t self:unix_stream_socket create_stream_socket_perms;
  
  files_read_etc_files(oddjob_mkhomedir_t)
@@ -17420,9 +17485,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  # Add/remove user home directories
  unprivuser_home_filetrans_home_dir(oddjob_mkhomedir_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.if serefpolicy-3.5.12/policy/modules/services/openvpn.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.if serefpolicy-3.5.13/policy/modules/services/openvpn.if
 --- nsaserefpolicy/policy/modules/services/openvpn.if	2008-10-08 19:00:27.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/openvpn.if	2008-10-16 14:45:47.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/openvpn.if	2008-10-17 10:31:27.000000000 -0400
 @@ -52,6 +52,24 @@
  
  ########################################
@@ -17473,9 +17538,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Allow the specified domain to read
  ##	OpenVPN configuration files.
  ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.5.12/policy/modules/services/openvpn.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.5.13/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/openvpn.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/openvpn.te	2008-10-17 10:31:27.000000000 -0400
 @@ -117,3 +117,11 @@
  
  	networkmanager_dbus_chat(openvpn_t)
@@ -17488,9 +17553,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	unconfined_use_terms(openvpn_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.fc serefpolicy-3.5.12/policy/modules/services/pads.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.fc serefpolicy-3.5.13/policy/modules/services/pads.fc
 --- nsaserefpolicy/policy/modules/services/pads.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/pads.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/pads.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,12 @@
 +
 +/etc/pads-ether-codes   --      gen_context(system_u:object_r:pads_config_t, s0)
@@ -17504,9 +17569,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +/var/run/pads.pid       --      gen_context(system_u:object_r:pads_var_run_t, s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.if serefpolicy-3.5.12/policy/modules/services/pads.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.if serefpolicy-3.5.13/policy/modules/services/pads.if
 --- nsaserefpolicy/policy/modules/services/pads.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/pads.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/pads.if	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,10 @@
 +## <summary>SELinux policy for PADS daemon.</summary>
 +## <desc>
@@ -17518,9 +17583,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +##	</p>
 +## </desc>
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.te serefpolicy-3.5.12/policy/modules/services/pads.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pads.te serefpolicy-3.5.13/policy/modules/services/pads.te
 --- nsaserefpolicy/policy/modules/services/pads.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/pads.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/pads.te	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,68 @@
 +
 +policy_module(pads, 0.0.1) 
@@ -17590,9 +17655,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +        prelude_manage_spool(pads_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.5.12/policy/modules/services/pcscd.te
---- nsaserefpolicy/policy/modules/services/pcscd.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/pcscd.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.5.13/policy/modules/services/pcscd.te
+--- nsaserefpolicy/policy/modules/services/pcscd.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/pcscd.te	2008-10-17 10:31:27.000000000 -0400
 @@ -10,6 +10,7 @@
  type pcscd_exec_t;
  domain_type(pcscd_t)
@@ -17616,9 +17681,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	openct_stream_connect(pcscd_t)
  	openct_read_pid_files(pcscd_t)
  	openct_signull(pcscd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.5.12/policy/modules/services/pegasus.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.5.13/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/pegasus.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/pegasus.te	2008-10-17 10:31:27.000000000 -0400
 @@ -66,6 +66,7 @@
  kernel_read_system_state(pegasus_t)
  kernel_search_vm_sysctl(pegasus_t)
@@ -17651,9 +17716,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  sysnet_domtrans_ifconfig(pegasus_t)
  
  userdom_dontaudit_use_unpriv_user_fds(pegasus_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.fc serefpolicy-3.5.12/policy/modules/services/polkit.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.fc serefpolicy-3.5.13/policy/modules/services/polkit.fc
 --- nsaserefpolicy/policy/modules/services/polkit.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/polkit.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/polkit.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,9 @@
 +
 +/usr/libexec/polkit-read-auth-helper	--	gen_context(system_u:object_r:polkit_auth_exec_t,s0)
@@ -17664,9 +17729,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/lib/PolicyKit(/.*)?			gen_context(system_u:object_r:polkit_var_lib_t,s0)
 +/var/run/PolicyKit(/.*)?			gen_context(system_u:object_r:polkit_var_run_t,s0)
 +/var/lib/PolicyKit-public(/.*)?			gen_context(system_u:object_r:polkit_var_lib_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.5.12/policy/modules/services/polkit.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.if serefpolicy-3.5.13/policy/modules/services/polkit.if
 --- nsaserefpolicy/policy/modules/services/polkit.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/polkit.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/polkit.if	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,213 @@
 +
 +## <summary>policy for polkit_auth</summary>
@@ -17881,9 +17946,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	polkit_read_lib($2)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.te serefpolicy-3.5.12/policy/modules/services/polkit.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/polkit.te serefpolicy-3.5.13/policy/modules/services/polkit.te
 --- nsaserefpolicy/policy/modules/services/polkit.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/polkit.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/polkit.te	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,231 @@
 +policy_module(polkit_auth, 1.0.0)
 +
@@ -18116,9 +18181,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	unconfined_ptrace(polkit_resolve_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portmap.te serefpolicy-3.5.12/policy/modules/services/portmap.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portmap.te serefpolicy-3.5.13/policy/modules/services/portmap.te
 --- nsaserefpolicy/policy/modules/services/portmap.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/portmap.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/portmap.te	2008-10-17 10:31:27.000000000 -0400
 @@ -41,6 +41,7 @@
  manage_files_pattern(portmap_t, portmap_var_run_t, portmap_var_run_t)
  files_pid_filetrans(portmap_t, portmap_var_run_t, file)
@@ -18127,9 +18192,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  kernel_read_kernel_sysctls(portmap_t)
  kernel_list_proc(portmap_t)
  kernel_read_proc_symlinks(portmap_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.fc serefpolicy-3.5.12/policy/modules/services/portreserve.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.fc serefpolicy-3.5.13/policy/modules/services/portreserve.fc
 --- nsaserefpolicy/policy/modules/services/portreserve.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/portreserve.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/portreserve.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,12 @@
 +# portreserve executable will have:
 +# label: system_u:object_r:portreserve_exec_t
@@ -18143,9 +18208,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +/etc/portreserve(/.*)? 			gen_context(system_u:object_r:portreserve_etc_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.if serefpolicy-3.5.12/policy/modules/services/portreserve.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.if serefpolicy-3.5.13/policy/modules/services/portreserve.if
 --- nsaserefpolicy/policy/modules/services/portreserve.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/portreserve.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/portreserve.if	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,70 @@
 +## <summary>policy for portreserve</summary>
 +
@@ -18217,9 +18282,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +        manage_files_pattern($1, portreserve_etc_t, portreserve_etc_t)
 +        read_lnk_files_pattern($1, portreserve_etc_t, portreserve_etc_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.te serefpolicy-3.5.12/policy/modules/services/portreserve.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.te serefpolicy-3.5.13/policy/modules/services/portreserve.te
 --- nsaserefpolicy/policy/modules/services/portreserve.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/portreserve.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/portreserve.te	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,54 @@
 +policy_module(portreserve,1.0.0)
 +
@@ -18275,9 +18340,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +#init_use_fds(portreserve_t)
 +#init_use_script_ptys(portreserve_t)
 +#domain_use_interactive_fds(portreserve_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.5.12/policy/modules/services/postfix.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.5.13/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/postfix.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/postfix.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -29,12 +29,10 @@
  /usr/lib/postfix/smtpd	--	gen_context(system_u:object_r:postfix_smtpd_exec_t,s0)
  /usr/lib/postfix/bounce	--	gen_context(system_u:object_r:postfix_bounce_exec_t,s0)
@@ -18291,9 +18356,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /usr/sbin/postdrop	--	gen_context(system_u:object_r:postfix_postdrop_exec_t,s0)
  /usr/sbin/postfix	--	gen_context(system_u:object_r:postfix_master_exec_t,s0)
  /usr/sbin/postkick	--	gen_context(system_u:object_r:postfix_master_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.5.12/policy/modules/services/postfix.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.5.13/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/postfix.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/postfix.if	2008-10-17 10:31:27.000000000 -0400
 @@ -211,9 +211,8 @@
  		type postfix_etc_t;
  	')
@@ -18391,9 +18456,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	domtrans_pattern($1, postfix_postdrop_exec_t, postfix_postdrop_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.5.12/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/postfix.te	2008-10-14 15:10:49.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.5.13/policy/modules/services/postfix.te
+--- nsaserefpolicy/policy/modules/services/postfix.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/postfix.te	2008-10-17 10:31:27.000000000 -0400
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -18667,9 +18732,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  corecmd_exec_shell(postfix_virtual_t)
  corecmd_exec_bin(postfix_virtual_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.5.12/policy/modules/services/postgresql.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.5.13/policy/modules/services/postgresql.fc
 --- nsaserefpolicy/policy/modules/services/postgresql.fc	2008-08-14 13:08:27.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/postgresql.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/postgresql.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -2,6 +2,7 @@
  # /etc
  #
@@ -18678,9 +18743,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  #
  # /usr
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.5.12/policy/modules/services/postgresql.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.5.13/policy/modules/services/postgresql.if
 --- nsaserefpolicy/policy/modules/services/postgresql.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/postgresql.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/postgresql.if	2008-10-17 10:31:27.000000000 -0400
 @@ -372,3 +372,46 @@
  
  	typeattribute $1 sepgsql_unconfined_type;
@@ -18728,9 +18793,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	admin_pattern($1, postgresql_tmp_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.5.12/policy/modules/services/postgresql.te
---- nsaserefpolicy/policy/modules/services/postgresql.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/postgresql.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.5.13/policy/modules/services/postgresql.te
+--- nsaserefpolicy/policy/modules/services/postgresql.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/postgresql.te	2008-10-17 10:31:27.000000000 -0400
 @@ -32,6 +32,9 @@
  type postgresql_etc_t;
  files_config_file(postgresql_etc_t)
@@ -18741,7 +18806,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  type postgresql_lock_t;
  files_lock_file(postgresql_lock_t)
  
-@@ -159,7 +162,7 @@
+@@ -104,6 +107,7 @@
+ dontaudit postgresql_t self:capability { sys_tty_config sys_admin };
+ allow postgresql_t self:process signal_perms;
+ allow postgresql_t self:fifo_file rw_fifo_file_perms;
++allow postgresql_t self:file { getattr read };
+ allow postgresql_t self:sem create_sem_perms;
+ allow postgresql_t self:shm create_shm_perms;
+ allow postgresql_t self:tcp_socket create_stream_socket_perms;
+@@ -158,7 +162,7 @@
  
  manage_files_pattern(postgresql_t, postgresql_var_run_t, postgresql_var_run_t)
  manage_sock_files_pattern(postgresql_t, postgresql_var_run_t, postgresql_var_run_t)
@@ -18750,7 +18823,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  kernel_read_kernel_sysctls(postgresql_t)
  kernel_read_system_state(postgresql_t)
-@@ -289,7 +292,7 @@
+@@ -288,7 +292,7 @@
  allow sepgsql_client_type sepgsql_sysobj_t:db_tuple { use select };
  
  allow sepgsql_client_type sepgsql_proc_t:db_procedure { getattr execute };
@@ -18759,7 +18832,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  allow sepgsql_client_type sepgsql_blob_t:db_blob { create drop getattr setattr read write };
  allow sepgsql_client_type sepgsql_ro_blob_t:db_blob { getattr read };
-@@ -330,7 +333,7 @@
+@@ -329,7 +333,7 @@
  
  # unconfined domain is not allowed to invoke user defined procedure directly.
  # They have to confirm and relabel it at first.
@@ -18768,9 +18841,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow sepgsql_unconfined_type sepgsql_procedure_type:db_procedure { create drop getattr setattr relabelfrom relabelto };
  
  allow sepgsql_unconfined_type sepgsql_blob_type:db_blob *;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-3.5.12/policy/modules/services/postgrey.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-3.5.13/policy/modules/services/postgrey.fc
 --- nsaserefpolicy/policy/modules/services/postgrey.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/postgrey.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/postgrey.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,5 +1,7 @@
  
  /etc/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_etc_t,s0)
@@ -18785,9 +18858,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/postgrey\.pid	--	gen_context(system_u:object_r:postgrey_var_run_t,s0)
 +
 +/var/spool/postfix/postgrey(/.*)?	gen_context(system_u:object_r:postgrey_spool_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-3.5.12/policy/modules/services/postgrey.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-3.5.13/policy/modules/services/postgrey.if
 --- nsaserefpolicy/policy/modules/services/postgrey.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/postgrey.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/postgrey.if	2008-10-17 10:31:27.000000000 -0400
 @@ -12,10 +12,73 @@
  #
  interface(`postgrey_stream_connect',`
@@ -18864,9 +18937,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-3.5.12/policy/modules/services/postgrey.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-3.5.13/policy/modules/services/postgrey.te
 --- nsaserefpolicy/policy/modules/services/postgrey.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/postgrey.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/postgrey.te	2008-10-17 10:31:27.000000000 -0400
 @@ -13,6 +13,12 @@
  type postgrey_etc_t;
  files_config_file(postgrey_etc_t)
@@ -18915,9 +18988,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	seutil_sigchld_newrole(postgrey_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.fc serefpolicy-3.5.12/policy/modules/services/ppp.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.fc serefpolicy-3.5.13/policy/modules/services/ppp.fc
 --- nsaserefpolicy/policy/modules/services/ppp.fc	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/ppp.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/ppp.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,8 +1,6 @@
  #
  # /etc
@@ -18939,9 +19012,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  #
  # /sbin
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.5.12/policy/modules/services/ppp.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.5.13/policy/modules/services/ppp.if
 --- nsaserefpolicy/policy/modules/services/ppp.if	2008-09-11 11:28:34.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/ppp.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/ppp.if	2008-10-17 10:31:27.000000000 -0400
 @@ -58,6 +58,25 @@
  
  ########################################
@@ -19045,9 +19118,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	manage_files_pattern($1, pptp_var_run_t, pptp_var_run_t)
 +	admin_pattern($1, pptp_var_run_t, pptp_var_run_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.5.12/policy/modules/services/ppp.te
---- nsaserefpolicy/policy/modules/services/ppp.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/ppp.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.5.13/policy/modules/services/ppp.te
+--- nsaserefpolicy/policy/modules/services/ppp.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/ppp.te	2008-10-17 10:31:27.000000000 -0400
 @@ -37,8 +37,8 @@
  type pppd_etc_rw_t;
  files_type(pppd_etc_rw_t)
@@ -19077,7 +19150,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -220,14 +224,16 @@
+@@ -220,7 +224,7 @@
  # PPTP Local policy
  #
  
@@ -19085,17 +19158,26 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +allow pptp_t self:capability { net_raw net_admin };
  dontaudit pptp_t self:capability sys_tty_config;
  allow pptp_t self:process signal;
--allow pptp_t self:fifo_file { read write };
-+allow pptp_t self:fifo_file rw_fifo_file_perms;
- allow pptp_t self:unix_dgram_socket create_socket_perms;
+ allow pptp_t self:fifo_file rw_fifo_file_perms;
+@@ -228,14 +232,16 @@
  allow pptp_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow pptp_t self:rawip_socket create_socket_perms;
  allow pptp_t self:tcp_socket create_socket_perms;
 +allow pptp_t self:udp_socket create_socket_perms;
 +allow pptp_t self:netlink_route_socket rw_netlink_socket_perms;
  
- allow pptp_t pppd_etc_t:dir { getattr read search };
- allow pptp_t pppd_etc_t:file { read getattr };
+ allow pptp_t pppd_etc_t:dir list_dir_perms;
+ allow pptp_t pppd_etc_t:file read_file_perms;
+-allow pptp_t pppd_etc_t:lnk_file { getattr read };
++allow pptp_t pppd_etc_t:lnk_file  read_lnk_file_perms;
+ 
+ allow pptp_t pppd_etc_rw_t:dir list_dir_perms;
+ allow pptp_t pppd_etc_rw_t:file read_file_perms;
+-allow pptp_t pppd_etc_rw_t:lnk_file { getattr read };
++allow pptp_t pppd_etc_rw_t:lnk_file  read_lnk_file_perms;
+ can_exec(pptp_t, pppd_etc_rw_t)
+ 
+ # Allow pptp to append to pppd log files
 @@ -251,9 +257,13 @@
  kernel_list_proc(pptp_t)
  kernel_read_kernel_sysctls(pptp_t)
@@ -19149,9 +19231,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -
 -# FIXME:
 -domtrans_pattern(pppd_t, pppd_script_exec_t, initrc_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.fc serefpolicy-3.5.12/policy/modules/services/prelude.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.fc serefpolicy-3.5.13/policy/modules/services/prelude.fc
 --- nsaserefpolicy/policy/modules/services/prelude.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/prelude.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/prelude.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,3 +1,9 @@
 +/etc/prelude-correlator(/.*)?   gen_context(system_u:object_r:prelude_correlator_config_t, s0)
 +
@@ -19178,9 +19260,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +/usr/bin/prelude-correlator     --      gen_context(system_u:object_r:prelude_correlator_exec_t, s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.if serefpolicy-3.5.12/policy/modules/services/prelude.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.if serefpolicy-3.5.13/policy/modules/services/prelude.if
 --- nsaserefpolicy/policy/modules/services/prelude.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/prelude.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/prelude.if	2008-10-17 10:31:27.000000000 -0400
 @@ -6,7 +6,7 @@
  ## </summary>
  ## <param name="domain">
@@ -19293,9 +19375,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	admin_pattern($1, prelude_lml_tmp_t)
 +	admin_pattern($1, prelude_lml_var_run_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.5.12/policy/modules/services/prelude.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.5.13/policy/modules/services/prelude.te
 --- nsaserefpolicy/policy/modules/services/prelude.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/prelude.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/prelude.te	2008-10-17 10:31:27.000000000 -0400
 @@ -13,25 +13,57 @@
  type prelude_spool_t;
  files_type(prelude_spool_t)
@@ -19558,9 +19640,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	optional_policy(`
  		mysql_search_db(httpd_prewikka_script_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.fc serefpolicy-3.5.12/policy/modules/services/privoxy.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.fc serefpolicy-3.5.13/policy/modules/services/privoxy.fc
 --- nsaserefpolicy/policy/modules/services/privoxy.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/privoxy.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/privoxy.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,5 +1,7 @@
  
  /etc/privoxy/user\.action --	gen_context(system_u:object_r:privoxy_etc_rw_t,s0)
@@ -19569,9 +19651,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  /usr/sbin/privoxy	--	gen_context(system_u:object_r:privoxy_exec_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.if serefpolicy-3.5.12/policy/modules/services/privoxy.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.if serefpolicy-3.5.13/policy/modules/services/privoxy.if
 --- nsaserefpolicy/policy/modules/services/privoxy.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/privoxy.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/privoxy.if	2008-10-17 10:31:27.000000000 -0400
 @@ -16,17 +16,23 @@
  	gen_require(`
  		type privoxy_t, privoxy_log_t;
@@ -19599,9 +19681,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	manage_files_pattern($1, privoxy_var_run_t, privoxy_var_run_t)
 +	admin_pattern($1, privoxy_var_run_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.5.12/policy/modules/services/privoxy.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.5.13/policy/modules/services/privoxy.te
 --- nsaserefpolicy/policy/modules/services/privoxy.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/privoxy.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/privoxy.te	2008-10-17 10:31:27.000000000 -0400
 @@ -10,6 +10,9 @@
  type privoxy_exec_t;
  init_daemon_domain(privoxy_t, privoxy_exec_t)
@@ -19620,18 +19702,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  corenet_tcp_connect_tor_port(privoxy_t)
  corenet_sendrecv_http_cache_client_packets(privoxy_t)
  corenet_sendrecv_http_cache_server_packets(privoxy_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.fc serefpolicy-3.5.12/policy/modules/services/procmail.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.fc serefpolicy-3.5.13/policy/modules/services/procmail.fc
 --- nsaserefpolicy/policy/modules/services/procmail.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/procmail.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/procmail.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,2 +1,5 @@
  
  /usr/bin/procmail	--	gen_context(system_u:object_r:procmail_exec_t,s0)
 +
 +/var/log/procmail\.log.*  -- gen_context(system_u:object_r:procmail_log_t,s0)
 +/var/log/procmail(/.*)? gen_context(system_u:object_r:procmail_log_t,s0) 
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.if serefpolicy-3.5.12/policy/modules/services/procmail.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.if serefpolicy-3.5.13/policy/modules/services/procmail.if
 --- nsaserefpolicy/policy/modules/services/procmail.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/procmail.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/procmail.if	2008-10-17 10:31:27.000000000 -0400
 @@ -39,3 +39,41 @@
  	corecmd_search_bin($1)
  	can_exec($1, procmail_exec_t)
@@ -19674,9 +19756,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_search_tmp($1)
 +	rw_files_pattern($1, procmail_tmp_t, procmail_tmp_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.5.12/policy/modules/services/procmail.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.5.13/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/procmail.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/procmail.te	2008-10-17 10:31:27.000000000 -0400
 @@ -14,6 +14,10 @@
  type procmail_tmp_t;
  files_tmp_file(procmail_tmp_t)
@@ -19754,9 +19836,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	mailscanner_read_spool(procmail_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.fc serefpolicy-3.5.12/policy/modules/services/pyzor.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.fc serefpolicy-3.5.13/policy/modules/services/pyzor.fc
 --- nsaserefpolicy/policy/modules/services/pyzor.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/pyzor.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/pyzor.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,6 +1,8 @@
  /etc/pyzor(/.*)?		gen_context(system_u:object_r:pyzor_etc_t, s0)
 +/etc/rc\.d/init\.d/pyzord	--	gen_context(system_u:object_r:pyzord_initrc_exec_t,s0)
@@ -19767,9 +19849,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  /usr/bin/pyzor		--	gen_context(system_u:object_r:pyzor_exec_t,s0)
  /usr/bin/pyzord		--	gen_context(system_u:object_r:pyzord_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.5.12/policy/modules/services/pyzor.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.5.13/policy/modules/services/pyzor.if
 --- nsaserefpolicy/policy/modules/services/pyzor.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/pyzor.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/pyzor.if	2008-10-17 10:31:27.000000000 -0400
 @@ -25,16 +25,16 @@
  #
  template(`pyzor_per_role_template',`
@@ -19845,9 +19927,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-3.5.12/policy/modules/services/pyzor.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-3.5.13/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/pyzor.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/pyzor.te	2008-10-17 10:31:27.000000000 -0400
 @@ -6,6 +6,37 @@
  # Declarations
  #
@@ -19933,9 +20015,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/qmail.te serefpolicy-3.5.12/policy/modules/services/qmail.te
---- nsaserefpolicy/policy/modules/services/qmail.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/qmail.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/qmail.te serefpolicy-3.5.13/policy/modules/services/qmail.te
+--- nsaserefpolicy/policy/modules/services/qmail.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/qmail.te	2008-10-17 10:31:27.000000000 -0400
 @@ -124,6 +124,10 @@
  
  qmail_domtrans_queue(qmail_local_t)
@@ -19958,9 +20040,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	ucspitcp_service_domain(qmail_smtpd_t, qmail_smtpd_exec_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-3.5.12/policy/modules/services/radius.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-3.5.13/policy/modules/services/radius.te
 --- nsaserefpolicy/policy/modules/services/radius.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/radius.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/radius.te	2008-10-17 10:31:27.000000000 -0400
 @@ -59,8 +59,9 @@
  
  manage_files_pattern(radiusd_t, radiusd_var_lib_t, radiusd_var_lib_t)
@@ -19972,18 +20054,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  kernel_read_kernel_sysctls(radiusd_t)
  kernel_read_system_state(radiusd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.5.12/policy/modules/services/razor.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.5.13/policy/modules/services/razor.fc
 --- nsaserefpolicy/policy/modules/services/razor.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/razor.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/razor.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.razor(/.*)?		gen_context(system_u:object_r:ROLE_razor_home_t,s0)
 +HOME_DIR/\.razor(/.*)?		gen_context(system_u:object_r:razor_home_t,s0)
  
  /etc/razor(/.*)?		gen_context(system_u:object_r:razor_etc_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.5.12/policy/modules/services/razor.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.5.13/policy/modules/services/razor.if
 --- nsaserefpolicy/policy/modules/services/razor.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/razor.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/razor.if	2008-10-17 10:31:27.000000000 -0400
 @@ -137,6 +137,7 @@
  template(`razor_per_role_template',`
  	gen_require(`
@@ -20103,9 +20185,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	read_files_pattern($1, razor_var_lib_t, razor_var_lib_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.5.12/policy/modules/services/razor.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.5.13/policy/modules/services/razor.te
 --- nsaserefpolicy/policy/modules/services/razor.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/razor.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/razor.te	2008-10-17 10:31:27.000000000 -0400
 @@ -6,21 +6,51 @@
  # Declarations
  #
@@ -20161,9 +20243,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  razor_common_domain_template(razor)
  
  ########################################
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.5.12/policy/modules/services/ricci.te
---- nsaserefpolicy/policy/modules/services/ricci.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/ricci.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.5.13/policy/modules/services/ricci.te
+--- nsaserefpolicy/policy/modules/services/ricci.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/ricci.te	2008-10-17 10:31:27.000000000 -0400
 @@ -133,6 +133,8 @@
  
  dev_read_urand(ricci_t)
@@ -20226,9 +20308,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  #Needed for editing /etc/fstab
  files_manage_etc_files(ricci_modstorage_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.5.12/policy/modules/services/rlogin.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-3.5.13/policy/modules/services/rlogin.te
 --- nsaserefpolicy/policy/modules/services/rlogin.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/rlogin.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/rlogin.te	2008-10-17 10:31:27.000000000 -0400
 @@ -94,8 +94,8 @@
  remotelogin_signal(rlogind_t)
  
@@ -20240,18 +20322,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.fc serefpolicy-3.5.12/policy/modules/services/roundup.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.fc serefpolicy-3.5.13/policy/modules/services/roundup.fc
 --- nsaserefpolicy/policy/modules/services/roundup.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/roundup.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/roundup.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,3 +1,5 @@
 +/etc/rc\.d/init\.d/roundup	--	gen_context(system_u:object_r:roundup_initrc_exec_t,s0)
 +
  #
  # /usr
  #
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.if serefpolicy-3.5.12/policy/modules/services/roundup.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.if serefpolicy-3.5.13/policy/modules/services/roundup.if
 --- nsaserefpolicy/policy/modules/services/roundup.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/roundup.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/roundup.if	2008-10-17 10:31:27.000000000 -0400
 @@ -1 +1,39 @@
  ## <summary>Roundup Issue Tracking System policy</summary>
 +
@@ -20292,9 +20374,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_list_pids($1)
 +	admin_pattern($1, roundup_var_run_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.te serefpolicy-3.5.12/policy/modules/services/roundup.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/roundup.te serefpolicy-3.5.13/policy/modules/services/roundup.te
 --- nsaserefpolicy/policy/modules/services/roundup.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/roundup.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/roundup.te	2008-10-17 10:31:27.000000000 -0400
 @@ -10,6 +10,9 @@
  type roundup_exec_t;
  init_daemon_domain(roundup_t, roundup_exec_t)
@@ -20305,9 +20387,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  type roundup_var_run_t;
  files_pid_file(roundup_var_run_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.5.12/policy/modules/services/rpc.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.5.13/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/rpc.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/rpc.if	2008-10-17 10:31:27.000000000 -0400
 @@ -88,8 +88,11 @@
  	# bind to arbitary unused ports
  	corenet_tcp_bind_generic_port($1_t)
@@ -20346,9 +20428,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##      Read NFS exported content.
  ## </summary>
  ## <param name="domain">
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.5.12/policy/modules/services/rpc.te
---- nsaserefpolicy/policy/modules/services/rpc.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/rpc.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.5.13/policy/modules/services/rpc.te
+--- nsaserefpolicy/policy/modules/services/rpc.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/rpc.te	2008-10-17 10:31:27.000000000 -0400
 @@ -23,7 +23,7 @@
  gen_tunable(allow_nfsd_anon_write, false)
  
@@ -20407,18 +20489,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-3.5.12/policy/modules/services/rpcbind.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.fc serefpolicy-3.5.13/policy/modules/services/rpcbind.fc
 --- nsaserefpolicy/policy/modules/services/rpcbind.fc	2008-09-24 09:07:28.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/rpcbind.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/rpcbind.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,4 +1,4 @@
 -/etc/rc.d/init.d/rpcbind --	gen_context(system_u:object_r:rpcbind_initrc_exec_t,s0)
 +/etc/rc\.d/init\.d/rpcbind	--	gen_context(system_u:object_r:rpcbind_initrc_exec_t,s0)
  
  /sbin/rpcbind		--	gen_context(system_u:object_r:rpcbind_exec_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.5.12/policy/modules/services/rpcbind.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.5.13/policy/modules/services/rpcbind.te
 --- nsaserefpolicy/policy/modules/services/rpcbind.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/rpcbind.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/rpcbind.te	2008-10-17 10:31:27.000000000 -0400
 @@ -60,6 +60,7 @@
  domain_use_interactive_fds(rpcbind_t)
  
@@ -20427,9 +20509,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  libs_use_ld_so(rpcbind_t)
  libs_use_shared_libs(rpcbind_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.5.12/policy/modules/services/rshd.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rshd.te serefpolicy-3.5.13/policy/modules/services/rshd.te
 --- nsaserefpolicy/policy/modules/services/rshd.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/rshd.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/rshd.te	2008-10-17 10:31:27.000000000 -0400
 @@ -16,7 +16,7 @@
  #
  # Local policy
@@ -20491,18 +20573,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	unconfined_shell_domtrans(rshd_t)
 +	unconfined_signal(rshd_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.fc serefpolicy-3.5.12/policy/modules/services/rsync.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.fc serefpolicy-3.5.13/policy/modules/services/rsync.fc
 --- nsaserefpolicy/policy/modules/services/rsync.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/rsync.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/rsync.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -3,4 +3,4 @@
  
  /var/log/rsync\.log      --	gen_context(system_u:object_r:rsync_log_t,s0)
  
 -/var/run/rsyncd\.lock      --	gen_context(system_u:object_r:rsync_log_t,s0)
 +/var/run/rsyncd\.lock      --	gen_context(system_u:object_r:rsync_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.5.12/policy/modules/services/rsync.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.5.13/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/rsync.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/rsync.te	2008-10-17 10:31:27.000000000 -0400
 @@ -45,7 +45,7 @@
  # Local policy
  #
@@ -20512,9 +20594,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow rsync_t self:process signal_perms;
  allow rsync_t self:fifo_file rw_fifo_file_perms;
  allow rsync_t self:tcp_socket create_stream_socket_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.5.12/policy/modules/services/samba.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.5.13/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/samba.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/samba.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -2,6 +2,9 @@
  #
  # /etc
@@ -20541,9 +20623,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +ifndef(`enable_mls',`
 +/var/lib/samba/scripts(/.*)?		gen_context(system_u:object_r:samba_unconfined_script_exec_t,s0)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.5.12/policy/modules/services/samba.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.5.13/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/samba.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/samba.if	2008-10-17 10:31:27.000000000 -0400
 @@ -52,6 +52,25 @@
  ##	</summary>
  ## </param>
@@ -20868,9 +20950,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	admin_pattern($1, samba_unconfined_script_exec_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.5.12/policy/modules/services/samba.te
---- nsaserefpolicy/policy/modules/services/samba.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/samba.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.5.13/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/samba.te	2008-10-17 10:31:27.000000000 -0400
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -20970,15 +21052,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  dontaudit smbd_t self:capability sys_tty_config;
  allow smbd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow smbd_t self:process setrlimit;
-@@ -220,7 +239,7 @@
- allow smbd_t self:msgq create_msgq_perms;
- allow smbd_t self:sem create_sem_perms;
- allow smbd_t self:shm create_shm_perms;
--allow smbd_t self:sock_file read_file_perms;
-+allow smbd_t self:sock_file read_sock_file_perms;
- allow smbd_t self:tcp_socket create_stream_socket_perms;
- allow smbd_t self:udp_socket create_socket_perms;
- allow smbd_t self:unix_dgram_socket { create_socket_perms sendto };
 @@ -228,10 +247,8 @@
  
  allow smbd_t samba_etc_t:file { rw_file_perms setattr };
@@ -21008,7 +21081,24 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  kernel_getattr_core_if(smbd_t)
  kernel_getattr_message_if(smbd_t)
-@@ -328,6 +346,8 @@
+@@ -314,20 +332,22 @@
+ 
+ init_rw_utmp(smbd_t)
+ 
+-libs_use_ld_so(smbd_t)
+-libs_use_shared_libs(smbd_t)
+-
+ logging_search_logs(smbd_t)
+ logging_send_syslog_msg(smbd_t)
+ 
+ miscfiles_read_localization(smbd_t)
+ miscfiles_read_public_files(smbd_t)
+ 
++libs_use_ld_so(smbd_t)
++libs_use_shared_libs(smbd_t)
++
+ userdom_dontaudit_use_unpriv_user_fds(smbd_t)
+ userdom_use_unpriv_users_fds(smbd_t)
  
  sysadm_dontaudit_search_home_dirs(smbd_t)
  
@@ -21043,15 +21133,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -405,7 +444,7 @@
- allow nmbd_t self:msgq create_msgq_perms;
- allow nmbd_t self:sem create_sem_perms;
- allow nmbd_t self:shm create_shm_perms;
--allow nmbd_t self:sock_file read_file_perms;
-+allow nmbd_t self:sock_file read_sock_file_perms;
- allow nmbd_t self:tcp_socket create_stream_socket_perms;
- allow nmbd_t self:udp_socket create_socket_perms;
- allow nmbd_t self:unix_dgram_socket { create_socket_perms sendto };
 @@ -452,6 +491,7 @@
  dev_getattr_mtrr_dev(nmbd_t)
  
@@ -21068,7 +21149,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  corecmd_list_bin(smbmount_t)
  
-@@ -547,41 +588,50 @@
+@@ -547,32 +588,46 @@
  
  auth_use_nsswitch(smbmount_t)
  
@@ -21099,20 +21180,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 -allow swat_t self:capability { setuid setgid };
 -allow swat_t self:process signal_perms;
+-allow swat_t self:fifo_file rw_file_perms;
 +allow swat_t self:capability { setuid setgid sys_resource };
 +allow swat_t self:process { setrlimit signal_perms };
- allow swat_t self:fifo_file rw_file_perms;
++allow swat_t self:fifo_file rw_fifo_file_perms;
  allow swat_t self:netlink_tcpdiag_socket r_netlink_socket_perms;
  allow swat_t self:tcp_socket create_stream_socket_perms;
  allow swat_t self:udp_socket create_socket_perms;
  
--allow swat_t nmbd_exec_t:file { execute read };
 +allow swat_t self:unix_stream_socket connectto;
 +can_exec(swat_t, smbd_exec_t)
 +allow swat_t smbd_port_t:tcp_socket name_bind;
 +allow swat_t smbd_t:process { signal signull };
 +allow swat_t smbd_var_run_t:file { lock unlink };
 +
+ allow swat_t nmbd_exec_t:file mmap_file_perms;
 +can_exec(swat_t, nmbd_exec_t)
 +allow swat_t nmbd_port_t:udp_socket name_bind;
 +allow swat_t nmbd_t:process { signal signull };
@@ -21120,27 +21202,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  rw_files_pattern(swat_t, samba_etc_t, samba_etc_t)
  
- append_files_pattern(swat_t, samba_log_t, samba_log_t)
- 
--allow swat_t smbd_exec_t:file execute ;
--
--allow swat_t smbd_t:process signull;
--
- allow swat_t smbd_var_run_t:file read;
- 
- manage_dirs_pattern(swat_t, swat_tmp_t, swat_tmp_t)
-@@ -591,7 +641,9 @@
- manage_files_pattern(swat_t, swat_var_run_t, swat_var_run_t)
+@@ -592,6 +647,9 @@
  files_pid_filetrans(swat_t, swat_var_run_t, file)
  
--allow swat_t winbind_exec_t:file execute;
+ allow swat_t winbind_exec_t:file mmap_file_perms;
 +can_exec(swat_t, winbind_exec_t)
 +allow swat_t winbind_var_run_t:dir { write add_name remove_name };
 +allow swat_t winbind_var_run_t:sock_file { create unlink };
  
  kernel_read_kernel_sysctls(swat_t)
  kernel_read_system_state(swat_t)
-@@ -616,10 +668,12 @@
+@@ -616,10 +674,12 @@
  
  dev_read_urand(swat_t)
  
@@ -21153,7 +21225,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  auth_domtrans_chk_passwd(swat_t)
  auth_use_nsswitch(swat_t)
-@@ -628,6 +682,7 @@
+@@ -628,6 +688,7 @@
  libs_use_shared_libs(swat_t)
  
  logging_send_syslog_msg(swat_t)
@@ -21161,7 +21233,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  logging_search_logs(swat_t)
  
  miscfiles_read_localization(swat_t)
-@@ -645,6 +700,17 @@
+@@ -645,6 +706,17 @@
  	kerberos_use(swat_t)
  ')
  
@@ -21179,7 +21251,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
  #
  # Winbind local policy
-@@ -694,6 +760,8 @@
+@@ -694,6 +766,8 @@
  manage_sock_files_pattern(winbind_t, winbind_var_run_t, winbind_var_run_t)
  files_pid_filetrans(winbind_t, winbind_var_run_t, file)
  
@@ -21188,7 +21260,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  kernel_read_kernel_sysctls(winbind_t)
  kernel_list_proc(winbind_t)
  kernel_read_proc_symlinks(winbind_t)
-@@ -780,8 +848,13 @@
+@@ -780,8 +854,13 @@
  miscfiles_read_localization(winbind_helper_t) 
  
  optional_policy(`
@@ -21202,7 +21274,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -790,6 +863,16 @@
+@@ -790,6 +869,16 @@
  #
  
  optional_policy(`
@@ -21219,7 +21291,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	type samba_unconfined_script_t;
  	type samba_unconfined_script_exec_t;
  	domain_type(samba_unconfined_script_t)
-@@ -800,9 +883,46 @@
+@@ -800,9 +889,46 @@
  	allow smbd_t samba_unconfined_script_exec_t:dir search_dir_perms;
  	allow smbd_t samba_unconfined_script_exec_t:file ioctl;
  
@@ -21267,9 +21339,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +allow winbind_t smbcontrol_t:process signal;
 +
 +allow smbcontrol_t nmbd_var_run_t:file { read lock };
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.5.12/policy/modules/services/sasl.te
---- nsaserefpolicy/policy/modules/services/sasl.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/sasl.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.5.13/policy/modules/services/sasl.te
+--- nsaserefpolicy/policy/modules/services/sasl.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/sasl.te	2008-10-17 10:31:27.000000000 -0400
 @@ -111,6 +111,10 @@
  ')
  
@@ -21281,9 +21353,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	seutil_sigchld_newrole(saslauthd_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.5.12/policy/modules/services/sendmail.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.5.13/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/sendmail.if	2008-10-16 13:51:54.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/sendmail.if	2008-10-17 10:31:27.000000000 -0400
 @@ -89,7 +89,7 @@
  		type sendmail_t;
  	')
@@ -21398,9 +21470,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	allow $1 sendmail_t:fifo_file rw_fifo_file_perms; 
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.5.12/policy/modules/services/sendmail.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.5.13/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/sendmail.te	2008-10-14 21:46:27.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/sendmail.te	2008-10-17 10:31:27.000000000 -0400
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -21560,18 +21632,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 -dontaudit sendmail_t admin_tty_type:chr_file { getattr ioctl };
 -') dnl end TODO
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-3.5.12/policy/modules/services/setroubleshoot.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-3.5.13/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/setroubleshoot.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/setroubleshoot.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,3 +1,5 @@
 +/etc/rc\.d/init\.d/setroubleshoot	--	gen_context(system_u:object_r:setroubleshoot_initrc_exec_t,s0)
 +
  /usr/sbin/setroubleshootd	--	gen_context(system_u:object_r:setroubleshootd_exec_t,s0)
  
  /var/run/setroubleshoot(/.*)?		gen_context(system_u:object_r:setroubleshoot_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.5.12/policy/modules/services/setroubleshoot.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.5.13/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/setroubleshoot.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/setroubleshoot.if	2008-10-17 10:31:27.000000000 -0400
 @@ -16,8 +16,8 @@
  	')
  
@@ -21633,9 +21705,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_list_pids($1)
 +	admin_pattern($1, setroubleshoot_var_run_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.5.12/policy/modules/services/setroubleshoot.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.5.13/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/setroubleshoot.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/setroubleshoot.te	2008-10-17 10:31:27.000000000 -0400
 @@ -11,6 +11,9 @@
  domain_type(setroubleshootd_t)
  init_daemon_domain(setroubleshootd_t, setroubleshootd_exec_t)
@@ -21721,9 +21793,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	rpm_read_db(setroubleshootd_t)
  	rpm_dontaudit_manage_db(setroubleshootd_t)
          rpm_use_script_fds(setroubleshootd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.5.12/policy/modules/services/smartmon.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.5.13/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/smartmon.te	2008-10-14 21:15:21.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/smartmon.te	2008-10-17 10:31:27.000000000 -0400
 @@ -19,6 +19,10 @@
  type fsdaemon_tmp_t;
  files_tmp_file(fsdaemon_tmp_t)
@@ -21781,9 +21853,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.5.12/policy/modules/services/snmp.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.fc serefpolicy-3.5.13/policy/modules/services/snmp.fc
 --- nsaserefpolicy/policy/modules/services/snmp.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/snmp.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/snmp.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,3 +1,6 @@
 +/etc/rc\.d/init\.d/snmpd	--	gen_context(system_u:object_r:snmp_initrc_exec_t,s0)
 +/etc/rc\.d/init\.d/snmptrapd --	gen_context(system_u:object_r:snmp_initrc_exec_t,s0)
@@ -21799,9 +21871,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/lib/net-snmp(/.*)?		gen_context(system_u:object_r:snmpd_var_lib_t,s0)
  /var/lib/snmp(/.*)?		gen_context(system_u:object_r:snmpd_var_lib_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.5.12/policy/modules/services/snmp.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.5.13/policy/modules/services/snmp.if
 --- nsaserefpolicy/policy/modules/services/snmp.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/snmp.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/snmp.if	2008-10-17 10:31:27.000000000 -0400
 @@ -95,23 +95,34 @@
  ##	Domain allowed access.
  ##	</summary>
@@ -21840,9 +21912,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	manage_files_pattern($1, snmpd_var_run_t, snmpd_var_run_t)
 +	admin_pattern($1, snmpd_var_run_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.5.12/policy/modules/services/snmp.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.5.13/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/snmp.te	2008-10-15 14:52:54.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/snmp.te	2008-10-17 10:31:27.000000000 -0400
 @@ -9,6 +9,9 @@
  type snmpd_exec_t;
  init_daemon_domain(snmpd_t, snmpd_exec_t)
@@ -21907,9 +21979,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.if serefpolicy-3.5.12/policy/modules/services/snort.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.if serefpolicy-3.5.13/policy/modules/services/snort.if
 --- nsaserefpolicy/policy/modules/services/snort.if	2008-10-10 15:53:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/snort.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/snort.if	2008-10-17 10:31:27.000000000 -0400
 @@ -30,7 +30,7 @@
  ## </param>
  ## <param name="role">
@@ -21932,9 +22004,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	files_search_pids($1)
 +	admin_pattern($1, snort_log_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.te serefpolicy-3.5.12/policy/modules/services/snort.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.te serefpolicy-3.5.13/policy/modules/services/snort.te
 --- nsaserefpolicy/policy/modules/services/snort.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/snort.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/snort.te	2008-10-17 10:31:27.000000000 -0400
 @@ -56,6 +56,7 @@
  files_pid_filetrans(snort_t, snort_var_run_t, file)
  
@@ -21965,9 +22037,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
  	seutil_sigchld_newrole(snort_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.5.12/policy/modules/services/spamassassin.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.5.13/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/spamassassin.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/spamassassin.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,16 +1,27 @@
 -HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:ROLE_spamassassin_home_t,s0)
 +HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamc_home_t,s0)
@@ -21999,14 +22071,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/spool/spamd(/.*)?		gen_context(system_u:object_r:spamd_spool_t,s0)
 +/var/spool/MD-Quarantine(/.*)?		gen_context(system_u:object_r:spamd_spool_t,s0)
 +/var/spool/MIMEDefang(/.*)?		gen_context(system_u:object_r:spamd_spool_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.5.12/policy/modules/services/spamassassin.if
---- nsaserefpolicy/policy/modules/services/spamassassin.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/spamassassin.if	2008-10-14 15:00:15.000000000 -0400
-@@ -34,10 +34,10 @@
- # cjp: when tunables are available, spamc stuff should be
- # toggled on activation of spamc, and similarly for spamd.
- template(`spamassassin_per_role_template',`
--
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.5.13/policy/modules/services/spamassassin.if
+--- nsaserefpolicy/policy/modules/services/spamassassin.if	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/spamassassin.if	2008-10-17 10:31:27.000000000 -0400
+@@ -37,7 +37,8 @@
+ 
  	gen_require(`
  		type spamc_exec_t, spamassassin_exec_t;
 -		type spamd_t, spamd_tmp_t;
@@ -22015,7 +22084,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	')
  
  	##############################
-@@ -45,278 +45,24 @@
+@@ -45,277 +46,24 @@
  	# Declarations
  	#
  
@@ -22033,10 +22102,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	type $1_spamassassin_home_t alias $1_spamassassin_rw_t;
 -	userdom_user_home_content($1, $1_spamassassin_home_t)
 -	files_poly_member($1_spamassassin_home_t)
--
++	typealias  spamc_t alias $1_spamc_t;
++	role $3 types spamc_t;
+ 
 -	type $1_spamassassin_tmp_t;
 -	files_tmp_file($1_spamassassin_tmp_t)
--
++	typealias  spamassassin_t alias $1_spamassassin_t;
++	role $3 types spamassassin_t;
+ 
 -	##############################
 -	#
 -	# $1_spamc_t local policy
@@ -22062,8 +22135,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	files_tmp_filetrans($1_spamc_t, $1_spamc_tmp_t, { file dir })
 -
 -	# Allow connecting to a local spamd
--	allow $1_spamc_t spamd_t:unix_stream_socket connectto;
--	allow $1_spamc_t spamd_tmp_t:sock_file rw_file_perms;
+-	stream_connect_pattern($1_spamc_t, spamd_tmp_t, spamd_tmp_t, spamd_t)
 -
 -	domtrans_pattern($2, spamc_exec_t, $1_spamc_t)
 -
@@ -22128,15 +22200,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -		# Allow connection to spamd socket above
 -		evolution_stream_connect($1, $1_spamc_t)
 -	')
-+	typealias  spamc_t alias $1_spamc_t;
-+	role $3 types spamc_t;
- 
+-
 -	optional_policy(`
 -		nis_use_ypbind($1_spamc_t)
 -	')
-+	typealias  spamassassin_t alias $1_spamassassin_t;
-+	role $3 types spamassassin_t;
- 
+-
 -	optional_policy(`
 -		nscd_socket_use($1_spamc_t)
 -	')
@@ -22309,7 +22377,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -332,10 +78,10 @@
+@@ -331,10 +79,10 @@
  #
  interface(`spamassassin_exec',`
  	gen_require(`
@@ -22322,7 +22390,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ')
  
-@@ -398,11 +144,66 @@
+@@ -397,11 +145,66 @@
  ## </param>
  #
  template(`spamassassin_domtrans_user_client',`
@@ -22346,10 +22414,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +## </param>
 +#
 +interface(`spamassassin_domtrans_spamc',`
-+	gen_require(`
+ 	gen_require(`
+-		type $1_spamc_t, spamc_exec_t;
 +		type spamc_t, spamc_exec_t;
-+	')
-+
+ 	')
+ 
+-	domtrans_pattern($2, spamc_exec_t, $1_spamc_t)
 +	domtrans_pattern($1, spamc_exec_t, spamc_t)
 +	allow $1 spamc_exec_t:file ioctl;
 +')
@@ -22380,18 +22450,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +## </param>
 +#
 +template(`spamassassin_read_user_home_files',`
- 	gen_require(`
--		type $1_spamc_t, spamc_exec_t;
++	gen_require(`
 +		type spamassassin_home_t;
- 	')
- 
--	domtrans_pattern($2, spamc_exec_t, $1_spamc_t)
++	')
++
 +	allow $1 spamassassin_home_t:dir list_dir_perms;
 +	allow $1 spamassassin_home_t:file read_file_perms;
  ')
  
  ########################################
-@@ -446,11 +247,27 @@
+@@ -445,11 +248,27 @@
  ## </param>
  #
  template(`spamassassin_domtrans_user_local_client',`
@@ -22422,7 +22490,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -469,6 +286,7 @@
+@@ -468,6 +287,7 @@
  	')
  
  	files_search_var_lib($1)
@@ -22430,7 +22498,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	read_files_pattern($1, spamd_var_lib_t, spamd_var_lib_t)
  ')
  
-@@ -528,3 +346,103 @@
+@@ -527,3 +347,103 @@
  
  	dontaudit $1 spamd_tmp_t:sock_file getattr;
  ')
@@ -22534,9 +22602,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	manage_files_pattern($1, spamc_home_t, spamc_home_t)
 +	razor_manage_user_home_files(user, $1)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.5.12/policy/modules/services/spamassassin.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.5.13/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/spamassassin.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/spamassassin.te	2008-10-17 10:31:27.000000000 -0400
 @@ -21,16 +21,24 @@
  gen_tunable(spamd_enable_home_dirs, true)
  
@@ -22830,9 +22898,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	sendmail_stub(spamc_t)
 +	sendmail_rw_pipes(spamc_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.5.12/policy/modules/services/squid.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.5.13/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/squid.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/squid.te	2008-10-17 10:31:27.000000000 -0400
 @@ -118,6 +118,8 @@
  
  fs_getattr_all_fs(squid_t)
@@ -22851,18 +22919,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -#squid requires the following when run in diskd mode, the recommended setting
 -allow squid_t tmpfs_t:file { read write };
 -') dnl end TODO
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.fc serefpolicy-3.5.12/policy/modules/services/ssh.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.fc serefpolicy-3.5.13/policy/modules/services/ssh.fc
 --- nsaserefpolicy/policy/modules/services/ssh.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/ssh.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/ssh.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,4 +1,4 @@
 -HOME_DIR/\.ssh(/.*)?			gen_context(system_u:object_r:ROLE_home_ssh_t,s0)
 +HOME_DIR/\.ssh(/.*)?			gen_context(system_u:object_r:ssh_home_t,s0)
  
  /etc/ssh/primes			--	gen_context(system_u:object_r:sshd_key_t,s0)
  /etc/ssh/ssh_host_key 		--	gen_context(system_u:object_r:sshd_key_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.5.12/policy/modules/services/ssh.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.5.13/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/ssh.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/ssh.if	2008-10-17 10:31:27.000000000 -0400
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -23109,9 +23177,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_search_tmp($1)
 +	delete_files_pattern($1, ssh_tmp_t, ssh_tmp_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.5.12/policy/modules/services/ssh.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.5.13/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/ssh.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/ssh.te	2008-10-17 10:31:27.000000000 -0400
 @@ -24,7 +24,7 @@
  
  # Type for the ssh-agent executable.
@@ -23172,9 +23240,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	unconfined_shell_domtrans(sshd_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.fc serefpolicy-3.5.12/policy/modules/services/stunnel.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.fc serefpolicy-3.5.13/policy/modules/services/stunnel.fc
 --- nsaserefpolicy/policy/modules/services/stunnel.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/stunnel.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/stunnel.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -2,5 +2,6 @@
  /etc/stunnel(/.*)?          	gen_context(system_u:object_r:stunnel_etc_t,s0)
  
@@ -23182,9 +23250,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/bin/stunnel	--	gen_context(system_u:object_r:stunnel_exec_t,s0)
  
  /var/run/stunnel(/.*)?		gen_context(system_u:object_r:stunnel_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-3.5.12/policy/modules/services/stunnel.te
---- nsaserefpolicy/policy/modules/services/stunnel.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/stunnel.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/stunnel.te serefpolicy-3.5.13/policy/modules/services/stunnel.te
+--- nsaserefpolicy/policy/modules/services/stunnel.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/stunnel.te	2008-10-17 10:31:27.000000000 -0400
 @@ -54,6 +54,8 @@
  kernel_read_system_state(stunnel_t)
  kernel_read_network_state(stunnel_t)
@@ -23202,9 +23270,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	files_search_home(stunnel_t)
  
  	optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-3.5.12/policy/modules/services/sysstat.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-3.5.13/policy/modules/services/sysstat.te
 --- nsaserefpolicy/policy/modules/services/sysstat.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/sysstat.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/sysstat.te	2008-10-17 10:31:27.000000000 -0400
 @@ -47,6 +47,7 @@
  files_read_etc_files(sysstat_t)
  
@@ -23213,9 +23281,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  term_use_console(sysstat_t)
  term_use_all_terms(sysstat_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.5.12/policy/modules/services/telnet.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/telnet.te serefpolicy-3.5.13/policy/modules/services/telnet.te
 --- nsaserefpolicy/policy/modules/services/telnet.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/telnet.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/telnet.te	2008-10-17 10:31:27.000000000 -0400
 @@ -90,8 +90,8 @@
  userdom_search_unpriv_users_home_dirs(telnetd_t)
  
@@ -23227,9 +23295,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  tunable_policy(`use_nfs_home_dirs',`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-3.5.12/policy/modules/services/tftp.te
---- nsaserefpolicy/policy/modules/services/tftp.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/tftp.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-3.5.13/policy/modules/services/tftp.te
+--- nsaserefpolicy/policy/modules/services/tftp.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/tftp.te	2008-10-17 10:31:27.000000000 -0400
 @@ -75,6 +75,7 @@
  domain_use_interactive_fds(tftpd_t)
  
@@ -23238,9 +23306,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  files_read_var_files(tftpd_t)
  files_read_var_symlinks(tftpd_t)
  files_search_var(tftpd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.5.12/policy/modules/services/virt.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.5.13/policy/modules/services/virt.fc
 --- nsaserefpolicy/policy/modules/services/virt.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/virt.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/virt.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -2,6 +2,7 @@
  /etc/libvirt/[^/]*	--	gen_context(system_u:object_r:virt_etc_t,s0)
  /etc/libvirt/[^/]*	-d	gen_context(system_u:object_r:virt_etc_rw_t,s0)
@@ -23249,9 +23317,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  /usr/sbin/libvirtd	--	gen_context(system_u:object_r:virtd_exec_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.5.12/policy/modules/services/virt.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.5.13/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/virt.if	2008-10-14 21:22:03.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/virt.if	2008-10-17 10:31:27.000000000 -0400
 @@ -78,6 +78,24 @@
  
  ########################################
@@ -23339,9 +23407,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	virt_manage_pid_files($1)
  
  	virt_manage_lib_files($1)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.5.12/policy/modules/services/virt.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.5.13/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/virt.te	2008-10-14 21:22:40.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/virt.te	2008-10-17 10:31:27.000000000 -0400
 @@ -5,6 +5,7 @@
  #
  # Declarations
@@ -23473,9 +23541,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	unconfined_domain(virtd_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.5.12/policy/modules/services/w3c.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.5.13/policy/modules/services/w3c.te
 --- nsaserefpolicy/policy/modules/services/w3c.te	2008-08-25 09:12:31.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/w3c.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/w3c.te	2008-10-17 10:31:27.000000000 -0400
 @@ -8,11 +8,18 @@
  
  apache_content_template(w3c_validator)
@@ -23495,9 +23563,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  corenet_tcp_connect_ftp_port(httpd_w3c_validator_script_t)
  corenet_tcp_sendrecv_ftp_port(httpd_w3c_validator_script_t)
  corenet_tcp_connect_http_port(httpd_w3c_validator_script_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.5.12/policy/modules/services/xserver.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.5.13/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2008-08-07 11:15:11.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/xserver.fc	2008-10-15 10:01:13.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/xserver.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,13 +1,15 @@
  #
  # HOME_DIR
@@ -23574,9 +23642,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ifdef(`distro_suse',`
  /var/lib/pam_devperm/:0	--	gen_context(system_u:object_r:xdm_var_lib_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.5.12/policy/modules/services/xserver.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.5.13/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2008-10-08 19:00:27.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/xserver.if	2008-10-15 15:53:52.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/xserver.if	2008-10-17 17:26:09.000000000 -0400
 @@ -16,6 +16,7 @@
  	gen_require(`
  		type xkb_var_lib_t, xserver_exec_t, xserver_log_t;
@@ -23688,7 +23756,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	typealias xauth_home_t alias $1_xauth_home_t;
  
 -	domtrans_pattern($1_xserver_t, xauth_exec_t, $1_xauth_t)
-+	allow $1_xserver_t xauth_home_t:file { getattr read };
++	allow $1_xserver_t xauth_home_t:file read_file_perms;
  
 -	allow $1_xserver_t $1_xauth_home_t:file { getattr read };
 +	domtrans_pattern($1_xserver_t, xauth_exec_t, xauth_t)
@@ -23880,6 +23948,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	# xrdb X11:ChangeProperty prop=RESOURCE_MANAGER
  	allow $2 info_xproperty_t:x_property { create write append };
+@@ -548,7 +471,7 @@
+ 	allow $2 $1_xserver_t:process signal;
+ 
+ 	# Read /tmp/.X0-lock
+-	allow $2 $1_xserver_tmp_t:file { getattr read };
++	allow $2 $1_xserver_tmp_t:file read_file_perms;
+ 
+ 	# Client read xserver shm
+ 	allow $2 $1_xserver_t:fd use;
 @@ -616,7 +539,7 @@
  #	refpolicywarn(`$0() has been deprecated, please use xserver_user_x_domain_template instead.')
  	gen_require(`
@@ -23889,17 +23966,22 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	')
  
  	allow $2 self:shm create_shm_perms;
-@@ -624,8 +547,8 @@
+@@ -624,12 +547,12 @@
  	allow $2 self:unix_stream_socket { connectto create_stream_socket_perms };
  
  	# Read .Xauthority file
 -	allow $2 $1_xauth_home_t:file { getattr read };
 -	allow $2 $1_iceauth_home_t:file { getattr read };
-+	allow $2 xauth_home_t:file { getattr read };
-+	allow $2 iceauth_home_t:file { getattr read };
++	allow $2 xauth_home_t:file read_file_perms;
++	allow $2 iceauth_home_t:file read_file_perms;
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
+-	allow $2 xdm_t:fifo_file { getattr read write ioctl };
++	allow $2 xdm_t:fifo_file rw_fifo_files_perms;
+ 	allow $2 xdm_tmp_t:dir search;
+ 	allow $2 xdm_tmp_t:sock_file { read write };
+ 	dontaudit $2 xdm_t:tcp_socket { read write };
 @@ -649,13 +572,210 @@
  
  	xserver_read_xdm_tmp_files($2)
@@ -24098,7 +24180,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +#	Broken Compiler
 +#	allow $2 $1_xproperty_t:x_property read;
-+	allow $2 xproperty_type:x_property { getattr read };
++	allow $2 xproperty_type:x_property {getattr read };
 +
 +	allow $2 std_xext_t:x_extension { query use };
 +	allow $2 xproperty_t:x_property { write create destroy };
@@ -24282,8 +24364,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	allow $3 xdm_tmp_t:dir search;
 -	allow $3 xdm_tmp_t:sock_file { read write };
 -	dontaudit $3 xdm_t:tcp_socket { read write };
-+	allow $3 xauth_home_t:file { getattr read };
-+	allow $3 iceauth_home_t:file { getattr read };
++	allow $3 xauth_home_t:file read_file_perms;
++	allow $3 iceauth_home_t:file read_file_perms;
  
  	# Allow connections to X server.
  	files_search_tmp($3)
@@ -24404,7 +24486,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	')
  
 -	domtrans_pattern($2, xauth_exec_t, $1_xauth_t)
-+	allow $2 xauth_home_t:file { getattr read };
++	allow $2 xauth_home_t:file read_file_perms;
 +')
 +
 +########################################
@@ -24438,7 +24520,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	')
 +
 +	# Read .Iceauthority file
-+	allow $2 iceauth_home_t:file { getattr read };
++	allow $2 iceauth_home_t:file read_file_perms;
  ')
  
  ########################################
@@ -24455,6 +24537,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
+@@ -1180,7 +1381,7 @@
+ 		type xdm_t;
+ 	')
+ 
+-	allow $1 xdm_t:fifo_file { getattr read write }; 
++	allow $1 xdm_t:fifo_file rw_fifo_file_perms; 
+ ')
+ 
+ ########################################
 @@ -1225,6 +1426,25 @@
  
  ########################################
@@ -24481,6 +24572,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Read xdm-writable configuration files.
  ## </summary>
  ## <param name="domain">
+@@ -1239,7 +1459,7 @@
+ 	')
+ 
+ 	files_search_etc($1)
+-	allow $1 xdm_rw_etc_t:file { getattr read };
++	allow $1 xdm_rw_etc_t:file read_file_perms;
+ ')
+ 
+ ########################################
 @@ -1279,6 +1499,7 @@
  	files_search_tmp($1)
  	allow $1 xdm_tmp_t:dir list_dir_perms;
@@ -24498,10 +24598,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -1320,6 +1541,24 @@
+@@ -1315,7 +1536,25 @@
+ 		type xdm_var_lib_t;
+ 	')
  
- ########################################
- ## <summary>
+-	allow $1 xdm_var_lib_t:file { getattr read };
++	allow $1 xdm_var_lib_t:file read_file_perms;
++')
++
++########################################
++## <summary>
 +##      dontaudit search of XDM var lib directories.
 +## </summary>
 +## <param name="domain">
@@ -24516,13 +24622,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	')
 +
 +	dontaudit $1 xdm_var_lib_t:dir search_dir_perms;
-+')
-+
-+########################################
-+## <summary>
- ##	Execute the X server in the XDM X server domain.
- ## </summary>
- ## <param name="domain">
+ ')
+ 
+ ########################################
 @@ -1330,15 +1569,47 @@
  #
  interface(`xserver_domtrans_xdm_xserver',`
@@ -24781,7 +24883,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 -	typeattribute $1 xserver_unconfined_type;
 +	allow $1 xdm_t:fd use;
-+	allow $1 xdm_t:fifo_file { getattr read write ioctl };
++	allow $1 xdm_t:fifo_file rw_fifo_file_perms;
 +	dontaudit $1 xdm_t:tcp_socket { read write };
 +
 +	# Allow connections to X server.
@@ -24790,12 +24892,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	xserver_xdm_stream_connect($1)
 +
 +	allow $1 xdm_t:x_client { getattr destroy };
-+	allow $1 xdm_t:x_drawable { read receive get_property getattr send list_child };
++	allow $1 xdm_t:x_drawable { read receive get_property getattr send list_child add_child };
 +	allow $1 xdm_xproperty_t:x_property { write read };
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.5.12/policy/modules/services/xserver.te
---- nsaserefpolicy/policy/modules/services/xserver.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/services/xserver.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.5.13/policy/modules/services/xserver.te
+--- nsaserefpolicy/policy/modules/services/xserver.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/xserver.te	2008-10-17 10:31:27.000000000 -0400
 @@ -8,6 +8,14 @@
  
  ## <desc>
@@ -25160,7 +25262,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow xdm_xserver_t xdm_var_lib_t:file { getattr read };
  dontaudit xdm_xserver_t xdm_var_lib_t:dir search;
  
--allow xdm_xserver_t xdm_var_run_t:file { getattr read };
+-allow xdm_xserver_t xdm_var_run_t:file read_file_perms;
 +read_files_pattern(xdm_xserver_t, xdm_var_run_t, xdm_var_run_t)
  
  # Label pid and temporary files with derived types.
@@ -25343,15 +25445,27 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +allow xdm_t iceauth_home_t:file read_file_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.fc serefpolicy-3.5.12/policy/modules/services/zosremote.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-3.5.13/policy/modules/services/zebra.te
+--- nsaserefpolicy/policy/modules/services/zebra.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/zebra.te	2008-10-17 10:31:27.000000000 -0400
+@@ -41,7 +41,7 @@
+ allow zebra_t self:capability { setgid setuid net_admin net_raw };
+ dontaudit zebra_t self:capability sys_tty_config;
+ allow zebra_t self:process { signal_perms getcap setcap };
+-allow zebra_t self:file rw_file_perms;
++allow zebra_t self:file { ioctl read write getattr lock append };
+ allow zebra_t self:unix_dgram_socket create_socket_perms;
+ allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
+ allow zebra_t self:netlink_route_socket rw_netlink_socket_perms;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.fc serefpolicy-3.5.13/policy/modules/services/zosremote.fc
 --- nsaserefpolicy/policy/modules/services/zosremote.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/zosremote.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/zosremote.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,2 @@
 +
 +/sbin/audispd-zos-remote	--	gen_context(system_u:object_r:zos_remote_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.if serefpolicy-3.5.12/policy/modules/services/zosremote.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.if serefpolicy-3.5.13/policy/modules/services/zosremote.if
 --- nsaserefpolicy/policy/modules/services/zosremote.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/zosremote.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/zosremote.if	2008-10-17 15:55:23.000000000 -0400
 @@ -0,0 +1,52 @@
 +## <summary>policy for z/OS Remote-services Audit dispatcher plugin</summary>
 +
@@ -25371,7 +25485,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +                type zos_remote_exec_t;
 +        ')
 +
-+        domtrans_pattern($1, zos_remote_exec_t, zos_remote_t);
++        domtrans_pattern($1, zos_remote_exec_t, zos_remote_t)
 +')
 +
 +########################################
@@ -25405,9 +25519,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	role $2 types zos_remote_t;
 +	dontaudit zos_remote_t $3:chr_file rw_term_perms;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.te serefpolicy-3.5.12/policy/modules/services/zosremote.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zosremote.te serefpolicy-3.5.13/policy/modules/services/zosremote.te
 --- nsaserefpolicy/policy/modules/services/zosremote.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.5.12/policy/modules/services/zosremote.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/services/zosremote.te	2008-10-17 10:31:27.000000000 -0400
 @@ -0,0 +1,37 @@
 +policy_module(zosremote,1.0.0)
 +
@@ -25446,9 +25560,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +miscfiles_read_localization(zos_remote_t)
 +
 +logging_send_syslog_msg(zos_remote_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-3.5.12/policy/modules/system/application.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-3.5.13/policy/modules/system/application.te
 --- nsaserefpolicy/policy/modules/system/application.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/application.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/application.te	2008-10-17 10:31:27.000000000 -0400
 @@ -7,6 +7,12 @@
  # Executables to be run by user
  attribute application_exec_type;
@@ -25462,9 +25576,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
  	ssh_sigchld(application_domain_type)
  	ssh_rw_stream_sockets(application_domain_type)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.5.12/policy/modules/system/authlogin.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.5.13/policy/modules/system/authlogin.fc
 --- nsaserefpolicy/policy/modules/system/authlogin.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/authlogin.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/authlogin.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -7,12 +7,10 @@
  /etc/passwd\.lock	--	gen_context(system_u:object_r:shadow_t,s0)
  /etc/shadow.*		--	gen_context(system_u:object_r:shadow_t,s0)
@@ -25491,9 +25605,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/run/pam_ssh(/.*)?		gen_context(system_u:object_r:var_auth_t,s0)
 +
 +/var/cache/coolkey(/.*)?	gen_context(system_u:object_r:auth_cache_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.5.12/policy/modules/system/authlogin.if
---- nsaserefpolicy/policy/modules/system/authlogin.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/authlogin.if	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.5.13/policy/modules/system/authlogin.if
+--- nsaserefpolicy/policy/modules/system/authlogin.if	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/authlogin.if	2008-10-17 10:31:27.000000000 -0400
 @@ -56,10 +56,6 @@
  	miscfiles_read_localization($1_chkpwd_t)
  
@@ -25675,6 +25789,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
+@@ -871,7 +935,7 @@
+ 	files_search_var($1)
+ 	allow $1 var_auth_t:dir manage_dir_perms;
+ 	allow $1 var_auth_t:file rw_file_perms;
+-	allow $1 var_auth_t:lnk_file rw_lnk_file_perms;
++	allow $1 var_auth_t:lnk_file rw_file_perms;
+ ')
+ 
+ ########################################
 @@ -1447,6 +1511,10 @@
  	')
  
@@ -25754,9 +25877,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	manage_files_pattern($1, auth_cache_t,  auth_cache_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.5.12/policy/modules/system/authlogin.te
---- nsaserefpolicy/policy/modules/system/authlogin.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/authlogin.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.5.13/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/authlogin.te	2008-10-17 10:31:27.000000000 -0400
 @@ -59,6 +59,9 @@
  type utempter_exec_t;
  application_domain(utempter_t,utempter_exec_t)
@@ -25856,9 +25979,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	xserver_use_xdm_fds(utempter_t)
  	xserver_rw_xdm_pipes(utempter_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.5.12/policy/modules/system/fstools.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.5.13/policy/modules/system/fstools.fc
 --- nsaserefpolicy/policy/modules/system/fstools.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/fstools.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/fstools.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,4 +1,3 @@
 -/sbin/badblocks		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/blkid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
@@ -25872,9 +25995,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /sbin/parted		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/partprobe		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/partx		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.5.12/policy/modules/system/fstools.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.5.13/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/fstools.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/fstools.te	2008-10-17 10:31:27.000000000 -0400
 @@ -97,6 +97,10 @@
  fs_getattr_tmpfs_dirs(fsadm_t)
  fs_read_tmpfs_symlinks(fsadm_t)
@@ -25896,9 +26019,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	unconfined_domain(fsadm_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-3.5.12/policy/modules/system/hostname.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-3.5.13/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/hostname.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/hostname.te	2008-10-17 10:31:27.000000000 -0400
 @@ -8,7 +8,9 @@
  
  type hostname_t;
@@ -25910,9 +26033,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  role system_r types hostname_t;
  
  ########################################
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-3.5.12/policy/modules/system/init.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-3.5.13/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/init.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/init.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -4,8 +4,7 @@
  /etc/init\.d/.*		--	gen_context(system_u:object_r:initrc_exec_t,s0)
  
@@ -25932,9 +26055,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  #
  # /var
  #
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.5.12/policy/modules/system/init.if
---- nsaserefpolicy/policy/modules/system/init.if	2008-09-24 10:04:55.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/init.if	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.5.13/policy/modules/system/init.if
+--- nsaserefpolicy/policy/modules/system/init.if	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/init.if	2008-10-17 10:31:27.000000000 -0400
 @@ -278,6 +278,27 @@
  			kernel_dontaudit_use_fds($1)
  		')
@@ -26035,6 +26158,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Execute a init script in a specified domain.
  ## </summary>
  ## <desc>
+@@ -774,7 +816,7 @@
+ 
+ 	allow $1 init_t:dir search_dir_perms;
+ 	allow $1 init_t:file read_file_perms;
+-	allow $1 init_t:lnk_file read_lnk_file_perms;
++	allow $1 init_t:lnk_file read_file_perms;
+ ')
+ 
+ ########################################
 @@ -1296,6 +1338,25 @@
  
  ########################################
@@ -26122,9 +26254,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow $1 init_t:unix_dgram_socket sendto;
 +	allow init_t $1:unix_dgram_socket sendto;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.5.12/policy/modules/system/init.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.5.13/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/init.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/init.te	2008-10-17 10:31:27.000000000 -0400
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart,false)
@@ -26369,9 +26501,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	xserver_rw_xdm_home_files(daemon)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.5.12/policy/modules/system/ipsec.te
---- nsaserefpolicy/policy/modules/system/ipsec.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/ipsec.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.5.13/policy/modules/system/ipsec.te
+--- nsaserefpolicy/policy/modules/system/ipsec.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/ipsec.te	2008-10-17 10:37:59.000000000 -0400
 @@ -55,11 +55,12 @@
  
  allow ipsec_t self:capability { net_admin dac_override dac_read_search };
@@ -26381,9 +26513,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +allow ipsec_t self:process { signal setsched };
  allow ipsec_t self:tcp_socket create_stream_socket_perms;
 -allow ipsec_t self:key_socket { create write read setopt };
+-allow ipsec_t self:fifo_file read_file_perms;
 +allow ipsec_t self:udp_socket create_socket_perms;
 +allow ipsec_t self:key_socket create_socket_perms;
- allow ipsec_t self:fifo_file { read getattr };
++allow ipsec_t self:fifo_file read_fifo_file_perms;
 +allow ipsec_t self:netlink_xfrm_socket { create_netlink_socket_perms nlmsg_write };
  
  allow ipsec_t ipsec_conf_file_t:dir list_dir_perms;
@@ -26491,22 +26624,31 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow setkey_t self:netlink_route_socket create_netlink_socket_perms;
  
  allow setkey_t ipsec_conf_file_t:dir list_dir_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.5.12/policy/modules/system/iscsi.te
---- nsaserefpolicy/policy/modules/system/iscsi.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/iscsi.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.5.13/policy/modules/system/iscsi.te
+--- nsaserefpolicy/policy/modules/system/iscsi.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/iscsi.te	2008-10-17 10:31:27.000000000 -0400
 @@ -28,7 +28,7 @@
  # iscsid local policy
  #
  
 -allow iscsid_t self:capability { dac_override ipc_lock net_admin sys_nice sys_resource };
-+allow iscsid_t self:capability { dac_override ipc_lock net_admin net_raw sys_nice sys_resource };
++allow iscsid_t self:capability { dac_override ipc_lock net_admin net_raw sys_admin sys_nice sys_resource };
  allow iscsid_t self:process { setrlimit setsched signal };
- allow iscsid_t self:fifo_file { read write };
+ allow iscsid_t self:fifo_file rw_fifo_file_perms;
  allow iscsid_t self:unix_stream_socket { create_stream_socket_perms connectto };
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.5.12/policy/modules/system/libraries.fc
+@@ -39,7 +39,7 @@
+ allow iscsid_t self:netlink_route_socket rw_netlink_socket_perms;
+ allow iscsid_t self:tcp_socket create_stream_socket_perms;
+ 
+-allow iscsid_t iscsi_lock_t:file manage_file_perms;
++manage_files_pattern(iscsid_t, iscsi_lock_t, iscsi_lock_t)
+ files_lock_filetrans(iscsid_t,iscsi_lock_t,file)
+ 
+ allow iscsid_t iscsi_tmp_t:dir manage_dir_perms;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.5.13/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2008-08-13 15:24:56.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/libraries.fc	2008-10-16 10:30:51.000000000 -0400
-@@ -60,12 +61,15 @@
++++ serefpolicy-3.5.13/policy/modules/system/libraries.fc	2008-10-17 17:21:31.000000000 -0400
+@@ -60,12 +60,15 @@
  #
  # /opt
  #
@@ -26522,7 +26664,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ifdef(`distro_gentoo',`
  # despite the extensions, they are actually libs
  /opt/Acrobat[5-9]/Reader/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:lib_t,s0)
-@@ -84,7 +88,8 @@
+@@ -84,7 +87,8 @@
  
  ifdef(`distro_redhat',`
  /opt/Adobe(/.*?)/nppdf\.so 		-- 	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -26532,7 +26674,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /opt/cisco-vpnclient/lib/libvpnapi\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /opt/cxoffice/lib/wine/.+\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /opt/f-secure/fspms/libexec/librapi\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -133,6 +138,7 @@
+@@ -118,6 +122,8 @@
+ /usr/lib/vlc/codec/libdmo_plugin\.so	   --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib/vlc/codec/librealaudio_plugin\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
++/usr/lib(64)?/libavfilter\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++
+ /usr/(.*/)?lib(64)?(/.*)?/nvidia/.+\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?(/.*)?/nvidia/.+\.so(\..*)? --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libsipphoneapi\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -133,6 +139,7 @@
  /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/libGL\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -26540,7 +26691,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /usr/lib(64)?/xulrunner-[^/]*/libgtkembedmoz\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xulrunner-[^/]*/libxul\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
-@@ -168,7 +174,8 @@
+@@ -168,7 +175,8 @@
  # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv
  # 	HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php
  /usr/lib(64)?/gstreamer-.*/[^/]*\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -26550,7 +26701,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  /usr/lib/firefox-[^/]*/plugins/nppdf.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/libFLAC\.so.*			--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -187,6 +194,7 @@
+@@ -187,6 +195,7 @@
  /usr/lib(64)?/libdv\.so.* 		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/plugins/[^/]*\.so --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/helix/codecs/[^/]*\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -26558,7 +26709,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /usr/lib(64)?/libSDL-.*\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/xorg/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/X11R6/lib/modules/dri/.+\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -246,7 +254,7 @@
+@@ -246,7 +255,7 @@
  
  # Flash plugin, Macromedia
  HOME_DIR/\.mozilla(/.*)?/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -26567,7 +26718,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /usr/lib(64)?/.*/libflashplayer\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/(.*/)?libflashplayer\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  HOME_DIR/.*/plugins/nprhapengine\.so.* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -267,6 +275,8 @@
+@@ -267,6 +276,8 @@
  /usr/lib(64)?/vmware/lib(/.*)?/HConfig\.so  --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/vmware/(.*/)?VmPerl\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  
@@ -26576,7 +26727,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Java, Sun Microsystems (JPackage SRPM)
  /usr/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/local/(.*/)?jre.*/.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-@@ -291,6 +301,8 @@
+@@ -291,6 +302,8 @@
  /usr/lib/acroread/(.*/)?lib/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/.+\.api		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib/acroread/(.*/)?ADMPlugin\.apl	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
@@ -26585,7 +26736,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ') dnl end distro_redhat
  
  #
-@@ -310,3 +322,15 @@
+@@ -310,3 +323,15 @@
  /var/spool/postfix/lib(64)?(/.*)? 		gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/usr(/.*)?			gen_context(system_u:object_r:lib_t,s0)
  /var/spool/postfix/lib(64)?/ld.*\.so.*	--	gen_context(system_u:object_r:ld_so_t,s0)
@@ -26601,9 +26752,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/opt/novell/groupwise/client/lib/libgwapijni\.so\.1	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +
 +/usr/lib(64)?/libmpeg2\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.5.12/policy/modules/system/libraries.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.5.13/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/libraries.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/libraries.te	2008-10-17 10:31:27.000000000 -0400
 @@ -52,11 +52,11 @@
  # ldconfig local policy
  #
@@ -26660,10 +26811,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	unconfined_domain(ldconfig_t) 
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-3.5.12/policy/modules/system/locallogin.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-3.5.13/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/locallogin.te	2008-10-14 15:00:15.000000000 -0400
-@@ -100,7 +100,6 @@
++++ serefpolicy-3.5.13/policy/modules/system/locallogin.te	2008-10-17 11:38:36.000000000 -0400
+@@ -67,6 +67,7 @@
+ dev_setattr_power_mgmt_dev(local_login_t)
+ dev_getattr_sound_dev(local_login_t)
+ dev_setattr_sound_dev(local_login_t)
++dev_rw_generic_usb_dev(local_login_t)
+ dev_dontaudit_getattr_apm_bios_dev(local_login_t)
+ dev_dontaudit_setattr_apm_bios_dev(local_login_t)
+ dev_dontaudit_read_framebuffer(local_login_t)
+@@ -100,7 +101,6 @@
  
  auth_rw_login_records(local_login_t)
  auth_rw_faillog(local_login_t)
@@ -26671,7 +26830,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  auth_manage_pam_console_data(local_login_t)
  auth_domtrans_pam_console(local_login_t)
  
-@@ -163,6 +162,11 @@
+@@ -163,6 +163,11 @@
  	fs_read_cifs_symlinks(local_login_t)
  ')
  
@@ -26683,7 +26842,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
  	alsa_domtrans(local_login_t)
  ')
-@@ -192,7 +196,7 @@
+@@ -192,7 +197,7 @@
  ')
  
  optional_policy(`
@@ -26692,7 +26851,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -241,18 +245,25 @@
+@@ -241,18 +246,25 @@
  seutil_read_default_contexts(sulogin_t)
  
  auth_read_shadow(sulogin_t)
@@ -26720,7 +26879,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ifdef(`sulogin_no_pam', `
  	allow sulogin_t self:capability sys_tty_config;
-@@ -267,10 +278,4 @@
+@@ -267,10 +279,4 @@
  	selinux_compute_user_contexts(sulogin_t)
  ')
  
@@ -26731,9 +26890,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -optional_policy(`
 -	nscd_socket_use(sulogin_t)
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.5.12/policy/modules/system/logging.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.5.13/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2008-09-24 09:07:28.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/logging.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/logging.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -53,10 +53,10 @@
  /var/named/chroot/var/log -d	gen_context(system_u:object_r:var_log_t,s0)
  ')
@@ -26755,9 +26914,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/tinydns/log/main(/.*)?	gen_context(system_u:object_r:var_log_t,s0)
 +
 +/var/spool/plymouth/boot.log	gen_context(system_u:object_r:var_log_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.5.12/policy/modules/system/logging.if
---- nsaserefpolicy/policy/modules/system/logging.if	2008-10-10 15:53:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/logging.if	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.5.13/policy/modules/system/logging.if
+--- nsaserefpolicy/policy/modules/system/logging.if	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/logging.if	2008-10-17 10:31:27.000000000 -0400
+@@ -451,7 +451,7 @@
+ 	')
+ 
+ 	allow $1 devlog_t:lnk_file read;
+-	allow $1 devlog_t:sock_file rw_sock_file_perms;
++	allow $1 devlog_t:sock_file rw_file_perms;
+ 
+ 	# the type of socket depends on the syslog daemon
+ 	allow $1 syslogd_t:unix_dgram_socket sendto;
 @@ -719,6 +719,8 @@
  	files_search_var($1)
  	manage_files_pattern($1,logfile,logfile)
@@ -26774,21 +26942,42 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	logging_admin_syslog($1, $2)
 +	logging_admin_syslog($1, $2, $3)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.5.12/policy/modules/system/logging.te
---- nsaserefpolicy/policy/modules/system/logging.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/logging.te	2008-10-15 15:31:45.000000000 -0400
-@@ -221,7 +221,7 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.5.13/policy/modules/system/logging.te
+--- nsaserefpolicy/policy/modules/system/logging.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/logging.te	2008-10-17 10:31:27.000000000 -0400
+@@ -129,7 +129,7 @@
+ allow auditd_t self:process { signal_perms setpgid setsched };
+ allow auditd_t self:file rw_file_perms;
+ allow auditd_t self:unix_dgram_socket create_socket_perms;
+-allow auditd_t self:fifo_file rw_file_perms;
++allow auditd_t self:fifo_file rw_fifo_file_perms;
+ allow auditd_t self:tcp_socket create_stream_socket_perms;
+ 
+ allow auditd_t auditd_etc_t:dir list_dir_perms;
+@@ -221,9 +221,9 @@
  # audit dispatcher local policy
  #
  
 -allow audisp_t self:capability sys_nice;
 +allow audisp_t self:capability { dac_override sys_nice };
  allow audisp_t self:process setsched;
- allow audisp_t self:fifo_file rw_file_perms;
+-allow audisp_t self:fifo_file rw_file_perms;
++allow audisp_t self:fifo_file rw_fifo_file_perms;
  allow audisp_t self:unix_stream_socket create_stream_socket_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.5.12/policy/modules/system/lvm.fc
+ allow audisp_t self:unix_dgram_socket create_socket_perms;
+ 
+@@ -352,7 +352,7 @@
+ allow syslogd_t self:unix_dgram_socket create_socket_perms;
+ allow syslogd_t self:unix_stream_socket create_stream_socket_perms;
+ allow syslogd_t self:unix_dgram_socket sendto;
+-allow syslogd_t self:fifo_file rw_file_perms;
++allow syslogd_t self:fifo_file rw_fifo_file_perms;
+ allow syslogd_t self:udp_socket create_socket_perms;
+ allow syslogd_t self:tcp_socket create_stream_socket_perms;
+ 
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-3.5.13/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/lvm.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/lvm.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -55,6 +55,7 @@
  /sbin/lvs		--	gen_context(system_u:object_r:lvm_exec_t,s0)
  /sbin/lvscan		--	gen_context(system_u:object_r:lvm_exec_t,s0)
@@ -26802,9 +26991,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/multipathd\.sock -s	gen_context(system_u:object_r:lvm_var_run_t,s0)
  /var/lib/multipath(/.*)?	gen_context(system_u:object_r:lvm_var_lib_t,s0)
 +/var/run/dmevent.*		gen_context(system_u:object_r:lvm_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.5.12/policy/modules/system/lvm.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.5.13/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/lvm.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/lvm.te	2008-10-17 10:31:27.000000000 -0400
 @@ -10,6 +10,9 @@
  type clvmd_exec_t;
  init_daemon_domain(clvmd_t,clvmd_exec_t)
@@ -26985,9 +27174,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	xen_append_log(lvm_t)
 +	xen_dontaudit_rw_unix_stream_sockets(lvm_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.5.12/policy/modules/system/modutils.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.5.13/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/modutils.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/modutils.te	2008-10-17 10:31:27.000000000 -0400
 @@ -42,7 +42,7 @@
  # insmod local policy
  #
@@ -27117,9 +27306,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  #################################
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.5.12/policy/modules/system/mount.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.5.13/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/mount.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/mount.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,4 +1,6 @@
  /bin/mount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
  /bin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
@@ -27128,9 +27317,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/sbin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
 +/bin/fusermount            --      gen_context(system_u:object_r:mount_exec_t,s0)
  /usr/bin/fusermount		--	gen_context(system_u:object_r:mount_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.5.12/policy/modules/system/mount.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.5.13/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/mount.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/mount.if	2008-10-17 10:31:27.000000000 -0400
 @@ -49,6 +49,8 @@
  	mount_domtrans($1)
  	role $2 types mount_t;
@@ -27140,9 +27329,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	optional_policy(`
  		samba_run_smbmount($1, $2, $3)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.5.12/policy/modules/system/mount.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.5.13/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/mount.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/mount.te	2008-10-17 10:31:27.000000000 -0400
 @@ -18,17 +18,18 @@
  init_system_domain(mount_t,mount_exec_t)
  role system_r types mount_t;
@@ -27297,9 +27486,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	hal_rw_pipes(mount_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.5.12/policy/modules/system/raid.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.5.13/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/raid.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/raid.te	2008-10-17 10:31:27.000000000 -0400
 @@ -39,6 +39,7 @@
  dev_dontaudit_getattr_generic_files(mdadm_t)
  dev_dontaudit_getattr_generic_chr_files(mdadm_t)
@@ -27308,9 +27497,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  fs_search_auto_mountpoints(mdadm_t)
  fs_dontaudit_list_tmpfs(mdadm_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.5.12/policy/modules/system/selinuxutil.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.5.13/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/selinuxutil.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -38,7 +38,7 @@
  /usr/sbin/restorecond		--	gen_context(system_u:object_r:restorecond_exec_t,s0)
  /usr/sbin/run_init		--	gen_context(system_u:object_r:run_init_exec_t,s0)
@@ -27332,9 +27521,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +/etc/share/selinux/targeted(/.*)?	gen_context(system_u:object_r:semanage_store_t,s0)
 +/etc/share/selinux/mls(/.*)?		gen_context(system_u:object_r:semanage_store_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.5.12/policy/modules/system/selinuxutil.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.5.13/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2008-10-10 15:53:03.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/selinuxutil.if	2008-10-16 13:47:47.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.if	2008-10-17 10:52:53.000000000 -0400
 @@ -555,6 +555,59 @@
  
  ########################################
@@ -27766,9 +27955,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	hotplug_use_fds($1)
 +')
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.12/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/selinuxutil.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.13/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/selinuxutil.te	2008-10-17 10:31:27.000000000 -0400
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -27886,7 +28075,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -allow semanage_t self:unix_dgram_socket create_socket_perms;
 -allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
 -
--allow semanage_t policy_config_t:file { read write };
+-allow semanage_t policy_config_t:file rw_file_perms;
 -
 -allow semanage_t semanage_tmp_t:dir manage_dir_perms;
 -allow semanage_t semanage_tmp_t:file manage_file_perms;
@@ -28123,9 +28312,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	hotplug_use_fds(setfiles_t)
 +	unconfined_domain(setfiles_mac_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.12/policy/modules/system/setrans.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.if serefpolicy-3.5.13/policy/modules/system/setrans.if
 --- nsaserefpolicy/policy/modules/system/setrans.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/setrans.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/setrans.if	2008-10-17 10:31:27.000000000 -0400
 @@ -21,3 +21,23 @@
  	stream_connect_pattern($1,setrans_var_run_t,setrans_var_run_t,setrans_t)
  	files_list_pids($1)
@@ -28150,9 +28339,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	init_labeled_script_domtrans($1, setrans_initrc_exec_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.12/policy/modules/system/sysnetwork.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/sysnetwork.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -11,6 +11,7 @@
  /etc/dhclient-script	--	gen_context(system_u:object_r:dhcp_etc_t,s0)
  /etc/dhcpc.*			gen_context(system_u:object_r:dhcp_etc_t,s0)
@@ -28175,9 +28364,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
 +
 +/etc/firestarter/firestarter\.sh gen_context(system_u:object_r:dhcpc_helper_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.5.12/policy/modules/system/sysnetwork.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.5.13/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/sysnetwork.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.if	2008-10-17 10:31:27.000000000 -0400
 @@ -553,6 +553,7 @@
  		type net_conf_t;
  	')
@@ -28256,9 +28445,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	role_transition $1 dhcpc_exec_t system_r;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.12/policy/modules/system/sysnetwork.te
---- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/sysnetwork.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.5.13/policy/modules/system/sysnetwork.te
+--- nsaserefpolicy/policy/modules/system/sysnetwork.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/sysnetwork.te	2008-10-17 10:31:27.000000000 -0400
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t,dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -28269,7 +28458,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  type dhcpc_state_t;
  files_type(dhcpc_state_t)
  
-@@ -41,16 +44,16 @@
+@@ -41,21 +44,22 @@
  #
  # DHCP client local policy
  #
@@ -28290,7 +28479,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  allow dhcpc_t dhcp_etc_t:dir list_dir_perms;
  read_lnk_files_pattern(dhcpc_t,dhcp_etc_t,dhcp_etc_t)
-@@ -117,7 +120,7 @@
+ exec_files_pattern(dhcpc_t,dhcp_etc_t,dhcp_etc_t)
+ 
++allow dhcpc_t dhcp_state_t:file read_file_perms;
+ manage_files_pattern(dhcpc_t,dhcpc_state_t,dhcpc_state_t)
+ filetrans_pattern(dhcpc_t,dhcp_state_t,dhcpc_state_t,file)
+ 
+@@ -116,7 +120,7 @@
  corecmd_exec_shell(dhcpc_t)
  
  domain_use_interactive_fds(dhcpc_t)
@@ -28299,7 +28494,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  files_read_etc_files(dhcpc_t)
  files_read_etc_runtime_files(dhcpc_t)
-@@ -136,8 +139,6 @@
+@@ -135,8 +139,6 @@
  
  modutils_domtrans_insmod(dhcpc_t)
  
@@ -28308,7 +28503,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ifdef(`distro_redhat', `
  	files_exec_etc_files(dhcpc_t)
  ')
-@@ -186,14 +187,12 @@
+@@ -185,14 +187,12 @@
  ')
  
  optional_policy(`
@@ -28329,7 +28524,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -202,9 +201,7 @@
+@@ -201,9 +201,7 @@
  ')
  
  optional_policy(`
@@ -28340,7 +28535,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -215,6 +212,11 @@
+@@ -214,6 +212,11 @@
  optional_policy(`
  	seutil_sigchld_newrole(dhcpc_t)
  	seutil_dontaudit_search_config(dhcpc_t)
@@ -28352,7 +28547,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -226,6 +228,10 @@
+@@ -225,6 +228,10 @@
  ')
  
  optional_policy(`
@@ -28363,7 +28558,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	kernel_read_xen_state(dhcpc_t)
  	kernel_write_xen_state(dhcpc_t)
  	xen_append_log(dhcpc_t)
-@@ -239,7 +245,6 @@
+@@ -238,7 +245,6 @@
  
  allow ifconfig_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack };
  allow ifconfig_t self:capability { net_raw net_admin sys_tty_config };
@@ -28371,7 +28566,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  allow ifconfig_t self:fd use;
  allow ifconfig_t self:fifo_file rw_fifo_file_perms;
-@@ -253,6 +258,7 @@
+@@ -252,6 +258,7 @@
  allow ifconfig_t self:sem create_sem_perms;
  allow ifconfig_t self:msgq create_msgq_perms;
  allow ifconfig_t self:msg { send receive };
@@ -28379,7 +28574,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  # Create UDP sockets, necessary when called from dhcpc
  allow ifconfig_t self:udp_socket create_socket_perms;
-@@ -262,13 +268,20 @@
+@@ -261,13 +268,20 @@
  allow ifconfig_t self:netlink_route_socket create_netlink_socket_perms;
  allow ifconfig_t self:netlink_xfrm_socket { create_netlink_socket_perms nlmsg_read };
  allow ifconfig_t self:tcp_socket { create ioctl };
@@ -28400,7 +28595,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  corenet_rw_tun_tap_dev(ifconfig_t)
  
-@@ -279,8 +292,13 @@
+@@ -278,8 +292,13 @@
  fs_getattr_xattr_fs(ifconfig_t)
  fs_search_auto_mountpoints(ifconfig_t)
  
@@ -28414,7 +28609,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  domain_use_interactive_fds(ifconfig_t)
  
-@@ -336,6 +354,14 @@
+@@ -335,6 +354,14 @@
  ')
  
  optional_policy(`
@@ -28429,9 +28624,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	kernel_read_xen_state(ifconfig_t)
  	kernel_write_xen_state(ifconfig_t)
  	xen_append_log(ifconfig_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.12/policy/modules/system/udev.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.5.13/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/udev.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/udev.if	2008-10-17 10:31:27.000000000 -0400
 @@ -96,6 +96,24 @@
  
  ########################################
@@ -28485,9 +28680,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	allow $1 udev_tdb_t:file rw_file_perms;
 +	allow $1 udev_tbl_t:file rw_file_perms;
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.12/policy/modules/system/udev.te
---- nsaserefpolicy/policy/modules/system/udev.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/udev.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.5.13/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/udev.te	2008-10-17 10:31:27.000000000 -0400
 @@ -83,6 +83,7 @@
  kernel_rw_unix_dgram_sockets(udev_t)
  kernel_dgram_send(udev_t)
@@ -28533,9 +28728,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
  	xserver_read_xdm_pid(udev_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.12/policy/modules/system/unconfined.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.5.13/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/unconfined.fc	2008-10-15 08:43:45.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -2,15 +2,27 @@
  # e.g.:
  # /usr/local/bin/appsrv		--	gen_context(system_u:object_r:unconfined_exec_t,s0)
@@ -28573,9 +28768,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/libexec/ghc-[^/]+/ghc-.*  --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +
 +/opt/real/(.*/)?realplay\.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.12/policy/modules/system/unconfined.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.5.13/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2008-09-11 16:42:49.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/unconfined.if	2008-10-15 08:50:25.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.if	2008-10-17 10:31:27.000000000 -0400
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -28904,9 +29099,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	userdom_role_change_template(unconfined, $1)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.12/policy/modules/system/unconfined.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.5.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/unconfined.te	2008-10-15 08:45:32.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/unconfined.te	2008-10-17 10:31:27.000000000 -0400
 @@ -6,35 +6,76 @@
  # Declarations
  #
@@ -29247,9 +29442,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	domtrans_pattern(unconfined_t, mplayer_exec_t, unconfined_execmem_t)
  ')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.12/policy/modules/system/userdomain.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.5.13/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/userdomain.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -1,4 +1,5 @@
 -HOME_DIR	-d	gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh)
 -HOME_DIR/.+		gen_context(system_u:object_r:ROLE_home_t,s0)
@@ -29260,9 +29455,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +HOME_DIR/.+		gen_context(system_u:object_r:user_home_t,s0)
 +/tmp/gconfd-USER -d	gen_context(system_u:object_r:user_tmp_t,s0)
 +/root(/.*)?	 	gen_context(system_u:object_r:admin_home_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.12/policy/modules/system/userdomain.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.5.13/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/userdomain.if	2008-10-15 10:27:06.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.if	2008-10-17 17:49:05.000000000 -0400
 @@ -28,10 +28,14 @@
  		class context contains;
  	')
@@ -29872,7 +30067,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	<summary>
  ##	The prefix of the user domain (e.g., user
  ##	is the prefix for user_t).
-@@ -699,188 +672,202 @@
+@@ -699,188 +672,206 @@
  	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
  	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
  
@@ -30065,34 +30260,37 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -		inn_read_news_lib($1_t)
 -		inn_read_news_spool($1_t)
 +			hal_dbus_chat($1_usertype)
-+		')
  	')
  
  	optional_policy(`
 -		locate_read_lib_files($1_t)
-+		inetd_use_fds($1_usertype)
-+		inetd_rw_tcp_sockets($1_usertype)
++			nsplugin_per_role_template($1, $1_usertype, $1_r)
++		')
  	')
  
 -	# for running depmod as part of the kernel packaging process
  	optional_policy(`
 -		modutils_read_module_config($1_t)
-+		inn_read_config($1_usertype)
-+		inn_read_news_lib($1_usertype)
-+		inn_read_news_spool($1_usertype)
++		inetd_use_fds($1_usertype)
++		inetd_rw_tcp_sockets($1_usertype)
  	')
  
  	optional_policy(`
 -		mta_rw_spool($1_t)
-+		locate_read_lib_files($1_usertype)
++		inn_read_config($1_usertype)
++		inn_read_news_lib($1_usertype)
++		inn_read_news_spool($1_usertype)
  	')
  
 -
-+	# for running depmod as part of the kernel packaging process
  	optional_policy(`
 -		tunable_policy(`allow_user_mysql_connect',`
 -			mysql_stream_connect($1_t)
--		')
++		locate_read_lib_files($1_usertype)
+ 		')
++
++	# for running depmod as part of the kernel packaging process
++	optional_policy(`
 +		modutils_read_module_config($1_usertype)
  	')
  
@@ -30156,7 +30354,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  #######################################
-@@ -902,9 +889,7 @@
+@@ -902,9 +893,7 @@
  ## </param>
  #
  template(`userdom_login_user_template', `
@@ -30167,7 +30365,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	userdom_base_user_template($1)
  
-@@ -930,74 +915,77 @@
+@@ -930,74 +919,77 @@
  
  	allow $1_t self:process ~{ setcurrent setexec setrlimit execmem execstack execheap };
  	dontaudit $1_t self:process setrlimit;
@@ -30278,7 +30476,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	')
  ')
  
-@@ -1031,9 +1019,6 @@
+@@ -1031,9 +1023,6 @@
  	domain_interactive_fd($1_t)
  
  	typeattribute $1_devpts_t user_ptynode;
@@ -30288,7 +30486,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	typeattribute $1_tty_device_t user_ttynode;
  
  	##############################
-@@ -1042,12 +1027,25 @@
+@@ -1042,12 +1031,25 @@
  	#
  
  	# privileged home directory writers
@@ -30320,7 +30518,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	optional_policy(`
  		loadkeys_run($1_t,$1_r,$1_tty_device_t)
-@@ -1087,14 +1085,16 @@
+@@ -1087,14 +1089,16 @@
  	#
  
  	authlogin_per_role_template($1, $1_t, $1_r)
@@ -30342,7 +30540,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	logging_dontaudit_send_audit_msgs($1_t)
  
  	# Need to to this just so screensaver will work. Should be moved to screensaver domain
-@@ -1102,28 +1102,23 @@
+@@ -1102,28 +1106,19 @@
  	selinux_get_enforce_mode($1_t)
  
  	optional_policy(`
@@ -30356,13 +30554,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -
 -		optional_policy(`
 -			consolekit_dbus_chat($1_t)
-+		apache_per_role_template($1, $1_usertype, $1_r)
- 		')
- 
- 		optional_policy(`
+-		')
+-
+-		optional_policy(`
 -			cups_dbus_chat($1_t)
 -		')
-+		nsplugin_per_role_template($1, $1_usertype, $1_r)
++		apache_per_role_template($1, $1_usertype, $1_r)
  	')
  
  	optional_policy(`
@@ -30399,7 +30596,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	# cjp: why?
  	files_read_kernel_symbol_table($1_t)
  
-@@ -1189,36 +1182,49 @@
+@@ -1189,36 +1182,45 @@
  		')
  	')
  
@@ -30416,36 +30613,32 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  		corenet_tcp_bind_all_nodes($1_t)
 -		corenet_tcp_bind_generic_port($1_t)
 +		corenet_tcp_bind_all_unreserved_ports($1_t)
++	')
++
++	# Run pppd in pppd_t by default for user
++	optional_policy(`
++		ppp_run_cond($1_t, $1_r, { $1_tty_device_t $1_devpts_t })
  	')
  
-+	# Run pppd in pppd_t by default for user
  	optional_policy(`
 -		netutils_run_ping_cond($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })
 -		netutils_run_traceroute_cond($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })
-+		ppp_run_cond($1_t, $1_r, { $1_tty_device_t $1_devpts_t })
++		games_rw_data($1_usertype)
  	')
  
  	optional_policy(`
 -		postgresql_userdom_template($1,$1_t,$1_r)
-+		games_rw_data($1_usertype)
++		mount_run($1_t, $1_r, { $1_tty_device_t $1_devpts_t })
  	')
  
 -	# Run pppd in pppd_t by default for user
  	optional_policy(`
 -		ppp_run_cond($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })
-+		mount_run($1_t, $1_r, { $1_tty_device_t $1_devpts_t })
++		cron_per_role_template($1, $1_t, $1_r)
  	')
  
  	optional_policy(`
 -		setroubleshoot_stream_connect($1_t)
-+		cron_per_role_template($1, $1_t, $1_r)
-+	')
-+
-+	optional_policy(`
-+		nsplugin_per_role_template($1, $1_usertype, $1_r)
-+	')
-+
-+	optional_policy(`
 +		polkit_per_role_template($1, $1_usertype, $1_r)
 +	')
 +
@@ -30462,7 +30655,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	')
  ')
  
-@@ -1295,8 +1301,6 @@
+@@ -1295,8 +1297,6 @@
  	# Manipulate other users crontab.
  	allow $1_t self:passwd crontab;
  
@@ -30471,7 +30664,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -1318,8 +1322,6 @@
+@@ -1318,8 +1318,6 @@
  
  	dev_getattr_generic_blk_files($1_t)
  	dev_getattr_generic_chr_files($1_t)
@@ -30480,7 +30673,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	# Allow MAKEDEV to work
  	dev_create_all_blk_files($1_t)
  	dev_create_all_chr_files($1_t)
-@@ -1374,13 +1376,6 @@
+@@ -1374,13 +1372,6 @@
  	# But presently necessary for installing the file_contexts file.
  	seutil_manage_bin_policy($1_t)
  
@@ -30494,7 +30687,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	optional_policy(`
  		postgresql_unconfined($1_t)
  	')
-@@ -1432,6 +1427,7 @@
+@@ -1432,6 +1423,7 @@
  	dev_relabel_all_dev_nodes($1)
  
  	files_create_boot_flag($1)
@@ -30502,7 +30695,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	# Necessary for managing /boot/efi
  	fs_manage_dos_files($1)
-@@ -1461,10 +1457,6 @@
+@@ -1461,10 +1453,6 @@
  	seutil_run_semanage($1,$2,$3)
  	seutil_run_setfiles($1, $2, $3)
  
@@ -30513,7 +30706,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	optional_policy(`
  		aide_run($1,$2, $3)
  	')
-@@ -1484,6 +1476,14 @@
+@@ -1484,6 +1472,14 @@
  	optional_policy(`
  		netlabel_run_mgmt($1,$2, $3)
  	')
@@ -30528,7 +30721,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -1741,11 +1741,15 @@
+@@ -1741,11 +1737,15 @@
  #
  template(`userdom_user_home_content',`
  	gen_require(`
@@ -30547,7 +30740,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -1841,11 +1845,11 @@
+@@ -1841,11 +1841,11 @@
  #
  template(`userdom_search_user_home_dirs',`
  	gen_require(`
@@ -30561,7 +30754,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -1875,11 +1879,11 @@
+@@ -1875,11 +1875,11 @@
  #
  template(`userdom_list_user_home_dirs',`
  	gen_require(`
@@ -30575,7 +30768,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -1923,12 +1927,12 @@
+@@ -1923,12 +1923,12 @@
  #
  template(`userdom_user_home_domtrans',`
  	gen_require(`
@@ -30591,7 +30784,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -1958,10 +1962,11 @@
+@@ -1958,10 +1958,11 @@
  #
  template(`userdom_dontaudit_list_user_home_dirs',`
  	gen_require(`
@@ -30605,7 +30798,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -1993,11 +1998,47 @@
+@@ -1993,11 +1994,47 @@
  #
  template(`userdom_manage_user_home_content_dirs',`
  	gen_require(`
@@ -30655,7 +30848,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2029,10 +2070,10 @@
+@@ -2029,10 +2066,10 @@
  #
  template(`userdom_dontaudit_setattr_user_home_content_files',`
  	gen_require(`
@@ -30668,7 +30861,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2062,11 +2103,11 @@
+@@ -2062,11 +2099,11 @@
  #
  template(`userdom_read_user_home_content_files',`
  	gen_require(`
@@ -30682,7 +30875,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2096,11 +2137,11 @@
+@@ -2096,11 +2133,11 @@
  #
  template(`userdom_dontaudit_read_user_home_content_files',`
  	gen_require(`
@@ -30697,7 +30890,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2130,10 +2171,14 @@
+@@ -2130,10 +2167,14 @@
  #
  template(`userdom_dontaudit_write_user_home_content_files',`
  	gen_require(`
@@ -30714,7 +30907,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2163,11 +2208,11 @@
+@@ -2163,11 +2204,11 @@
  #
  template(`userdom_read_user_home_content_symlinks',`
  	gen_require(`
@@ -30728,7 +30921,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2197,11 +2242,11 @@
+@@ -2197,11 +2238,11 @@
  #
  template(`userdom_exec_user_home_content_files',`
  	gen_require(`
@@ -30742,7 +30935,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2231,10 +2276,10 @@
+@@ -2231,10 +2272,10 @@
  #
  template(`userdom_dontaudit_exec_user_home_content_files',`
  	gen_require(`
@@ -30755,7 +30948,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2266,12 +2311,12 @@
+@@ -2266,12 +2307,12 @@
  #
  template(`userdom_manage_user_home_content_files',`
  	gen_require(`
@@ -30771,7 +30964,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2303,10 +2348,10 @@
+@@ -2303,10 +2344,10 @@
  #
  template(`userdom_dontaudit_manage_user_home_content_dirs',`
  	gen_require(`
@@ -30784,7 +30977,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2338,12 +2383,12 @@
+@@ -2338,12 +2379,12 @@
  #
  template(`userdom_manage_user_home_content_symlinks',`
  	gen_require(`
@@ -30800,7 +30993,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2375,12 +2420,12 @@
+@@ -2375,12 +2416,12 @@
  #
  template(`userdom_manage_user_home_content_pipes',`
  	gen_require(`
@@ -30816,7 +31009,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2412,12 +2457,12 @@
+@@ -2412,12 +2453,12 @@
  #
  template(`userdom_manage_user_home_content_sockets',`
  	gen_require(`
@@ -30832,7 +31025,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2462,11 +2507,11 @@
+@@ -2462,11 +2503,11 @@
  #
  template(`userdom_user_home_dir_filetrans',`
  	gen_require(`
@@ -30846,7 +31039,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2511,11 +2556,11 @@
+@@ -2511,11 +2552,11 @@
  #
  template(`userdom_user_home_content_filetrans',`
  	gen_require(`
@@ -30860,7 +31053,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2555,11 +2600,11 @@
+@@ -2555,11 +2596,11 @@
  #
  template(`userdom_user_home_dir_filetrans_user_home_content',`
  	gen_require(`
@@ -30874,7 +31067,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2589,11 +2634,11 @@
+@@ -2589,11 +2630,11 @@
  #
  template(`userdom_write_user_tmp_sockets',`
  	gen_require(`
@@ -30888,7 +31081,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2623,11 +2668,11 @@
+@@ -2623,11 +2664,11 @@
  #
  template(`userdom_list_user_tmp',`
  	gen_require(`
@@ -30902,7 +31095,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2659,10 +2704,10 @@
+@@ -2659,10 +2700,10 @@
  #
  template(`userdom_dontaudit_list_user_tmp',`
  	gen_require(`
@@ -30915,7 +31108,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2694,10 +2739,10 @@
+@@ -2694,10 +2735,10 @@
  #
  template(`userdom_dontaudit_manage_user_tmp_dirs',`
  	gen_require(`
@@ -30928,7 +31121,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2727,12 +2772,12 @@
+@@ -2727,12 +2768,12 @@
  #
  template(`userdom_read_user_tmp_files',`
  	gen_require(`
@@ -30944,7 +31137,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2764,10 +2809,10 @@
+@@ -2764,10 +2805,10 @@
  #
  template(`userdom_dontaudit_read_user_tmp_files',`
  	gen_require(`
@@ -30957,7 +31150,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2799,10 +2844,10 @@
+@@ -2799,10 +2840,10 @@
  #
  template(`userdom_dontaudit_append_user_tmp_files',`
  	gen_require(`
@@ -30970,7 +31163,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2832,12 +2877,12 @@
+@@ -2832,12 +2873,12 @@
  #
  template(`userdom_rw_user_tmp_files',`
  	gen_require(`
@@ -30986,7 +31179,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2869,10 +2914,10 @@
+@@ -2869,10 +2910,10 @@
  #
  template(`userdom_dontaudit_manage_user_tmp_files',`
  	gen_require(`
@@ -30999,7 +31192,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2904,12 +2949,12 @@
+@@ -2904,12 +2945,12 @@
  #
  template(`userdom_read_user_tmp_symlinks',`
  	gen_require(`
@@ -31015,7 +31208,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2941,11 +2986,11 @@
+@@ -2941,11 +2982,11 @@
  #
  template(`userdom_manage_user_tmp_dirs',`
  	gen_require(`
@@ -31029,7 +31222,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -2977,11 +3022,11 @@
+@@ -2977,11 +3018,11 @@
  #
  template(`userdom_manage_user_tmp_files',`
  	gen_require(`
@@ -31043,7 +31236,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -3013,11 +3058,11 @@
+@@ -3013,11 +3054,11 @@
  #
  template(`userdom_manage_user_tmp_symlinks',`
  	gen_require(`
@@ -31057,7 +31250,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -3049,11 +3094,11 @@
+@@ -3049,11 +3090,11 @@
  #
  template(`userdom_manage_user_tmp_pipes',`
  	gen_require(`
@@ -31071,7 +31264,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -3085,11 +3130,11 @@
+@@ -3085,11 +3126,11 @@
  #
  template(`userdom_manage_user_tmp_sockets',`
  	gen_require(`
@@ -31085,7 +31278,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -3134,10 +3179,10 @@
+@@ -3134,10 +3175,10 @@
  #
  template(`userdom_user_tmp_filetrans',`
  	gen_require(`
@@ -31098,7 +31291,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	files_search_tmp($2)
  ')
  
-@@ -3178,19 +3223,19 @@
+@@ -3178,19 +3219,19 @@
  #
  template(`userdom_tmp_filetrans_user_tmp',`
  	gen_require(`
@@ -31122,7 +31315,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	</p>
  ##	<p>
  ##	This is a templated interface, and should only
-@@ -3211,13 +3256,13 @@
+@@ -3211,13 +3252,13 @@
  #
  template(`userdom_rw_user_tmpfs_files',`
  	gen_require(`
@@ -31140,7 +31333,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -4616,11 +4661,11 @@
+@@ -4616,11 +4657,11 @@
  #
  interface(`userdom_search_all_users_home_dirs',`
  	gen_require(`
@@ -31154,7 +31347,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -4640,6 +4685,14 @@
+@@ -4640,6 +4681,14 @@
  
  	files_list_home($1)
  	allow $1 home_dir_type:dir list_dir_perms;
@@ -31169,7 +31362,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -4677,6 +4730,8 @@
+@@ -4677,6 +4726,8 @@
  	')
  
  	dontaudit $1 { home_dir_type home_type }:dir search_dir_perms;
@@ -31178,7 +31371,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ########################################
-@@ -4721,6 +4776,25 @@
+@@ -4721,6 +4772,25 @@
  
  ########################################
  ## <summary>
@@ -31204,7 +31397,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Create, read, write, and delete all files
  ##	in all users home directories.
  ## </summary>
-@@ -4946,7 +5020,7 @@
+@@ -4946,7 +5016,7 @@
  
  ########################################
  ## <summary>
@@ -31213,11 +31406,103 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ## </summary>
  ## <param name="domain">
  ##	<summary>
-@@ -5318,6 +5392,42 @@
+@@ -5318,7 +5388,7 @@
  
  ########################################
  ## <summary>
+-##	Read and write unprivileged user ttys.
 +##	Write all unprivileged users files in /tmp
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -5326,18 +5396,17 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_use_unpriv_users_ttys',`
++interface(`userdom_manage_unpriv_users_tmp_files',`
+ 	gen_require(`
+-		attribute user_ttynode;
++		type user_tmp_t;
+ 	')
+ 
+-	allow $1 user_ttynode:chr_file rw_term_perms;
++	manage_files_pattern($1, user_tmp_t,  user_tmp_t)
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Do not audit attempts to use unprivileged
+-##	user ttys.
++##	Write all unprivileged users lnk_files in /tmp
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -5345,17 +5414,17 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_dontaudit_use_unpriv_users_ttys',`
++interface(`userdom_manage_unpriv_users_tmp_symlinks',`
+ 	gen_require(`
+-		attribute user_ttynode;
++		type user_tmp_t;
+ 	')
+ 
+-	dontaudit $1 user_ttynode:chr_file rw_file_perms;
++	manage_lnk_files_pattern($1, user_tmp_t,  user_tmp_t)
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Read the process state of all user domains.
++##	Read and write unprivileged user ttys.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -5363,18 +5432,18 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_read_all_users_state',`
++interface(`userdom_use_unpriv_users_ttys',`
+ 	gen_require(`
+-		attribute userdomain;
++		attribute user_ttynode;
+ 	')
+ 
+-	read_files_pattern($1,userdomain,userdomain)
+-	kernel_search_proc($1)
++	allow $1 user_ttynode:chr_file rw_term_perms;
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Get the attributes of all user domains.
++##	Do not audit attempts to use unprivileged
++##	user ttys.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -5382,17 +5451,54 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_getattr_all_users',`
++interface(`userdom_dontaudit_use_unpriv_users_ttys',`
+ 	gen_require(`
+-		attribute userdomain;
++		attribute user_ttynode;
+ 	')
+ 
+-	allow $1 userdomain:process getattr;
++	dontaudit $1 user_ttynode:chr_file rw_file_perms;
+ ')
+ 
+ ########################################
+ ## <summary>
+-##	Inherit the file descriptors from all user domains
++##	Read the process state of all user domains.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -31225,17 +31510,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_unpriv_users_tmp_files',`
++interface(`userdom_read_all_users_state',`
 +	gen_require(`
-+		type user_tmp_t;
++		attribute userdomain;
 +	')
 +
-+	manage_files_pattern($1, user_tmp_t,  user_tmp_t)
++	ps_process_pattern($1, userdomain)
++	kernel_search_proc($1)
 +')
 +
 +########################################
 +## <summary>
-+##	Write all unprivileged users lnk_files in /tmp
++##	Get the attributes of all user domains.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -31243,29 +31529,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_unpriv_users_tmp_symlinks',`
++interface(`userdom_getattr_all_users',`
 +	gen_require(`
-+		type user_tmp_t;
++		attribute userdomain;
 +	')
 +
-+	manage_lnk_files_pattern($1, user_tmp_t,  user_tmp_t)
++	allow $1 userdomain:process getattr;
 +')
 +
 +########################################
 +## <summary>
- ##	Read and write unprivileged user ttys.
++##	Inherit the file descriptors from all user domains
  ## </summary>
  ## <param name="domain">
-@@ -5368,7 +5478,7 @@
- 		attribute userdomain;
- 	')
- 
--	read_files_pattern($1,userdomain,userdomain)
-+	ps_process_pattern($1, userdomain)
- 	kernel_search_proc($1)
- ')
- 
-@@ -5483,6 +5593,42 @@
+ ##	<summary>
+@@ -5483,6 +5589,42 @@
  
  ########################################
  ## <summary>
@@ -31308,7 +31586,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Send a dbus message to all user domains.
  ## </summary>
  ## <param name="domain">
-@@ -5513,3 +5659,548 @@
+@@ -5513,3 +5655,548 @@
  interface(`userdom_unconfined',`
  	refpolicywarn(`$0($*) has been deprecated.')
  ')
@@ -31857,9 +32135,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	manage_fifo_files_pattern($1, user_tmpfs_t, user_tmpfs_t)
 +	fs_tmpfs_filetrans($1, user_tmpfs_t, { dir file lnk_file sock_file fifo_file })
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.12/policy/modules/system/userdomain.te
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.5.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2008-10-14 11:58:09.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/userdomain.te	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/userdomain.te	2008-10-17 10:31:27.000000000 -0400
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -31978,9 +32256,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	manage_fifo_files_pattern(privhome, cifs_t, cifs_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.12/policy/modules/system/xen.fc
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-3.5.13/policy/modules/system/xen.fc
 --- nsaserefpolicy/policy/modules/system/xen.fc	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/xen.fc	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/xen.fc	2008-10-17 10:31:27.000000000 -0400
 @@ -20,6 +20,7 @@
  /var/run/xenconsoled\.pid --	gen_context(system_u:object_r:xenconsoled_var_run_t,s0)
  /var/run/xend(/.*)?		gen_context(system_u:object_r:xend_var_run_t,s0)
@@ -31989,9 +32267,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/xenstore\.pid	--	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  /var/run/xenstored(/.*)?	gen_context(system_u:object_r:xenstored_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.12/policy/modules/system/xen.if
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.5.13/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/xen.if	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/xen.if	2008-10-17 10:31:27.000000000 -0400
 @@ -167,11 +167,14 @@
  #
  interface(`xen_stream_connect',`
@@ -32033,9 +32311,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow $1 xend_var_lib_t:dir search_dir_perms;
 +	rw_files_pattern($1, xen_image_t, xen_image_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.12/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.5.12/policy/modules/system/xen.te	2008-10-14 15:00:15.000000000 -0400
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.5.13/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/modules/system/xen.te	2008-10-17 10:31:27.000000000 -0400
 @@ -6,6 +6,13 @@
  # Declarations
  #
@@ -32114,18 +32392,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  manage_files_pattern(xend_t,xend_var_log_t,xend_var_log_t)
  manage_sock_files_pattern(xend_t,xend_var_log_t,xend_var_log_t)
  logging_log_filetrans(xend_t,xend_var_log_t,{ sock_file file dir })
-@@ -122,15 +135,13 @@
+@@ -122,12 +135,13 @@
  manage_fifo_files_pattern(xend_t,xend_var_lib_t,xend_var_lib_t)
  files_var_lib_filetrans(xend_t,xend_var_lib_t,{ file dir })
  
 +init_stream_connect_script(xend_t)
 +
  # transition to store
--domain_auto_trans(xend_t, xenstored_exec_t, xenstored_t)
--allow xenstored_t xend_t:fd use;
--allow xenstored_t xend_t:process sigchld;
--allow xenstored_t xend_t:fifo_file write;
-+domtrans_pattern(xend_t, xenstored_exec_t, xenstored_t)
+ domtrans_pattern(xend_t, xenstored_exec_t, xenstored_t)
  
  # transition to console
 -domain_auto_trans(xend_t, xenconsoled_exec_t, xenconsoled_t)
@@ -32134,7 +32408,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  kernel_read_kernel_sysctls(xend_t)
  kernel_read_system_state(xend_t)
-@@ -176,6 +187,7 @@
+@@ -173,6 +187,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
  files_read_usr_files(xend_t)
@@ -32142,7 +32416,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  storage_raw_read_fixed_disk(xend_t)
  storage_raw_write_fixed_disk(xend_t)
-@@ -207,11 +219,15 @@
+@@ -204,11 +219,15 @@
  sysnet_read_dhcpc_pid(xend_t)
  sysnet_rw_dhcp_config(xend_t)
  
@@ -32159,16 +32433,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  optional_policy(`
  	consoletype_exec(xend_t)
-@@ -224,7 +240,7 @@
- 
- allow xenconsoled_t self:capability { dac_override fsetid ipc_lock };
- allow xenconsoled_t self:unix_stream_socket create_stream_socket_perms;
--allow xenconsoled_t self:fifo_file { read write };
-+allow xenconsoled_t self:fifo_file  rw_fifo_file_perms;
- 
- allow xenconsoled_t xen_devpts_t:chr_file rw_term_perms;
- 
-@@ -245,6 +261,8 @@
+@@ -242,6 +261,8 @@
  
  files_read_usr_files(xenconsoled_t)
  
@@ -32177,7 +32442,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  term_create_pty(xenconsoled_t,xen_devpts_t);
  term_use_generic_ptys(xenconsoled_t)
  term_use_console(xenconsoled_t)
-@@ -257,7 +275,7 @@
+@@ -254,7 +275,7 @@
  
  miscfiles_read_localization(xenconsoled_t)
  
@@ -32186,7 +32451,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  xen_stream_connect_xenstore(xenconsoled_t)
  
  ########################################
-@@ -265,15 +283,25 @@
+@@ -262,15 +283,25 @@
  # Xen store local policy
  #
  
@@ -32213,14 +32478,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # var/lib files for xenstored
  manage_dirs_pattern(xenstored_t,xenstored_var_lib_t,xenstored_var_lib_t)
  manage_files_pattern(xenstored_t,xenstored_var_lib_t,xenstored_var_lib_t)
-@@ -318,12 +346,13 @@
- allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
- 
- # internal communication is often done using fifo and unix sockets.
--allow xm_t self:fifo_file { read write };
-+allow xm_t self:fifo_file  rw_fifo_file_perms;
- allow xm_t self:unix_stream_socket { create_stream_socket_perms connectto };
- allow xm_t self:tcp_socket create_stream_socket_perms;
+@@ -321,6 +352,7 @@
  
  manage_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)
  manage_fifo_files_pattern(xm_t,xend_var_lib_t,xend_var_lib_t)
@@ -32228,7 +32486,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  files_search_var_lib(xm_t)
  
  allow xm_t xen_image_t:dir rw_dir_perms;
-@@ -336,6 +365,7 @@
+@@ -333,6 +365,7 @@
  kernel_write_xen_state(xm_t)
  
  corecmd_exec_bin(xm_t)
@@ -32236,7 +32494,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  corenet_tcp_sendrecv_generic_if(xm_t)
  corenet_tcp_sendrecv_all_nodes(xm_t)
-@@ -351,8 +381,11 @@
+@@ -348,8 +381,11 @@
  
  storage_raw_read_fixed_disk(xm_t)
  
@@ -32248,7 +32506,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  init_rw_script_stream_sockets(xm_t)
  init_use_fds(xm_t)
  
-@@ -363,6 +396,23 @@
+@@ -360,6 +396,23 @@
  
  sysnet_read_config(xm_t)
  
@@ -32272,10 +32530,152 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	unconfined_domain(xend_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.12/policy/support/obj_perm_sets.spt
---- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/support/obj_perm_sets.spt	2008-10-14 15:00:15.000000000 -0400
-@@ -316,3 +316,13 @@
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/policy_capabilities serefpolicy-3.5.13/policy/policy_capabilities
+--- nsaserefpolicy/policy/policy_capabilities	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/policy_capabilities	2008-10-17 10:31:27.000000000 -0400
+@@ -29,4 +29,4 @@
+ # chr_file: open
+ # blk_file: open
+ #
+-policycap open_perms;
++#policycap open_perms;
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.5.13/policy/support/obj_perm_sets.spt
+--- nsaserefpolicy/policy/support/obj_perm_sets.spt	2008-10-16 17:21:16.000000000 -0400
++++ serefpolicy-3.5.13/policy/support/obj_perm_sets.spt	2008-10-17 10:31:27.000000000 -0400
+@@ -59,22 +59,22 @@
+ # 
+ # Permissions for executing files.
+ #
+-define(`x_file_perms', `{ getattr open execute } refpolicywarn(`$0 is deprecated please use { getattr execute } instead.')')
++define(`x_file_perms', `{ getattr execute } refpolicywarn(`$0 is deprecated please use { getattr execute } instead.')')
+ 
+ # 
+ # Permissions for reading files and their attributes.
+ #
+-define(`r_file_perms', `{ open read getattr lock ioctl } refpolicywarn(`$0 is deprecated please use read_file_perms instead.')')
++define(`r_file_perms', `{ read getattr lock ioctl } refpolicywarn(`$0 is deprecated please use read_file_perms instead.')')
+ 
+ # 
+ # Permissions for reading and executing files.
+ #
+-define(`rx_file_perms', `{ open read getattr lock execute ioctl } refpolicywarn(`$0 is deprecated please use { mmap_file_perms ioctl lock } instead.')')
++define(`rx_file_perms', `{ read getattr lock execute ioctl } refpolicywarn(`$0 is deprecated please use { mmap_file_perms ioctl lock } instead.')')
+ 
+ # 
+ # Permissions for reading and appending to files.
+ #
+-define(`ra_file_perms', `{ open ioctl read getattr lock append } refpolicywarn(`$0 is deprecated please use { read_file_perms append_file_perms } instead.')')
++define(`ra_file_perms', `{ ioctl read getattr lock append } refpolicywarn(`$0 is deprecated please use { read_file_perms append_file_perms } instead.')')
+ 
+ #
+ # Permissions for linking, unlinking and renaming files.
+@@ -89,12 +89,17 @@
+ # 
+ # Permissions for reading directories and their attributes.
+ #
+-define(`r_dir_perms', `{ open read getattr lock search ioctl } refpolicywarn(`$0 is deprecated please use list_dir_perms instead.')')
++define(`r_dir_perms', `{ read getattr lock search ioctl } refpolicywarn(`$0 is deprecated please use list_dir_perms instead.')')
++
++# 
++# Permissions for reading and writing directories and their attributes.
++#
++define(`rw_dir_perms', `{ read getattr lock search ioctl add_name remove_name write }')
+ 
+ # 
+ # Permissions for reading and adding names to directories.
+ #
+-define(`ra_dir_perms', `{ open read getattr lock search ioctl add_name write } refpolicywarn(`$0 is deprecated please use { list_dir_perms add_entry_dir_perms } instead.')')
++define(`ra_dir_perms', `{ read getattr lock search ioctl add_name write } refpolicywarn(`$0 is deprecated please use { list_dir_perms add_entry_dir_perms } instead.')')
+ 
+ 
+ #
+@@ -182,10 +187,9 @@
+ define(`getattr_dir_perms',`{ getattr }')
+ define(`setattr_dir_perms',`{ setattr }')
+ define(`search_dir_perms',`{ getattr search }')
+-define(`list_dir_perms',`{ getattr search open read lock ioctl }')
+-define(`add_entry_dir_perms',`{ getattr search open lock ioctl write add_name }')
+-define(`del_entry_dir_perms',`{ getattr search open lock ioctl write remove_name }')
+-define(`rw_dir_perms', `{ open read getattr lock search ioctl add_name remove_name write }')
++define(`list_dir_perms',`{ getattr search read lock ioctl }')
++define(`add_entry_dir_perms',`{ getattr search lock ioctl write add_name }')
++define(`del_entry_dir_perms',`{ getattr search lock ioctl write remove_name }')
+ define(`create_dir_perms',`{ getattr create }')
+ define(`rename_dir_perms',`{ getattr rename }')
+ define(`delete_dir_perms',`{ getattr rmdir }')
+@@ -199,12 +203,12 @@
+ #
+ define(`getattr_file_perms',`{ getattr }')
+ define(`setattr_file_perms',`{ setattr }')
+-define(`read_file_perms',`{ getattr open read lock ioctl }')
+-define(`mmap_file_perms',`{ getattr open read execute ioctl }')
+-define(`exec_file_perms',`{ getattr open read execute execute_no_trans }')
+-define(`append_file_perms',`{ getattr open append lock ioctl }')
+-define(`write_file_perms',`{ getattr open write append lock ioctl }')
+-define(`rw_file_perms',`{ getattr open read write append ioctl lock }')
++define(`read_file_perms',`{ getattr read lock ioctl }')
++define(`mmap_file_perms',`{ getattr read execute ioctl }')
++define(`exec_file_perms',`{ getattr read execute execute_no_trans }')
++define(`append_file_perms',`{ getattr append lock ioctl }')
++define(`write_file_perms',`{ getattr write append lock ioctl }')
++define(`rw_file_perms',`{ getattr read write append ioctl lock }')
+ define(`create_file_perms',`{ getattr create open }')
+ define(`rename_file_perms',`{ getattr rename }')
+ define(`delete_file_perms',`{ getattr unlink }')
+@@ -235,10 +239,10 @@
+ #
+ define(`getattr_fifo_file_perms',`{ getattr }')
+ define(`setattr_fifo_file_perms',`{ setattr }')
+-define(`read_fifo_file_perms',`{ getattr open read lock ioctl }')
+-define(`append_fifo_file_perms',`{ getattr open append lock ioctl }')
+-define(`write_fifo_file_perms',`{ getattr open write append lock ioctl }')
+-define(`rw_fifo_file_perms',`{ getattr open read write append ioctl lock }')
++define(`read_fifo_file_perms',`{ getattr read lock ioctl }')
++define(`append_fifo_file_perms',`{ getattr append lock ioctl }')
++define(`write_fifo_file_perms',`{ getattr write append lock ioctl }')
++define(`rw_fifo_file_perms',`{ getattr read write append ioctl lock }')
+ define(`create_fifo_file_perms',`{ getattr create open }')
+ define(`rename_fifo_file_perms',`{ getattr rename }')
+ define(`delete_fifo_file_perms',`{ getattr unlink }')
+@@ -268,10 +272,10 @@
+ #
+ define(`getattr_blk_file_perms',`{ getattr }')
+ define(`setattr_blk_file_perms',`{ setattr }')
+-define(`read_blk_file_perms',`{ getattr open read lock ioctl }')
+-define(`append_blk_file_perms',`{ getattr open append lock ioctl }')
+-define(`write_blk_file_perms',`{ getattr open write append lock ioctl }')
+-define(`rw_blk_file_perms',`{ getattr open read write append ioctl lock }')
++define(`read_blk_file_perms',`{ getattr read lock ioctl }')
++define(`append_blk_file_perms',`{ getattr append lock ioctl }')
++define(`write_blk_file_perms',`{ getattr write append lock ioctl }')
++define(`rw_blk_file_perms',`{ getattr read write append ioctl lock }')
+ define(`create_blk_file_perms',`{ getattr create }')
+ define(`rename_blk_file_perms',`{ getattr rename }')
+ define(`delete_blk_file_perms',`{ getattr unlink }')
+@@ -285,10 +289,10 @@
+ #
+ define(`getattr_chr_file_perms',`{ getattr }')
+ define(`setattr_chr_file_perms',`{ setattr }')
+-define(`read_chr_file_perms',`{ getattr open read lock ioctl }')
+-define(`append_chr_file_perms',`{ getattr open append lock ioctl }')
+-define(`write_chr_file_perms',`{ getattr open write append lock ioctl }')
+-define(`rw_chr_file_perms',`{ getattr open read write append ioctl lock }')
++define(`read_chr_file_perms',`{ getattr read lock ioctl }')
++define(`append_chr_file_perms',`{ getattr append lock ioctl }')
++define(`write_chr_file_perms',`{ getattr write append lock ioctl }')
++define(`rw_chr_file_perms',`{ getattr read write append ioctl lock }')
+ define(`create_chr_file_perms',`{ getattr create }')
+ define(`rename_chr_file_perms',`{ getattr rename }')
+ define(`delete_chr_file_perms',`{ getattr unlink }')
+@@ -305,10 +309,20 @@
+ #
+ # Use (read and write) terminals
+ #
+-define(`rw_term_perms', `{ getattr open read write ioctl }')
++define(`rw_term_perms', `{ getattr read write ioctl }')
+ 
+ #
+ # Sockets
  #
  define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
  define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }')
@@ -32289,9 +32689,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
 +
 +define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.12/policy/users
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.5.13/policy/users
 --- nsaserefpolicy/policy/users	2008-08-07 11:15:13.000000000 -0400
-+++ serefpolicy-3.5.12/policy/users	2008-10-14 15:00:15.000000000 -0400
++++ serefpolicy-3.5.13/policy/users	2008-10-17 10:31:27.000000000 -0400
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #
@@ -32316,9 +32716,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
 -')
 +gen_user(root, user, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.12/support/Makefile.devel
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.5.13/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2008-08-07 11:15:14.000000000 -0400
-+++ serefpolicy-3.5.12/support/Makefile.devel	2008-10-16 10:33:22.000000000 -0400
++++ serefpolicy-3.5.13/support/Makefile.devel	2008-10-17 10:31:27.000000000 -0400
 @@ -181,7 +181,7 @@
  tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
  	@$(EINFO) "Compiling $(NAME) $(basename $(@F)) module"
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 060595d..a4f62a1 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.16-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.5.12
-Release: 3%{?dist}
+Version: 3.5.13
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -461,6 +461,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Oct 17 2008 Dan Walsh <dwalsh@redhat.com> 3.5.13-1
+- Policy cleanup 
+
 * Thu Oct 16 2008 Dan Walsh <dwalsh@redhat.com> 3.5.12-3
 - Remove Multiple spec
 - Add include
diff --git a/sources b/sources
index 7aebee6..c102fa1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8844e366ff99f65df95d145a5c2c1fe  serefpolicy-3.5.12.tgz
+7220cccf7e77363dbceb48dc3a7fa2ef  serefpolicy-3.5.13.tgz