diff --git a/modules-minimum.conf b/modules-minimum.conf
index fecf674..94c79ba 100644
--- a/modules-minimum.conf
+++ b/modules-minimum.conf
@@ -1576,13 +1576,6 @@ tgtd = module
 # 
 udev = base
 
-# Layer: services
-# Module: udisks
-#
-# Policy for udisk
-# 
-udisks = base
-
 # Layer: system
 # Module: userdomain
 #
diff --git a/modules-mls.conf b/modules-mls.conf
index 4883f2c..9eaf94a 100644
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@ -1386,13 +1386,6 @@ tgtd = module
 # 
 udev = base
 
-# Layer: services
-# Module: udisks
-#
-# Policy for udisk
-# 
-udisks = base
-
 # Layer: system
 # Module: userdomain
 #
diff --git a/modules-targeted.conf b/modules-targeted.conf
index fecf674..94c79ba 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -1576,13 +1576,6 @@ tgtd = module
 # 
 udev = base
 
-# Layer: services
-# Module: udisks
-#
-# Policy for udisk
-# 
-udisks = base
-
 # Layer: system
 # Module: userdomain
 #
diff --git a/nsadiff b/nsadiff
index 9ecc574..b6671df 100755
--- a/nsadiff
+++ b/nsadiff
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.4 > /tmp/diff
+diff --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.4 > /tmp/diff
diff --git a/policy-F13.patch b/policy-F13.patch
index 89081b0..0cdca73 100644
--- a/policy-F13.patch
+++ b/policy-F13.patch
@@ -1,6 +1,6 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.4/Makefile
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.7.4/Makefile
 --- nsaserefpolicy/Makefile	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.7.4/Makefile	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/Makefile	2009-12-17 14:26:48.000000000 -0500
 @@ -244,7 +244,7 @@
  appdir := $(contextpath)
  user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -10,9 +10,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/Mak
  net_contexts := $(builddir)net_contexts
  
  all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.4/policy/global_tunables
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.7.4/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/global_tunables	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/global_tunables	2009-12-17 14:26:48.000000000 -0500
 @@ -61,15 +61,6 @@
  
  ## <desc>
@@ -48,9 +48,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +## </desc>
 +gen_tunable(mmap_low_allowed, false)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.4/policy/modules/admin/alsa.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-3.7.4/policy/modules/admin/alsa.te
 --- nsaserefpolicy/policy/modules/admin/alsa.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/alsa.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/alsa.te	2009-12-17 14:26:48.000000000 -0500
 @@ -51,6 +51,8 @@
  files_read_etc_files(alsa_t)
  files_read_usr_files(alsa_t)
@@ -60,9 +60,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  auth_use_nsswitch(alsa_t)
  
  init_use_fds(alsa_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.4/policy/modules/admin/anaconda.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/anaconda.te serefpolicy-3.7.4/policy/modules/admin/anaconda.te
 --- nsaserefpolicy/policy/modules/admin/anaconda.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/anaconda.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/anaconda.te	2009-12-17 14:26:48.000000000 -0500
 @@ -31,6 +31,7 @@
  modutils_domtrans_insmod(anaconda_t)
  
@@ -80,9 +80,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/admin/brctl.te serefpolicy-3.7.4/policy/modules/admin/brctl.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/brctl.te serefpolicy-3.7.4/policy/modules/admin/brctl.te
 --- nsaserefpolicy/policy/modules/admin/brctl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/brctl.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/brctl.te	2009-12-17 14:26:48.000000000 -0500
 @@ -21,7 +21,7 @@
  allow brctl_t self:unix_dgram_socket create_socket_perms;
  allow brctl_t self:tcp_socket create_socket_perms;
@@ -92,9 +92,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  kernel_read_network_state(brctl_t)
  kernel_read_sysctl(brctl_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.4/policy/modules/admin/certwatch.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/certwatch.te serefpolicy-3.7.4/policy/modules/admin/certwatch.te
 --- nsaserefpolicy/policy/modules/admin/certwatch.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/certwatch.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/certwatch.te	2009-12-17 14:26:48.000000000 -0500
 @@ -36,7 +36,7 @@
  miscfiles_read_localization(certwatch_t)
  
@@ -104,9 +104,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  optional_policy(`
  	apache_exec_modules(certwatch_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.4/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-3.7.4/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/consoletype.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/consoletype.te	2009-12-17 14:26:48.000000000 -0500
 @@ -10,7 +10,6 @@
  type consoletype_exec_t;
  application_executable_file(consoletype_exec_t)
@@ -123,17 +123,17 @@ 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/admin/dmesg.fc serefpolicy-3.7.4/policy/modules/admin/dmesg.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.fc serefpolicy-3.7.4/policy/modules/admin/dmesg.fc
 --- nsaserefpolicy/policy/modules/admin/dmesg.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/dmesg.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/dmesg.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -1,2 +1,4 @@
  
  /bin/dmesg		--		gen_context(system_u:object_r:dmesg_exec_t,s0)
 +
 +/usr/sbin/mcelog	--		gen_context(system_u:object_r:dmesg_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.4/policy/modules/admin/dmesg.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-3.7.4/policy/modules/admin/dmesg.te
 --- nsaserefpolicy/policy/modules/admin/dmesg.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/dmesg.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/dmesg.te	2009-12-17 14:26:48.000000000 -0500
 @@ -9,6 +9,7 @@
  type dmesg_t;
  type dmesg_exec_t;
@@ -175,9 +175,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +#mcelog needs
 +dev_read_raw_memory(dmesg_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.4/policy/modules/admin/firstboot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-3.7.4/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/firstboot.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/firstboot.te	2009-12-17 14:26:48.000000000 -0500
 @@ -91,8 +91,12 @@
  userdom_user_home_dir_filetrans_user_home_content(firstboot_t, { dir file lnk_file fifo_file sock_file })
  
@@ -200,9 +200,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/admin/kismet.te serefpolicy-3.7.4/policy/modules/admin/kismet.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kismet.te serefpolicy-3.7.4/policy/modules/admin/kismet.te
 --- nsaserefpolicy/policy/modules/admin/kismet.te	2009-11-25 15:15:48.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/kismet.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/kismet.te	2009-12-17 14:26:48.000000000 -0500
 @@ -1,5 +1,5 @@
  
 -policy_module(kismet, 1.4.1)
@@ -267,9 +267,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  corecmd_exec_bin(kismet_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.7.4/policy/modules/admin/logrotate.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-3.7.4/policy/modules/admin/logrotate.te
 --- nsaserefpolicy/policy/modules/admin/logrotate.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/logrotate.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/logrotate.te	2009-12-17 14:26:48.000000000 -0500
 @@ -32,7 +32,7 @@
  # Change ownership on log files.
  allow logrotate_t self:capability { chown dac_override dac_read_search kill fsetid fowner sys_resource sys_nice };
@@ -347,9 +347,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	slrnpull_manage_spool(logrotate_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.7.4/policy/modules/admin/logwatch.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-3.7.4/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/logwatch.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/logwatch.te	2009-12-17 14:26:48.000000000 -0500
 @@ -93,6 +93,13 @@
  sysnet_exec_ifconfig(logwatch_t)
  
@@ -370,9 +370,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/mrtg.te serefpolicy-3.7.4/policy/modules/admin/mrtg.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/mrtg.te serefpolicy-3.7.4/policy/modules/admin/mrtg.te
 --- nsaserefpolicy/policy/modules/admin/mrtg.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/mrtg.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/mrtg.te	2009-12-17 14:26:48.000000000 -0500
 @@ -116,6 +116,7 @@
  userdom_use_user_terminals(mrtg_t)
  userdom_dontaudit_read_user_home_content_files(mrtg_t)
@@ -381,9 +381,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  netutils_domtrans_ping(mrtg_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.7.4/policy/modules/admin/netutils.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-3.7.4/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/netutils.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/netutils.te	2009-12-17 14:26:48.000000000 -0500
 @@ -44,6 +44,7 @@
  allow netutils_t self:packet_socket create_socket_perms;
  allow netutils_t self:udp_socket create_socket_perms;
@@ -400,18 +400,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  userdom_use_user_terminals(netutils_t)
  userdom_use_all_users_fds(netutils_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.7.4/policy/modules/admin/ntop.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.fc serefpolicy-3.7.4/policy/modules/admin/ntop.fc
 --- nsaserefpolicy/policy/modules/admin/ntop.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/ntop.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/ntop.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,5 @@
 +/etc/rc\.d/init\.d/ntop	--	gen_context(system_u:object_r:ntop_initrc_exec_t,s0)
 +
 +/usr/sbin/ntop		--	gen_context(system_u:object_r:ntop_exec_t,s0)
 +
 +/var/lib/ntop(/.*)?		gen_context(system_u:object_r:ntop_var_lib_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.7.4/policy/modules/admin/ntop.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.if serefpolicy-3.7.4/policy/modules/admin/ntop.if
 --- nsaserefpolicy/policy/modules/admin/ntop.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/ntop.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/ntop.if	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,158 @@
 +
 +## <summary>policy for ntop</summary>
@@ -571,9 +571,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	ntop_manage_var_lib($1)
 +
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.te serefpolicy-3.7.4/policy/modules/admin/ntop.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ntop.te serefpolicy-3.7.4/policy/modules/admin/ntop.te
 --- nsaserefpolicy/policy/modules/admin/ntop.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/ntop.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/ntop.te	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,40 @@
 +policy_module(ntop,1.0.0)
 +
@@ -615,9 +615,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +miscfiles_read_localization(ntop_t)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.7.4/policy/modules/admin/portage.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/portage.te serefpolicy-3.7.4/policy/modules/admin/portage.te
 --- nsaserefpolicy/policy/modules/admin/portage.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/portage.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/portage.te	2009-12-17 14:26:48.000000000 -0500
 @@ -196,7 +196,7 @@
  # - for rsync and distfile fetching
  #
@@ -627,17 +627,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow portage_fetch_t self:process signal;
  allow portage_fetch_t self:unix_stream_socket create_socket_perms;
  allow portage_fetch_t self:tcp_socket create_stream_socket_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-3.7.4/policy/modules/admin/prelink.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-3.7.4/policy/modules/admin/prelink.fc
 --- nsaserefpolicy/policy/modules/admin/prelink.fc	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/prelink.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/prelink.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -1,3 +1,4 @@
 +/etc/cron\.daily/prelink	--      gen_context(system_u:object_r:prelink_cron_system_exec_t,s0)
  
  /etc/prelink\.cache		--	gen_context(system_u:object_r:prelink_cache_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.7.4/policy/modules/admin/prelink.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.if serefpolicy-3.7.4/policy/modules/admin/prelink.if
 --- nsaserefpolicy/policy/modules/admin/prelink.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/prelink.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/prelink.if	2009-12-17 14:26:48.000000000 -0500
 @@ -21,6 +21,25 @@
  
  ########################################
@@ -678,9 +678,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	relabelfrom_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
 +	relabel_files_pattern($1, prelink_var_lib_t, prelink_var_lib_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.7.4/policy/modules/admin/prelink.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-3.7.4/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/prelink.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/prelink.te	2009-12-17 14:26:48.000000000 -0500
 @@ -21,8 +21,23 @@
  type prelink_tmp_t;
  files_tmp_file(prelink_tmp_t)
@@ -804,9 +804,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	rpm_read_db(prelink_cron_system_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.7.4/policy/modules/admin/readahead.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-3.7.4/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/readahead.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/readahead.te	2009-12-17 14:26:48.000000000 -0500
 @@ -52,6 +52,7 @@
  
  files_list_non_security(readahead_t)
@@ -815,9 +815,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  files_create_boot_flag(readahead_t)
  files_getattr_all_pipes(readahead_t)
  files_dontaudit_getattr_all_sockets(readahead_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.7.4/policy/modules/admin/rpm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-3.7.4/policy/modules/admin/rpm.fc
 --- nsaserefpolicy/policy/modules/admin/rpm.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/rpm.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/rpm.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -1,18 +1,19 @@
  
  /bin/rpm 			--	gen_context(system_u:object_r:rpm_exec_t,s0)
@@ -868,9 +868,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # SuSE
  ifdef(`distro_suse', `
  /usr/bin/online_update		--	gen_context(system_u:object_r:rpm_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.7.4/policy/modules/admin/rpm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-3.7.4/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/rpm.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/rpm.if	2009-12-17 14:26:48.000000000 -0500
 @@ -13,11 +13,34 @@
  interface(`rpm_domtrans',`
  	gen_require(`
@@ -1281,9 +1281,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.7.4/policy/modules/admin/rpm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-3.7.4/policy/modules/admin/rpm.te
 --- nsaserefpolicy/policy/modules/admin/rpm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/rpm.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/rpm.te	2009-12-17 14:26:48.000000000 -0500
 @@ -15,6 +15,9 @@
  domain_interactive_fd(rpm_t)
  role system_r types rpm_t;
@@ -1558,9 +1558,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	optional_policy(`
  		java_domtrans_unconfined(rpm_script_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/shorewall.fc serefpolicy-3.7.4/policy/modules/admin/shorewall.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/shorewall.fc serefpolicy-3.7.4/policy/modules/admin/shorewall.fc
 --- nsaserefpolicy/policy/modules/admin/shorewall.fc	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/shorewall.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/shorewall.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -4,8 +4,11 @@
  /etc/shorewall(/.*)?				gen_context(system_u:object_r:shorewall_etc_t,s0)
  /etc/shorewall-lite(/.*)?			gen_context(system_u:object_r:shorewall_etc_t,s0)
@@ -1574,9 +1574,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/lib/shorewall-lite(/.*)?			gen_context(system_u:object_r:shorewall_var_lib_t,s0)
 +
 +/var/log/shorewall.*				gen_context(system_u:object_r:shorewall_log_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/shorewall.if serefpolicy-3.7.4/policy/modules/admin/shorewall.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/shorewall.if serefpolicy-3.7.4/policy/modules/admin/shorewall.if
 --- nsaserefpolicy/policy/modules/admin/shorewall.if	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/shorewall.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/shorewall.if	2009-12-17 14:26:48.000000000 -0500
 @@ -75,6 +75,46 @@
  	rw_files_pattern($1, shorewall_var_run_t, shorewall_var_run_t)
  ')
@@ -1624,9 +1624,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  #######################################
  ## <summary>
  ##	All of the rules required to administrate 
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/shorewall.te serefpolicy-3.7.4/policy/modules/admin/shorewall.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/shorewall.te serefpolicy-3.7.4/policy/modules/admin/shorewall.te
 --- nsaserefpolicy/policy/modules/admin/shorewall.te	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/shorewall.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/shorewall.te	2009-12-17 14:26:48.000000000 -0500
 @@ -29,6 +29,9 @@
  type shorewall_var_lib_t;
  files_type(shorewall_var_lib_t)
@@ -1657,22 +1657,22 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
  	iptables_domtrans(shorewall_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/smoltclient.fc serefpolicy-3.7.4/policy/modules/admin/smoltclient.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/smoltclient.fc serefpolicy-3.7.4/policy/modules/admin/smoltclient.fc
 --- nsaserefpolicy/policy/modules/admin/smoltclient.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/smoltclient.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/smoltclient.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,4 @@
 +
 +/usr/share/smolt/client/sendProfile.py	--	gen_context(system_u:object_r:smoltclient_exec_t,s0)	
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/smoltclient.if serefpolicy-3.7.4/policy/modules/admin/smoltclient.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/smoltclient.if serefpolicy-3.7.4/policy/modules/admin/smoltclient.if
 --- nsaserefpolicy/policy/modules/admin/smoltclient.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/smoltclient.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/smoltclient.if	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1 @@
 +## <summary>The Fedora hardware profiler client</summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/smoltclient.te serefpolicy-3.7.4/policy/modules/admin/smoltclient.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/smoltclient.te serefpolicy-3.7.4/policy/modules/admin/smoltclient.te
 --- nsaserefpolicy/policy/modules/admin/smoltclient.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/smoltclient.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/smoltclient.te	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,66 @@
 +policy_module(smoltclient,1.0.0)
 +
@@ -1740,9 +1740,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +permissive smoltclient_t;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.7.4/policy/modules/admin/sudo.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-3.7.4/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/sudo.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/sudo.if	2009-12-17 14:26:48.000000000 -0500
 @@ -66,8 +66,8 @@
  	allow $1_sudo_t self:unix_stream_socket create_stream_socket_perms;
  	allow $1_sudo_t self:unix_dgram_socket sendto;
@@ -1787,9 +1787,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/tmpreaper.te serefpolicy-3.7.4/policy/modules/admin/tmpreaper.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-3.7.4/policy/modules/admin/tmpreaper.te
 --- nsaserefpolicy/policy/modules/admin/tmpreaper.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/tmpreaper.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/tmpreaper.te	2009-12-17 14:26:48.000000000 -0500
 @@ -42,6 +42,7 @@
  cron_system_entry(tmpreaper_t, tmpreaper_exec_t)
  
@@ -1821,9 +1821,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.if serefpolicy-3.7.4/policy/modules/admin/usermanage.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.if serefpolicy-3.7.4/policy/modules/admin/usermanage.if
 --- nsaserefpolicy/policy/modules/admin/usermanage.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/usermanage.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/usermanage.if	2009-12-17 14:26:48.000000000 -0500
 @@ -113,6 +113,12 @@
  	files_search_usr($1)
  	corecmd_search_bin($1)
@@ -1849,9 +1849,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	optional_policy(`
  		nscd_run(useradd_t, $2)
  	')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.7.4/policy/modules/admin/usermanage.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-3.7.4/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/usermanage.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/usermanage.te	2009-12-17 14:26:48.000000000 -0500
 @@ -82,6 +82,7 @@
  selinux_compute_relabel_context(chfn_t)
  selinux_compute_user_contexts(chfn_t)
@@ -1981,9 +1981,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	puppet_rw_tmp(useradd_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.7.4/policy/modules/admin/vbetool.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-3.7.4/policy/modules/admin/vbetool.te
 --- nsaserefpolicy/policy/modules/admin/vbetool.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/admin/vbetool.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/vbetool.te	2009-12-17 14:26:48.000000000 -0500
 @@ -15,15 +15,20 @@
  # Local policy
  #
@@ -2016,9 +2016,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.te serefpolicy-3.7.4/policy/modules/admin/vpn.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-3.7.4/policy/modules/admin/vpn.te
 --- nsaserefpolicy/policy/modules/admin/vpn.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/admin/vpn.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/admin/vpn.te	2009-12-17 14:26:48.000000000 -0500
 @@ -46,6 +46,7 @@
  kernel_read_system_state(vpnc_t)
  kernel_read_network_state(vpnc_t)
@@ -2038,15 +2038,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  optional_policy(`
  	dbus_system_bus_client(vpnc_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.fc serefpolicy-3.7.4/policy/modules/apps/chrome.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.fc serefpolicy-3.7.4/policy/modules/apps/chrome.fc
 --- nsaserefpolicy/policy/modules/apps/chrome.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/chrome.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/chrome.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,2 @@
 +
 +/usr/lib(64)?/chromium-browser/chrome-sandbox	--	gen_context(system_u:object_r:chrome_sandbox_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.if serefpolicy-3.7.4/policy/modules/apps/chrome.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.if serefpolicy-3.7.4/policy/modules/apps/chrome.if
 --- nsaserefpolicy/policy/modules/apps/chrome.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/chrome.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/chrome.if	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,86 @@
 +
 +## <summary>policy for chrome</summary>
@@ -2134,9 +2134,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow $2 chrome_sandbox_tmpfs_t:file rw_file_perms;
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.te serefpolicy-3.7.4/policy/modules/apps/chrome.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/chrome.te serefpolicy-3.7.4/policy/modules/apps/chrome.te
 --- nsaserefpolicy/policy/modules/apps/chrome.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/chrome.te	2009-12-15 15:31:25.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/chrome.te	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,79 @@
 +policy_module(chrome,1.0.0)
 +
@@ -2217,9 +2217,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	fs_dontaudit_read_cifs_files(chrome_sandbox_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.te serefpolicy-3.7.4/policy/modules/apps/cpufreqselector.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/cpufreqselector.te serefpolicy-3.7.4/policy/modules/apps/cpufreqselector.te
 --- nsaserefpolicy/policy/modules/apps/cpufreqselector.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/cpufreqselector.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/cpufreqselector.te	2009-12-17 14:26:48.000000000 -0500
 @@ -26,7 +26,7 @@
  dev_rw_sysfs(cpufreqselector_t)
  
@@ -2229,9 +2229,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  optional_policy(`
  	dbus_system_domain(cpufreqselector_t, cpufreqselector_exec_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.fc serefpolicy-3.7.4/policy/modules/apps/execmem.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.fc serefpolicy-3.7.4/policy/modules/apps/execmem.fc
 --- nsaserefpolicy/policy/modules/apps/execmem.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/execmem.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/execmem.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,42 @@
 +/usr/bin/aticonfig	--	gen_context(system_u:object_r:execmem_exec_t,s0)
 +/usr/bin/darcs 		--	gen_context(system_u:object_r:execmem_exec_t,s0)
@@ -2275,9 +2275,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +/opt/google/chrome/chrome -- gen_context(system_u:object_r:execmem_exec_t,s0)
 +/opt/Komodo-Edit-5/lib/mozilla/komodo-bin -- gen_context(system_u:object_r:execmem_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.if serefpolicy-3.7.4/policy/modules/apps/execmem.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.if serefpolicy-3.7.4/policy/modules/apps/execmem.if
 --- nsaserefpolicy/policy/modules/apps/execmem.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/execmem.if	2009-12-15 15:25:03.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/execmem.if	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,104 @@
 +## <summary>execmem domain</summary>
 +
@@ -2383,9 +2383,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	domtrans_pattern($1, execmem_exec_t, $2)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.te serefpolicy-3.7.4/policy/modules/apps/execmem.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/execmem.te serefpolicy-3.7.4/policy/modules/apps/execmem.te
 --- nsaserefpolicy/policy/modules/apps/execmem.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/execmem.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/execmem.te	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,11 @@
 +
 +policy_module(execmem, 1.0.0)
@@ -2398,16 +2398,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +type execmem_exec_t alias unconfined_execmem_exec_t;
 +application_executable_file(execmem_exec_t)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.fc serefpolicy-3.7.4/policy/modules/apps/firewallgui.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.fc serefpolicy-3.7.4/policy/modules/apps/firewallgui.fc
 --- nsaserefpolicy/policy/modules/apps/firewallgui.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/firewallgui.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/firewallgui.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,3 @@
 +
 +/usr/share/system-config-firewall/system-config-firewall-mechanism.py	--	gen_context(system_u:object_r:firewallgui_exec_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.if serefpolicy-3.7.4/policy/modules/apps/firewallgui.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.if serefpolicy-3.7.4/policy/modules/apps/firewallgui.if
 --- nsaserefpolicy/policy/modules/apps/firewallgui.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/firewallgui.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/firewallgui.if	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,23 @@
 +
 +## <summary>policy for firewallgui</summary>
@@ -2432,9 +2432,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow $1 firewallgui_t:dbus send_msg;
 +	allow firewallgui_t $1:dbus send_msg;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.te serefpolicy-3.7.4/policy/modules/apps/firewallgui.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/firewallgui.te serefpolicy-3.7.4/policy/modules/apps/firewallgui.te
 --- nsaserefpolicy/policy/modules/apps/firewallgui.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/firewallgui.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/firewallgui.te	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,64 @@
 +
 +policy_module(firewallgui,1.0.0)
@@ -2500,9 +2500,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +        policykit_dbus_chat(firewallgui_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gitosis.if serefpolicy-3.7.4/policy/modules/apps/gitosis.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gitosis.if serefpolicy-3.7.4/policy/modules/apps/gitosis.if
 --- nsaserefpolicy/policy/modules/apps/gitosis.if	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/gitosis.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/gitosis.if	2009-12-17 14:26:48.000000000 -0500
 @@ -43,3 +43,48 @@
  	role $2 types gitosis_t;
  ')
@@ -2552,9 +2552,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +        manage_lnk_files_pattern($1, gitosis_var_lib_t, gitosis_var_lib_t)
 +	manage_dirs_pattern($1, gitosis_var_lib_t, gitosis_var_lib_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.7.4/policy/modules/apps/gnome.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-3.7.4/policy/modules/apps/gnome.fc
 --- nsaserefpolicy/policy/modules/apps/gnome.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/gnome.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/gnome.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -1,8 +1,17 @@
 -HOME_DIR/\.config/gtk-.*	gen_context(system_u:object_r:gnome_home_t,s0)
 +HOME_DIR/\.cache(/.*)?		gen_context(system_u:object_r:cache_home_t,s0)
@@ -2575,9 +2575,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/libexec/gconf-defaults-mechanism	    	--      gen_context(system_u:object_r:gconfdefaultsm_exec_t,s0)
 +
 +/usr/libexec/gnome-system-monitor-mechanism 	--      gen_context(system_u:object_r:gnomesystemmm_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.7.4/policy/modules/apps/gnome.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-3.7.4/policy/modules/apps/gnome.if
 --- nsaserefpolicy/policy/modules/apps/gnome.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/gnome.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/gnome.if	2009-12-17 14:26:48.000000000 -0500
 @@ -84,10 +84,183 @@
  #
  interface(`gnome_manage_config',`
@@ -2765,9 +2765,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_type, gnome_home_type, $2)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.7.4/policy/modules/apps/gnome.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-3.7.4/policy/modules/apps/gnome.te
 --- nsaserefpolicy/policy/modules/apps/gnome.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/gnome.te	2009-12-16 16:57:25.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/gnome.te	2009-12-17 14:26:48.000000000 -0500
 @@ -7,18 +7,30 @@
  #
  
@@ -2913,9 +2913,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +        policykit_read_lib(gnomesystemmm_t)
 +        policykit_read_reload(gnomesystemmm_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.7.4/policy/modules/apps/gpg.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.te serefpolicy-3.7.4/policy/modules/apps/gpg.te
 --- nsaserefpolicy/policy/modules/apps/gpg.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/gpg.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/gpg.te	2009-12-17 14:26:48.000000000 -0500
 @@ -271,5 +271,6 @@
  ')
  
@@ -2924,9 +2924,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	xserver_common_app(gpg_pinentry_t)
  ')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.7.4/policy/modules/apps/java.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-3.7.4/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/java.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/java.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -2,15 +2,17 @@
  # /opt
  #
@@ -2967,9 +2967,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/opt/ibm/lotus/Symphony/framework/rcp/eclipse/plugins(/.*)?	--	gen_context(system_u:object_r:java_exec_t,s0)
 +
 +/usr/java/eclipse[^/]*/eclipse	--	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.7.4/policy/modules/apps/java.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-3.7.4/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/java.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/java.if	2009-12-17 14:26:48.000000000 -0500
 @@ -30,6 +30,7 @@
  
  	allow java_t $2:unix_stream_socket connectto;
@@ -3113,9 +3113,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +		xserver_role($1_r, $1_java_t)
 +	')
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.7.4/policy/modules/apps/java.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-3.7.4/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/java.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/java.te	2009-12-17 14:26:48.000000000 -0500
 @@ -20,6 +20,8 @@
  typealias java_t alias { staff_javaplugin_t user_javaplugin_t sysadm_javaplugin_t };
  typealias java_t alias { auditadm_javaplugin_t secadm_javaplugin_t };
@@ -3165,21 +3165,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	unconfined_domain_noaudit(unconfined_java_t)
 -	unconfined_dbus_chat(unconfined_java_t)
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.fc serefpolicy-3.7.4/policy/modules/apps/kdumpgui.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.fc serefpolicy-3.7.4/policy/modules/apps/kdumpgui.fc
 --- nsaserefpolicy/policy/modules/apps/kdumpgui.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/kdumpgui.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/kdumpgui.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,2 @@
 +
 +/usr/share/system-config-kdump/system-config-kdump-backend.py -- gen_context(system_u:object_r:kdumpgui_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.if serefpolicy-3.7.4/policy/modules/apps/kdumpgui.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.if serefpolicy-3.7.4/policy/modules/apps/kdumpgui.if
 --- nsaserefpolicy/policy/modules/apps/kdumpgui.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/kdumpgui.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/kdumpgui.if	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,2 @@
 +## <summary>system-config-kdump policy</summary>
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.te serefpolicy-3.7.4/policy/modules/apps/kdumpgui.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/kdumpgui.te serefpolicy-3.7.4/policy/modules/apps/kdumpgui.te
 --- nsaserefpolicy/policy/modules/apps/kdumpgui.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/kdumpgui.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/kdumpgui.te	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,67 @@
 +policy_module(kdumpgui,1.0.0)
 +
@@ -3248,15 +3248,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +permissive kdumpgui_t;
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.7.4/policy/modules/apps/livecd.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.fc serefpolicy-3.7.4/policy/modules/apps/livecd.fc
 --- nsaserefpolicy/policy/modules/apps/livecd.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/livecd.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/livecd.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -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.7.4/policy/modules/apps/livecd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.if serefpolicy-3.7.4/policy/modules/apps/livecd.if
 --- nsaserefpolicy/policy/modules/apps/livecd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/livecd.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/livecd.if	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,52 @@
 +
 +## <summary>policy for livecd</summary>
@@ -3310,9 +3310,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	usermanage_run_chfn(livecd_t, $2)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.te serefpolicy-3.7.4/policy/modules/apps/livecd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/livecd.te serefpolicy-3.7.4/policy/modules/apps/livecd.te
 --- nsaserefpolicy/policy/modules/apps/livecd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/livecd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/livecd.te	2009-12-17 14:26:48.000000000 -0500
 @@ -0,0 +1,27 @@
 +policy_module(livecd, 1.0.0)
 +
@@ -3341,9 +3341,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.7.4/policy/modules/apps/loadkeys.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-3.7.4/policy/modules/apps/loadkeys.te
 --- nsaserefpolicy/policy/modules/apps/loadkeys.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/loadkeys.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/loadkeys.te	2009-12-17 14:26:48.000000000 -0500
 @@ -40,8 +40,12 @@
  miscfiles_read_localization(loadkeys_t)
  
@@ -3358,15 +3358,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +ifdef(`hide_broken_symptoms',`
 +	dev_dontaudit_rw_lvm_control(loadkeys_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.fc serefpolicy-3.7.4/policy/modules/apps/mono.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.fc serefpolicy-3.7.4/policy/modules/apps/mono.fc
 --- nsaserefpolicy/policy/modules/apps/mono.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/mono.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/mono.fc	2009-12-17 14:26:48.000000000 -0500
 @@ -1 +1 @@
 -/usr/bin/mono	--	gen_context(system_u:object_r:mono_exec_t,s0)
 +/usr/bin/mono.*	--	gen_context(system_u:object_r:mono_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.7.4/policy/modules/apps/mono.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-3.7.4/policy/modules/apps/mono.if
 --- nsaserefpolicy/policy/modules/apps/mono.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/mono.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/mono.if	2009-12-17 14:26:48.000000000 -0500
 @@ -21,6 +21,105 @@
  
  ########################################
@@ -3482,9 +3482,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.7.4/policy/modules/apps/mono.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-3.7.4/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/mono.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/mono.te	2009-12-17 14:26:49.000000000 -0500
 @@ -15,7 +15,7 @@
  # Local policy
  #
@@ -3508,9 +3508,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	xserver_rw_shm(mono_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.fc serefpolicy-3.7.4/policy/modules/apps/mozilla.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.fc serefpolicy-3.7.4/policy/modules/apps/mozilla.fc
 --- nsaserefpolicy/policy/modules/apps/mozilla.fc	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/mozilla.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/mozilla.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,6 +1,7 @@
  HOME_DIR/\.galeon(/.*)?			gen_context(system_u:object_r:mozilla_home_t,s0)
  HOME_DIR/\.java(/.*)?			gen_context(system_u:object_r:mozilla_home_t,s0)
@@ -3519,9 +3519,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  HOME_DIR/\.netscape(/.*)?		gen_context(system_u:object_r:mozilla_home_t,s0)
  HOME_DIR/\.phoenix(/.*)?		gen_context(system_u:object_r:mozilla_home_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.7.4/policy/modules/apps/mozilla.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-3.7.4/policy/modules/apps/mozilla.if
 --- nsaserefpolicy/policy/modules/apps/mozilla.if	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/mozilla.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/mozilla.if	2009-12-17 14:26:49.000000000 -0500
 @@ -48,6 +48,12 @@
  
  	mozilla_dbus_chat($2)
@@ -3567,9 +3567,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow $1 mozilla_home_t:file execmod;
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.7.4/policy/modules/apps/mozilla.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.te serefpolicy-3.7.4/policy/modules/apps/mozilla.te
 --- nsaserefpolicy/policy/modules/apps/mozilla.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/mozilla.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/mozilla.te	2009-12-17 14:26:49.000000000 -0500
 @@ -91,6 +91,7 @@
  corenet_raw_sendrecv_generic_node(mozilla_t)
  corenet_tcp_sendrecv_http_port(mozilla_t)
@@ -3628,9 +3628,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
  	thunderbird_domtrans(mozilla_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.fc serefpolicy-3.7.4/policy/modules/apps/nsplugin.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.fc serefpolicy-3.7.4/policy/modules/apps/nsplugin.fc
 --- nsaserefpolicy/policy/modules/apps/nsplugin.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/nsplugin.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/nsplugin.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,11 @@
 +HOME_DIR/\.adobe(/.*)?			gen_context(system_u:object_r:nsplugin_home_t,s0)
 +HOME_DIR/\.macromedia(/.*)?		gen_context(system_u:object_r:nsplugin_home_t,s0)
@@ -3643,9 +3643,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/lib(64)?/nspluginwrapper/npviewer.bin	--	gen_context(system_u:object_r:nsplugin_exec_t,s0)
 +/usr/lib(64)?/nspluginwrapper/plugin-config	--	gen_context(system_u:object_r:nsplugin_config_exec_t,s0)
 +/usr/lib(64)?/mozilla/plugins-wrapped(/.*)?			gen_context(system_u:object_r:nsplugin_rw_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.7.4/policy/modules/apps/nsplugin.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.if serefpolicy-3.7.4/policy/modules/apps/nsplugin.if
 --- nsaserefpolicy/policy/modules/apps/nsplugin.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/nsplugin.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/nsplugin.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,323 @@
 +
 +## <summary>policy for nsplugin</summary>
@@ -3970,9 +3970,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	allow $1 nsplugin_home_t:fifo_file rw_fifo_file_perms; 
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.7.4/policy/modules/apps/nsplugin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/nsplugin.te serefpolicy-3.7.4/policy/modules/apps/nsplugin.te
 --- nsaserefpolicy/policy/modules/apps/nsplugin.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/nsplugin.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/nsplugin.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,296 @@
 +
 +policy_module(nsplugin, 1.0.0)
@@ -4270,16 +4270,16 @@ 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/openoffice.fc serefpolicy-3.7.4/policy/modules/apps/openoffice.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.fc serefpolicy-3.7.4/policy/modules/apps/openoffice.fc
 --- nsaserefpolicy/policy/modules/apps/openoffice.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/openoffice.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/openoffice.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -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.7.4/policy/modules/apps/openoffice.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.if serefpolicy-3.7.4/policy/modules/apps/openoffice.if
 --- nsaserefpolicy/policy/modules/apps/openoffice.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/openoffice.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/openoffice.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,93 @@
 +## <summary>Openoffice</summary>
 +
@@ -4374,9 +4374,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +		xserver_common_x_domain_template($1, $1_openoffice_t)
 +	')
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.te serefpolicy-3.7.4/policy/modules/apps/openoffice.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/openoffice.te serefpolicy-3.7.4/policy/modules/apps/openoffice.te
 --- nsaserefpolicy/policy/modules/apps/openoffice.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/openoffice.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/openoffice.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,11 @@
 +
 +policy_module(openoffice, 1.0.0)
@@ -4389,9 +4389,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +type openoffice_t;
 +type openoffice_exec_t;
 +application_domain(openoffice_t, openoffice_exec_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.7.4/policy/modules/apps/podsleuth.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/podsleuth.te serefpolicy-3.7.4/policy/modules/apps/podsleuth.te
 --- nsaserefpolicy/policy/modules/apps/podsleuth.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/podsleuth.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/podsleuth.te	2009-12-17 14:26:49.000000000 -0500
 @@ -50,6 +50,7 @@
  fs_tmpfs_filetrans(podsleuth_t, podsleuth_tmpfs_t, { dir file lnk_file })
  
@@ -4408,9 +4408,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  miscfiles_read_localization(podsleuth_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.if serefpolicy-3.7.4/policy/modules/apps/ptchown.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ptchown.if serefpolicy-3.7.4/policy/modules/apps/ptchown.if
 --- nsaserefpolicy/policy/modules/apps/ptchown.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/ptchown.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/ptchown.if	2009-12-17 14:26:49.000000000 -0500
 @@ -18,3 +18,27 @@
  	domtrans_pattern($1, ptchown_exec_t, ptchown_t)
  ')
@@ -4439,17 +4439,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	ptchown_domtrans($1)
 +	role $2 types ptchown_t;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.fc serefpolicy-3.7.4/policy/modules/apps/pulseaudio.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.fc serefpolicy-3.7.4/policy/modules/apps/pulseaudio.fc
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.fc	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/pulseaudio.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/pulseaudio.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1 +1,4 @@
  /usr/bin/pulseaudio	--	gen_context(system_u:object_r:pulseaudio_exec_t,s0)
 +
 +HOME_DIR/\.pulse(/.*)?		gen_context(system_u:object_r:pulseaudio_home_t,s0)
 +HOME_DIR/\.pulse-cookie		gen_context(system_u:object_r:pulseaudio_home_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.if serefpolicy-3.7.4/policy/modules/apps/pulseaudio.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.if serefpolicy-3.7.4/policy/modules/apps/pulseaudio.if
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/pulseaudio.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/pulseaudio.if	2009-12-17 14:26:49.000000000 -0500
 @@ -40,7 +40,7 @@
  	userdom_manage_tmpfs_role($1, pulseaudio_t)
  
@@ -4503,9 +4503,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	manage_files_pattern($1, pulseaudio_home_t, pulseaudio_home_t)
 +	manage_lnk_files_pattern($1, pulseaudio_home_t, pulseaudio_home_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.7.4/policy/modules/apps/pulseaudio.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/pulseaudio.te serefpolicy-3.7.4/policy/modules/apps/pulseaudio.te
 --- nsaserefpolicy/policy/modules/apps/pulseaudio.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/pulseaudio.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/pulseaudio.te	2009-12-17 14:26:49.000000000 -0500
 @@ -11,6 +11,9 @@
  application_domain(pulseaudio_t, pulseaudio_exec_t)
  role system_r types pulseaudio_t;
@@ -4569,17 +4569,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	xserver_read_xdm_lib_files(pulseaudio_t)
 +	xserver_common_app(pulseaudio_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.7.4/policy/modules/apps/qemu.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.fc serefpolicy-3.7.4/policy/modules/apps/qemu.fc
 --- nsaserefpolicy/policy/modules/apps/qemu.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/qemu.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/qemu.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,2 +1,2 @@
 -/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)
 +/usr/bin/qemu.*	--	gen_context(system_u:object_r:qemu_exec_t,s0)
 +/usr/libexec/qemu.*	--	gen_context(system_u:object_r:qemu_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.if serefpolicy-3.7.4/policy/modules/apps/qemu.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.if serefpolicy-3.7.4/policy/modules/apps/qemu.if
 --- nsaserefpolicy/policy/modules/apps/qemu.if	2009-08-31 13:44:40.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/qemu.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/qemu.if	2009-12-17 14:26:49.000000000 -0500
 @@ -40,6 +40,10 @@
  
  	qemu_domtrans($1)
@@ -4780,9 +4780,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	manage_files_pattern($1, qemu_tmp_t, qemu_tmp_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.7.4/policy/modules/apps/qemu.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/qemu.te serefpolicy-3.7.4/policy/modules/apps/qemu.te
 --- nsaserefpolicy/policy/modules/apps/qemu.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/qemu.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/qemu.te	2009-12-17 14:26:49.000000000 -0500
 @@ -13,15 +13,46 @@
  ## </desc>
  gen_tunable(qemu_full_network, false)
@@ -4891,20 +4891,20 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	allow qemu_unconfined_t self:process { execstack execmem };
 +	allow qemu_unconfined_t qemu_exec_t:file execmod;
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.fc serefpolicy-3.7.4/policy/modules/apps/sambagui.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.fc serefpolicy-3.7.4/policy/modules/apps/sambagui.fc
 --- nsaserefpolicy/policy/modules/apps/sambagui.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/sambagui.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/sambagui.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1 @@
 +/usr/share/system-config-samba/system-config-samba-mechanism.py -- gen_context(system_u:object_r:sambagui_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.if serefpolicy-3.7.4/policy/modules/apps/sambagui.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.if serefpolicy-3.7.4/policy/modules/apps/sambagui.if
 --- nsaserefpolicy/policy/modules/apps/sambagui.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/sambagui.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/sambagui.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,2 @@
 +## <summary>system-config-samba policy</summary>
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.te serefpolicy-3.7.4/policy/modules/apps/sambagui.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sambagui.te serefpolicy-3.7.4/policy/modules/apps/sambagui.te
 --- nsaserefpolicy/policy/modules/apps/sambagui.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/sambagui.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/sambagui.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,60 @@
 +policy_module(sambagui,1.0.0)
 +
@@ -4966,14 +4966,14 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	policykit_dbus_chat(sambagui_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.fc serefpolicy-3.7.4/policy/modules/apps/sandbox.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.fc serefpolicy-3.7.4/policy/modules/apps/sandbox.fc
 --- nsaserefpolicy/policy/modules/apps/sandbox.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/sandbox.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/sandbox.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1 @@
 +# No types are sandbox_exec_t
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.if serefpolicy-3.7.4/policy/modules/apps/sandbox.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.if serefpolicy-3.7.4/policy/modules/apps/sandbox.if
 --- nsaserefpolicy/policy/modules/apps/sandbox.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/sandbox.if	2009-12-16 16:50:01.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/sandbox.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,190 @@
 +
 +## <summary>policy for sandbox</summary>
@@ -5165,10 +5165,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	allow $1 sandbox_xserver_tmpfs_t:file rw_file_perms;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.7.4/policy/modules/apps/sandbox.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sandbox.te serefpolicy-3.7.4/policy/modules/apps/sandbox.te
 --- nsaserefpolicy/policy/modules/apps/sandbox.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/sandbox.te	2009-12-16 17:45:36.000000000 -0500
-@@ -0,0 +1,336 @@
++++ serefpolicy-3.7.4/policy/modules/apps/sandbox.te	2009-12-17 14:26:49.000000000 -0500
+@@ -0,0 +1,335 @@
 +policy_module(sandbox,1.0.0)
 +dbus_stub()
 +attribute sandbox_domain;
@@ -5251,7 +5251,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +logging_send_syslog_msg(sandbox_xserver_t)
 +logging_send_audit_msgs(sandbox_xserver_t)
 +
-+userdom_read_user_home_content_symlinks(sandbox_xserver_t)
 +userdom_use_user_terminals(sandbox_xserver_t)
 +
 +xserver_entry_type(sandbox_xserver_t)
@@ -5505,9 +5504,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	hal_dbus_chat(sandbox_net_client_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.7.4/policy/modules/apps/screen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/screen.if serefpolicy-3.7.4/policy/modules/apps/screen.if
 --- nsaserefpolicy/policy/modules/apps/screen.if	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/screen.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/screen.if	2009-12-17 14:26:49.000000000 -0500
 @@ -141,6 +141,7 @@
  	userdom_create_user_pty($1_screen_t)
  	userdom_user_home_domtrans($1_screen_t, $3)
@@ -5516,9 +5515,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  	tunable_policy(`use_samba_home_dirs',`
  		fs_cifs_domtrans($1_screen_t, $3)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sectoolm.fc serefpolicy-3.7.4/policy/modules/apps/sectoolm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sectoolm.fc serefpolicy-3.7.4/policy/modules/apps/sectoolm.fc
 --- nsaserefpolicy/policy/modules/apps/sectoolm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/sectoolm.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/sectoolm.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,6 @@
 +
 +/usr/libexec/sectool-mechanism\.py	--	gen_context(system_u:object_r:sectoolm_exec_t,s0)
@@ -5526,16 +5525,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/lib/sectool(/.*)?				gen_context(system_u:object_r:sectool_var_lib_t,s0)
 +
 +/var/log/sectool\.log			--	gen_context(system_u:object_r:sectool_var_log_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sectoolm.if serefpolicy-3.7.4/policy/modules/apps/sectoolm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sectoolm.if serefpolicy-3.7.4/policy/modules/apps/sectoolm.if
 --- nsaserefpolicy/policy/modules/apps/sectoolm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/sectoolm.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/sectoolm.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,3 @@
 +
 +## <summary>policy for sectool-mechanism</summary>
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sectoolm.te serefpolicy-3.7.4/policy/modules/apps/sectoolm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/sectoolm.te serefpolicy-3.7.4/policy/modules/apps/sectoolm.te
 --- nsaserefpolicy/policy/modules/apps/sectoolm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/sectoolm.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/sectoolm.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,120 @@
 +
 +policy_module(sectoolm,1.0.0)
@@ -5657,9 +5656,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/seunshare.if serefpolicy-3.7.4/policy/modules/apps/seunshare.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.if serefpolicy-3.7.4/policy/modules/apps/seunshare.if
 --- nsaserefpolicy/policy/modules/apps/seunshare.if	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/seunshare.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/seunshare.if	2009-12-17 14:26:49.000000000 -0500
 @@ -44,6 +44,8 @@
  
  	allow $1 seunshare_t:process signal_perms;
@@ -5669,9 +5668,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	ifdef(`hide_broken_symptoms', `
  		dontaudit seunshare_t $1:tcp_socket rw_socket_perms;
  		dontaudit seunshare_t $1:udp_socket rw_socket_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.te serefpolicy-3.7.4/policy/modules/apps/seunshare.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/seunshare.te serefpolicy-3.7.4/policy/modules/apps/seunshare.te
 --- nsaserefpolicy/policy/modules/apps/seunshare.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/seunshare.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/seunshare.te	2009-12-17 14:26:49.000000000 -0500
 @@ -15,9 +15,8 @@
  #
  # seunshare local policy
@@ -5683,9 +5682,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  allow seunshare_t self:fifo_file rw_file_perms;
  allow seunshare_t self:unix_stream_socket create_stream_socket_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-3.7.4/policy/modules/apps/slocate.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-3.7.4/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/slocate.te	2009-12-15 14:59:12.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/slocate.te	2009-12-17 14:26:49.000000000 -0500
 @@ -50,6 +50,7 @@
  fs_getattr_all_symlinks(locate_t)
  fs_list_all(locate_t)
@@ -5694,9 +5693,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  # getpwnam
  auth_use_nsswitch(locate_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.7.4/policy/modules/apps/vmware.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.te serefpolicy-3.7.4/policy/modules/apps/vmware.te
 --- nsaserefpolicy/policy/modules/apps/vmware.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/apps/vmware.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/vmware.te	2009-12-17 14:26:49.000000000 -0500
 @@ -157,6 +157,7 @@
  optional_policy(`
  	xserver_read_tmp_files(vmware_host_t)
@@ -5705,9 +5704,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  ifdef(`TODO',`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-3.7.4/policy/modules/apps/wine.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-3.7.4/policy/modules/apps/wine.fc
 --- nsaserefpolicy/policy/modules/apps/wine.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/wine.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/wine.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,4 +1,22 @@
 -/usr/bin/wine			--	gen_context(system_u:object_r:wine_exec_t,s0)
 +/usr/bin/wine.*			--	gen_context(system_u:object_r:wine_exec_t,s0)
@@ -5734,9 +5733,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 -/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)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.7.4/policy/modules/apps/wine.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-3.7.4/policy/modules/apps/wine.if
 --- nsaserefpolicy/policy/modules/apps/wine.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/wine.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/wine.if	2009-12-17 14:26:49.000000000 -0500
 @@ -43,3 +43,118 @@
  	wine_domtrans($1)
  	role $2 types wine_t;
@@ -5856,9 +5855,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +		xserver_role($1_r, $1_wine_t)
 +	')
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.7.4/policy/modules/apps/wine.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-3.7.4/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/apps/wine.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/apps/wine.te	2009-12-17 14:26:49.000000000 -0500
 @@ -9,20 +9,46 @@
  type wine_t;
  type wine_exec_t;
@@ -5910,9 +5909,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +        xserver_common_app(wine_t)
 +	xserver_rw_shm(wine_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.7.4/policy/modules/kernel/corecommands.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-3.7.4/policy/modules/kernel/corecommands.fc
 --- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/corecommands.fc	2009-12-15 15:09:36.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/corecommands.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -44,15 +44,17 @@
  /etc/apcupsd/offbattery		--	gen_context(system_u:object_r:bin_t,s0)
  /etc/apcupsd/onbattery		--	gen_context(system_u:object_r:bin_t,s0)
@@ -5975,9 +5974,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/lib(64)?/rpm/rpmv		-- 	gen_context(system_u:object_r:bin_t,s0)
 +
 +/usr/lib(64)?/gimp/.*/plug-ins(/.*)?  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.7.4/policy/modules/kernel/corecommands.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-3.7.4/policy/modules/kernel/corecommands.if
 --- nsaserefpolicy/policy/modules/kernel/corecommands.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/corecommands.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/corecommands.if	2009-12-17 14:26:49.000000000 -0500
 @@ -893,6 +893,7 @@
  
  	read_lnk_files_pattern($1, bin_t, bin_t)
@@ -6020,9 +6019,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	manage_files_pattern($1, bin_t, exec_type)
  	manage_lnk_files_pattern($1, bin_t, bin_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.7.4/policy/modules/kernel/corenetwork.te.in
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-3.7.4/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/corenetwork.te.in	2009-12-15 15:01:38.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/corenetwork.te.in	2009-12-17 14:26:49.000000000 -0500
 @@ -65,6 +65,7 @@
  type server_packet_t, packet_type, server_packet_type;
  
@@ -6175,9 +6174,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # network_node examples:
  #network_node(lo, s0 - mls_systemhigh, 127.0.0.1, 255.255.255.255)
  #network_node(multicast, s0 - mls_systemhigh, ff00::, ff00::)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.7.4/policy/modules/kernel/devices.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-3.7.4/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2009-11-20 10:51:41.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/devices.fc	2009-12-15 15:08:45.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/devices.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -16,13 +16,16 @@
  /dev/audio.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/autofs.*		-c	gen_context(system_u:object_r:autofs_device_t,s0)
@@ -6195,9 +6194,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /dev/event.*		-c	gen_context(system_u:object_r:event_device_t,s0)
  /dev/evtchn		-c	gen_context(system_u:object_r:xen_device_t,s0)
  /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.7.4/policy/modules/kernel/devices.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.7.4/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2009-11-20 10:51:41.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/devices.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/devices.if	2009-12-17 14:26:49.000000000 -0500
 @@ -783,6 +783,24 @@
  
  ########################################
@@ -6273,9 +6272,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Read raw memory devices (e.g. /dev/mem).
  ## </summary>
  ## <param name="domain">
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.7.4/policy/modules/kernel/domain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.7.4/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/kernel/domain.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/domain.if	2009-12-17 14:26:49.000000000 -0500
 @@ -44,34 +44,6 @@
  interface(`domain_type',`
  	# start with basic domain
@@ -6505,9 +6504,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	dontaudit $1 domain:socket_class_set { read write };
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.7.4/policy/modules/kernel/domain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-3.7.4/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/kernel/domain.te	2009-12-16 16:43:03.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/domain.te	2009-12-17 14:26:49.000000000 -0500
 @@ -5,6 +5,13 @@
  #
  # Declarations
@@ -6652,9 +6651,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	userdom_relabelto_user_home_dirs(polydomain)
 +	userdom_relabelto_user_home_files(polydomain)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.7.4/policy/modules/kernel/files.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-3.7.4/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/kernel/files.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/files.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -18,6 +18,7 @@
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /halt			--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -6686,9 +6685,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/lib(/.*)?			gen_context(system_u:object_r:var_lib_t,s0)
  
  /var/lib/nfs/rpc_pipefs(/.*)?	<<none>>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.7.4/policy/modules/kernel/files.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-3.7.4/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/files.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/files.if	2009-12-17 14:26:49.000000000 -0500
 @@ -932,10 +932,8 @@
  	relabel_lnk_files_pattern($1, { file_type $2 }, { file_type $2 })
  	relabel_fifo_files_pattern($1, { file_type $2 }, { file_type $2 })
@@ -7122,9 +7121,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	dontaudit $1 non_security_file_type:file_class_set rw_inherited_file_perms;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.7.4/policy/modules/kernel/files.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.7.4/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/files.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/files.te	2009-12-17 14:26:49.000000000 -0500
 @@ -12,6 +12,7 @@
  attribute mountpoint;
  attribute pidfile;
@@ -7149,9 +7148,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.7.4/policy/modules/kernel/filesystem.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-3.7.4/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/filesystem.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/filesystem.if	2009-12-17 14:26:49.000000000 -0500
 @@ -906,7 +906,7 @@
  		type cifs_t;
  	')
@@ -7219,9 +7218,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	dontaudit $1 cifs_t:dir list_dir_perms;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.7.4/policy/modules/kernel/filesystem.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-3.7.4/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/filesystem.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/filesystem.te	2009-12-17 14:26:49.000000000 -0500
 @@ -29,6 +29,7 @@
  fs_use_xattr ext4dev gen_context(system_u:object_r:fs_t,s0);
  fs_use_xattr gfs gen_context(system_u:object_r:fs_t,s0);
@@ -7279,9 +7278,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  #
  # nfs_t is the default type for NFS file systems
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.7.4/policy/modules/kernel/kernel.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-3.7.4/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/kernel.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/kernel.if	2009-12-17 14:26:49.000000000 -0500
 @@ -1849,7 +1849,7 @@
  	')
  
@@ -7365,9 +7364,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	allow $1 kernel_t:unix_stream_socket connectto;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.7.4/policy/modules/kernel/kernel.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-3.7.4/policy/modules/kernel/kernel.te
 --- nsaserefpolicy/policy/modules/kernel/kernel.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/kernel.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/kernel.te	2009-12-17 14:26:49.000000000 -0500
 @@ -64,6 +64,15 @@
  genfscon debugfs / gen_context(system_u:object_r:debugfs_t,s0)
  
@@ -7447,9 +7446,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow kern_unconfined unlabeled_t:process ~{ transition dyntransition execmem execstack execheap };
 +
 +files_boot(kernel_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.7.4/policy/modules/kernel/selinux.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-3.7.4/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/kernel/selinux.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/selinux.if	2009-12-17 14:26:49.000000000 -0500
 @@ -40,7 +40,7 @@
  
  	# because of this statement, any module which
@@ -7507,9 +7506,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/storage.fc serefpolicy-3.7.4/policy/modules/kernel/storage.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-3.7.4/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2009-11-20 10:51:41.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/storage.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/storage.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -14,6 +14,7 @@
  /dev/dasd[^/]*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
  /dev/dm-[0-9]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
@@ -7518,9 +7517,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /dev/fd[^/]+		-b	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/flash[^/]*		-b	gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh)
  /dev/gscd		-b	gen_context(system_u:object_r:removable_device_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.7.4/policy/modules/kernel/storage.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-3.7.4/policy/modules/kernel/storage.if
 --- nsaserefpolicy/policy/modules/kernel/storage.if	2009-11-20 10:51:41.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/storage.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/storage.if	2009-12-17 14:26:49.000000000 -0500
 @@ -266,6 +266,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -7529,9 +7528,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/terminal.if serefpolicy-3.7.4/policy/modules/kernel/terminal.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.7.4/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/kernel/terminal.if	2009-12-16 11:17:07.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/kernel/terminal.if	2009-12-17 14:26:49.000000000 -0500
 @@ -273,9 +273,11 @@
  interface(`term_dontaudit_use_console',`
  	gen_require(`
@@ -7596,9 +7595,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	dontaudit $1 tty_device_t:chr_file rw_chr_file_perms;
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.te serefpolicy-3.7.4/policy/modules/roles/guest.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/guest.te serefpolicy-3.7.4/policy/modules/roles/guest.te
 --- nsaserefpolicy/policy/modules/roles/guest.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/roles/guest.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/roles/guest.te	2009-12-17 14:26:49.000000000 -0500
 @@ -16,7 +16,11 @@
  #
  
@@ -7613,9 +7612,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +gen_user(guest_u, user, guest_r, s0, s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.7.4/policy/modules/roles/staff.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/staff.te serefpolicy-3.7.4/policy/modules/roles/staff.te
 --- nsaserefpolicy/policy/modules/roles/staff.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/roles/staff.te	2009-12-15 15:28:35.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/roles/staff.te	2009-12-17 14:26:49.000000000 -0500
 @@ -10,161 +10,121 @@
  
  userdom_unpriv_user_template(staff)
@@ -7820,9 +7819,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	xserver_role(staff_r, staff_t)
 +	virt_stream_connect(staff_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.7.4/policy/modules/roles/sysadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/sysadm.te serefpolicy-3.7.4/policy/modules/roles/sysadm.te
 --- nsaserefpolicy/policy/modules/roles/sysadm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/roles/sysadm.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/roles/sysadm.te	2009-12-17 14:26:49.000000000 -0500
 @@ -15,7 +15,7 @@
  
  role sysadm_r;
@@ -8133,9 +8132,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +init_script_role_transition(sysadm_r)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.fc serefpolicy-3.7.4/policy/modules/roles/unconfineduser.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.fc serefpolicy-3.7.4/policy/modules/roles/unconfineduser.fc
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/roles/unconfineduser.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/roles/unconfineduser.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,8 @@
 +# Add programs here which should not be confined by SELinux
 +# e.g.:
@@ -8145,9 +8144,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/sbin/mock			    --	gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
 +/usr/sbin/sysreport	 	    --	gen_context(system_u:object_r:unconfined_notrans_exec_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.if serefpolicy-3.7.4/policy/modules/roles/unconfineduser.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.if serefpolicy-3.7.4/policy/modules/roles/unconfineduser.if
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/roles/unconfineduser.if	2009-12-15 15:25:43.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/roles/unconfineduser.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,667 @@
 +## <summary>Unconfiend user role</summary>
 +
@@ -8816,10 +8815,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	allow $1 unconfined_r;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.7.4/policy/modules/roles/unconfineduser.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unconfineduser.te serefpolicy-3.7.4/policy/modules/roles/unconfineduser.te
 --- nsaserefpolicy/policy/modules/roles/unconfineduser.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/roles/unconfineduser.te	2009-12-15 15:26:56.000000000 -0500
-@@ -0,0 +1,447 @@
++++ serefpolicy-3.7.4/policy/modules/roles/unconfineduser.te	2009-12-17 14:26:49.000000000 -0500
+@@ -0,0 +1,443 @@
 +policy_module(unconfineduser, 1.0.0)
 +
 +########################################
@@ -9098,10 +9097,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +optional_policy(`
-+	kismet_run(unconfined_t, unconfined_r)
-+')
-+
-+optional_policy(`
 +	livecd_run(unconfined_t, unconfined_r)
 +')
 +
@@ -9267,9 +9262,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +gen_user(unconfined_u, user, unconfined_r system_r, s0, s0 - mls_systemhigh, mcs_allcats)
 +
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.7.4/policy/modules/roles/unprivuser.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/unprivuser.te serefpolicy-3.7.4/policy/modules/roles/unprivuser.te
 --- nsaserefpolicy/policy/modules/roles/unprivuser.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/roles/unprivuser.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/roles/unprivuser.te	2009-12-17 14:26:49.000000000 -0500
 @@ -14,96 +14,19 @@
  userdom_unpriv_user_template(user)
  
@@ -9418,9 +9413,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	xserver_role(user_r, user_t)
 +	setroubleshoot_dontaudit_stream_connect(user_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.7.4/policy/modules/roles/xguest.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/roles/xguest.te serefpolicy-3.7.4/policy/modules/roles/xguest.te
 --- nsaserefpolicy/policy/modules/roles/xguest.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/roles/xguest.te	2009-12-15 15:18:25.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/roles/xguest.te	2009-12-17 14:26:49.000000000 -0500
 @@ -35,6 +35,23 @@
  #
  # Local policy
@@ -9521,9 +9516,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +gen_user(xguest_u, user, xguest_r, s0, s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.fc serefpolicy-3.7.4/policy/modules/services/abrt.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.fc serefpolicy-3.7.4/policy/modules/services/abrt.fc
 --- nsaserefpolicy/policy/modules/services/abrt.fc	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/abrt.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/abrt.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,11 +1,15 @@
  /etc/abrt(/.*)?			 gen_context(system_u:object_r:abrt_etc_t,s0)
  /etc/rc\.d/init\.d/abrt		--	gen_context(system_u:object_r:abrt_initrc_exec_t,s0)
@@ -9541,9 +9536,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/abrt\.pid		--	gen_context(system_u:object_r:abrt_var_run_t,s0)	
  /var/run/abrt\.lock		--	gen_context(system_u:object_r:abrt_var_run_t,s0)
 +/var/run/abrt(/.*)?			gen_context(system_u:object_r:abrt_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.if serefpolicy-3.7.4/policy/modules/services/abrt.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.if serefpolicy-3.7.4/policy/modules/services/abrt.if
 --- nsaserefpolicy/policy/modules/services/abrt.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/abrt.if	2009-12-16 16:47:43.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/abrt.if	2009-12-17 14:26:49.000000000 -0500
 @@ -19,6 +19,24 @@
  	domtrans_pattern($1, abrt_exec_t, abrt_t)
  ')
@@ -9704,9 +9699,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  #####################################
  ## <summary>
  ##	All of the rules required to administrate 
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.7.4/policy/modules/services/abrt.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/abrt.te serefpolicy-3.7.4/policy/modules/services/abrt.te
 --- nsaserefpolicy/policy/modules/services/abrt.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/abrt.te	2009-12-15 15:33:36.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/abrt.te	2009-12-17 14:26:49.000000000 -0500
 @@ -33,12 +33,24 @@
  type abrt_var_run_t;
  files_pid_file(abrt_var_run_t)
@@ -9795,8 +9790,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -# read ~/.abrt/Bugzilla.conf
 -userdom_read_user_home_content_files(abrt_t)
 +userdom_dontaudit_read_user_home_content_files(abrt_t)
-+
-+optional_policy(`
+ 
+ optional_policy(`
+-	dbus_connect_system_bus(abrt_t)
+-	dbus_system_bus_client(abrt_t)
 +	dbus_system_domain(abrt_t, abrt_exec_t)
 +')
 +
@@ -9815,10 +9812,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	policykit_read_lib(abrt_t)
 +	policykit_read_reload(abrt_t)
 +')
- 
- optional_policy(`
--	dbus_connect_system_bus(abrt_t)
--	dbus_system_bus_client(abrt_t)
++
++optional_policy(`
 +	prelink_exec(abrt_t)
 +	libs_exec_ld_so(abrt_t)
 +	corecmd_exec_all_executables(abrt_t)
@@ -9885,9 +9880,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +permissive abrt_helper_t;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.fc serefpolicy-3.7.4/policy/modules/services/afs.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.fc serefpolicy-3.7.4/policy/modules/services/afs.fc
 --- nsaserefpolicy/policy/modules/services/afs.fc	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/afs.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/afs.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -25,6 +25,7 @@
  /usr/vice/etc/afsd	--	gen_context(system_u:object_r:afs_exec_t,s0)
  
@@ -9896,9 +9891,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  /vicepa				gen_context(system_u:object_r:afs_files_t,s0)
  /vicepb				gen_context(system_u:object_r:afs_files_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.te serefpolicy-3.7.4/policy/modules/services/afs.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/afs.te serefpolicy-3.7.4/policy/modules/services/afs.te
 --- nsaserefpolicy/policy/modules/services/afs.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/afs.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/afs.te	2009-12-17 14:26:49.000000000 -0500
 @@ -71,7 +71,7 @@
  # afs client local policy
  #
@@ -9916,9 +9911,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  files_rw_etc_runtime_files(afs_t)
  
  fs_getattr_xattr_fs(afs_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aisexec.fc serefpolicy-3.7.4/policy/modules/services/aisexec.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aisexec.fc serefpolicy-3.7.4/policy/modules/services/aisexec.fc
 --- nsaserefpolicy/policy/modules/services/aisexec.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/aisexec.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/aisexec.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,12 @@
 +
 +/etc/rc\.d/init\.d/openais             --      gen_context(system_u:object_r:aisexec_initrc_exec_t,s0)
@@ -9932,9 +9927,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/run/aisexec\.pid                  --      gen_context(system_u:object_r:aisexec_var_run_t,s0)
 +
 +/var/run/cman_.*                       -s      gen_context(system_u:object_r:aisexec_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aisexec.if serefpolicy-3.7.4/policy/modules/services/aisexec.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aisexec.if serefpolicy-3.7.4/policy/modules/services/aisexec.if
 --- nsaserefpolicy/policy/modules/services/aisexec.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/aisexec.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/aisexec.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,106 @@
 +## <summary>SELinux policy for Aisexec Cluster Engine</summary>
 +
@@ -10042,9 +10037,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +        admin_pattern($1, aisexec_tmpfs_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aisexec.te serefpolicy-3.7.4/policy/modules/services/aisexec.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/aisexec.te serefpolicy-3.7.4/policy/modules/services/aisexec.te
 --- nsaserefpolicy/policy/modules/services/aisexec.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/aisexec.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/aisexec.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,112 @@
 +
 +policy_module(aisexec,1.0.0)
@@ -10158,9 +10153,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +groupd_rw_semaphores(aisexec_t)
 +groupd_rw_shm(aisexec_t)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.7.4/policy/modules/services/amavis.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.7.4/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/amavis.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/amavis.te	2009-12-17 14:26:49.000000000 -0500
 @@ -103,6 +103,8 @@
  kernel_dontaudit_read_proc_symlinks(amavis_t)
  kernel_dontaudit_read_system_state(amavis_t)
@@ -10170,9 +10165,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # find perl
  corecmd_exec_bin(amavis_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.7.4/policy/modules/services/apache.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-3.7.4/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/apache.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/apache.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -2,11 +2,15 @@
  
  /etc/apache(2)?(/.*)?			gen_context(system_u:object_r:httpd_config_t,s0)
@@ -10205,7 +10200,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /usr/sbin/rotatelogs		--	gen_context(system_u:object_r:httpd_rotatelogs_exec_t,s0)
  /usr/sbin/suexec		--	gen_context(system_u:object_r:httpd_suexec_exec_t,s0)
  
-@@ -32,21 +39,37 @@
+@@ -32,31 +39,51 @@
  /usr/sbin/httpd2-.*		--	gen_context(system_u:object_r:httpd_exec_t,s0)
  ')
  
@@ -10243,10 +10238,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
  /var/lib/php/session(/.*)?		gen_context(system_u:object_r:httpd_var_run_t,s0)
-@@ -50,13 +73,17 @@
- /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
- /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
- /var/lib/php/session(/.*)?		gen_context(system_u:object_r:httpd_var_run_t,s0)
 +
  /var/lib/squirrelmail/prefs(/.*)?	gen_context(system_u:object_r:httpd_squirrelmail_t,s0)
  
@@ -10296,9 +10287,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/www/svn/hooks(/.*)?		gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 +/var/www/svn/conf(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.7.4/policy/modules/services/apache.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-3.7.4/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/apache.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/apache.if	2009-12-17 14:26:49.000000000 -0500
 @@ -13,21 +13,16 @@
  #
  template(`apache_content_template',`
@@ -10921,9 +10912,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.7.4/policy/modules/services/apache.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-3.7.4/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/apache.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/apache.te	2009-12-17 14:26:49.000000000 -0500
 @@ -19,6 +19,8 @@
  # Declarations
  #
@@ -11670,7 +11661,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	userdom_search_user_home_content(httpd_t)
 +	userdom_search_user_home_content(httpd_suexec_t)
 +	userdom_search_user_home_content(httpd_user_script_t)
-+')
+ ')
 +
 +tunable_policy(`httpd_read_user_content',`
 +	userdom_read_user_home_content_files(httpd_user_script_t)
@@ -11724,7 +11715,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +optional_policy(`
 +	postgresql_stream_connect(httpd_bugzilla_script_t)
- ')
++')
 +
 +manage_dirs_pattern(httpd_sys_script_t,httpdcontent,httpd_rw_content)
 +manage_files_pattern(httpd_sys_script_t,httpdcontent,httpd_rw_content)
@@ -11742,9 +11733,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +typealias httpd_sys_script_t      alias httpd_fastcgi_script_t;
 +typealias httpd_var_run_t         alias httpd_fastcgi_var_run_t;
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-3.7.4/policy/modules/services/apm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-3.7.4/policy/modules/services/apm.te
 --- nsaserefpolicy/policy/modules/services/apm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/apm.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/apm.te	2009-12-17 14:26:49.000000000 -0500
 @@ -60,7 +60,7 @@
  # mknod: controlling an orderly resume of PCMCIA requires creating device
  # nodes 254,{0,1,2} for some reason.
@@ -11765,9 +11756,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # cjp: related to sleep/resume (?)
  optional_policy(`
  	xserver_domtrans(apmd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-3.7.4/policy/modules/services/arpwatch.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-3.7.4/policy/modules/services/arpwatch.te
 --- nsaserefpolicy/policy/modules/services/arpwatch.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/arpwatch.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/arpwatch.te	2009-12-17 14:26:49.000000000 -0500
 @@ -34,6 +34,7 @@
  allow arpwatch_t self:tcp_socket { connect create_stream_socket_perms };
  allow arpwatch_t self:udp_socket create_socket_perms;
@@ -11784,9 +11775,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  kernel_read_kernel_sysctls(arpwatch_t)
  kernel_list_proc(arpwatch_t)
  kernel_read_proc_symlinks(arpwatch_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.if serefpolicy-3.7.4/policy/modules/services/asterisk.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.if serefpolicy-3.7.4/policy/modules/services/asterisk.if
 --- nsaserefpolicy/policy/modules/services/asterisk.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/asterisk.if	2009-12-15 15:34:21.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/asterisk.if	2009-12-17 14:26:49.000000000 -0500
 @@ -1,5 +1,44 @@
  ## <summary>Asterisk IP telephony server</summary>
  
@@ -11832,9 +11823,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
  ## <summary>
  ##	All of the rules required to administrate 
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.7.4/policy/modules/services/asterisk.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/asterisk.te serefpolicy-3.7.4/policy/modules/services/asterisk.te
 --- nsaserefpolicy/policy/modules/services/asterisk.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/asterisk.te	2009-12-15 15:34:08.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/asterisk.te	2009-12-17 14:26:49.000000000 -0500
 @@ -34,18 +34,21 @@
  type asterisk_var_run_t;
  files_pid_file(asterisk_var_run_t)
@@ -11939,9 +11930,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	udev_read_db(asterisk_t)
  ')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.7.4/policy/modules/services/automount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-3.7.4/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/automount.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/automount.te	2009-12-17 14:26:49.000000000 -0500
 @@ -75,6 +75,7 @@
  
  fs_mount_all_fs(automount_t)
@@ -11958,15 +11949,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  storage_rw_fuse(automount_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.7.4/policy/modules/services/avahi.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-3.7.4/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/avahi.te	2009-12-16 13:33:02.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/avahi.te	2009-12-17 14:26:49.000000000 -0500
 @@ -24,7 +24,7 @@
  # Local policy
  #
  
 -allow avahi_t self:capability { dac_override setgid chown fowner kill setuid sys_chroot };
-+allow avahi_t self:capability { dac_override setgid chown fowner kill net_admin setuid sys_chroot };
++allow avahi_t self:capability { dac_override setgid chown fowner kill net_admin net_raw setuid sys_chroot };
  dontaudit avahi_t self:capability sys_tty_config;
  allow avahi_t self:process { setrlimit signal_perms getcap setcap };
  allow avahi_t self:fifo_file rw_fifo_file_perms;
@@ -12005,9 +11996,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_user_home_dirs(avahi_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.7.4/policy/modules/services/bind.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-3.7.4/policy/modules/services/bind.if
 --- nsaserefpolicy/policy/modules/services/bind.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/bind.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/bind.if	2009-12-17 14:26:49.000000000 -0500
 @@ -235,7 +235,7 @@
  
  ########################################
@@ -12069,9 +12060,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	All of the rules required to administrate 
  ##	an bind environment
  ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.te serefpolicy-3.7.4/policy/modules/services/bitlbee.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bitlbee.te serefpolicy-3.7.4/policy/modules/services/bitlbee.te
 --- nsaserefpolicy/policy/modules/services/bitlbee.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/bitlbee.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/bitlbee.te	2009-12-17 14:26:49.000000000 -0500
 @@ -68,6 +68,8 @@
  # MSN can use passport auth, which is over http:
  corenet_tcp_connect_http_port(bitlbee_t)
@@ -12081,9 +12072,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  dev_read_rand(bitlbee_t)
  dev_read_urand(bitlbee_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-3.7.4/policy/modules/services/bluetooth.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-3.7.4/policy/modules/services/bluetooth.if
 --- nsaserefpolicy/policy/modules/services/bluetooth.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/bluetooth.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/bluetooth.if	2009-12-17 14:26:49.000000000 -0500
 @@ -153,6 +153,27 @@
  	dontaudit $1 bluetooth_helper_t:file { read getattr };
  ')
@@ -12112,9 +12103,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
  ## <summary>
  ##	All of the rules required to administrate 
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.7.4/policy/modules/services/bluetooth.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-3.7.4/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/bluetooth.te	2009-12-16 17:05:48.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/bluetooth.te	2009-12-17 14:26:49.000000000 -0500
 @@ -54,9 +54,9 @@
  # Bluetooth services local policy
  #
@@ -12163,9 +12154,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  		pulseaudio_dbus_chat(bluetooth_t)
  	')
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-3.7.4/policy/modules/services/ccs.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-3.7.4/policy/modules/services/ccs.fc
 --- nsaserefpolicy/policy/modules/services/ccs.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ccs.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ccs.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -2,9 +2,5 @@
  
  /sbin/ccsd		--	gen_context(system_u:object_r:ccs_exec_t,s0)
@@ -12178,9 +12169,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -/var/run/cman_.*	-s	gen_context(system_u:object_r:ccs_var_run_t,s0)
 +/var/run/cluster/ccsd\.pid      --      gen_context(system_u:object_r:ccs_var_run_t,s0)
 +/var/run/cluster/ccsd\.sock     -s      gen_context(system_u:object_r:ccs_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-3.7.4/policy/modules/services/ccs.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-3.7.4/policy/modules/services/ccs.te
 --- nsaserefpolicy/policy/modules/services/ccs.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ccs.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ccs.te	2009-12-17 14:26:49.000000000 -0500
 @@ -10,23 +10,21 @@
  type ccs_exec_t;
  init_daemon_domain(ccs_t, ccs_exec_t)
@@ -12264,9 +12255,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ifdef(`hide_broken_symptoms', `
  	corecmd_dontaudit_write_bin_dirs(ccs_t)
  	files_manage_isid_type_files(ccs_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.fc serefpolicy-3.7.4/policy/modules/services/certmaster.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.fc serefpolicy-3.7.4/policy/modules/services/certmaster.fc
 --- nsaserefpolicy/policy/modules/services/certmaster.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/certmaster.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/certmaster.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -3,5 +3,6 @@
  
  /usr/bin/certmaster		--	gen_context(system_u:object_r:certmaster_exec_t,s0)
@@ -12274,9 +12265,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/lib/certmaster(/.*)?		gen_context(system_u:object_r:certmaster_var_lib_t,s0)
  /var/log/certmaster(/.*)?		gen_context(system_u:object_r:certmaster_var_log_t,s0)
  /var/run/certmaster.*			gen_context(system_u:object_r:certmaster_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.te serefpolicy-3.7.4/policy/modules/services/certmaster.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmaster.te serefpolicy-3.7.4/policy/modules/services/certmaster.te
 --- nsaserefpolicy/policy/modules/services/certmaster.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/certmaster.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/certmaster.te	2009-12-17 14:26:49.000000000 -0500
 @@ -30,7 +30,7 @@
  # certmaster local policy 
  #
@@ -12286,9 +12277,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow certmaster_t self:tcp_socket create_stream_socket_perms;
  
  # config files
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.fc serefpolicy-3.7.4/policy/modules/services/certmonger.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.fc serefpolicy-3.7.4/policy/modules/services/certmonger.fc
 --- nsaserefpolicy/policy/modules/services/certmonger.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/certmonger.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/certmonger.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,6 @@
 +/etc/rc\.d/init\.d/certmonger	--	gen_context(system_u:object_r:certmonger_initrc_exec_t,s0)
 +
@@ -12296,9 +12287,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +/var/run/certmonger.pid		--	gen_context(system_u:object_r:certmonger_var_run_t,s0)
 +/var/lib/certmonger(/.*)?			gen_context(system_u:object_r:certmonger_var_lib_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.if serefpolicy-3.7.4/policy/modules/services/certmonger.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.if serefpolicy-3.7.4/policy/modules/services/certmonger.if
 --- nsaserefpolicy/policy/modules/services/certmonger.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/certmonger.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/certmonger.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,217 @@
 +
 +## <summary>Certificate status monitor and PKI enrollment client</summary>
@@ -12517,9 +12508,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_search_pids($1)
 +	admin_pattern($1, cermonger_var_run_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.te serefpolicy-3.7.4/policy/modules/services/certmonger.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/certmonger.te serefpolicy-3.7.4/policy/modules/services/certmonger.te
 --- nsaserefpolicy/policy/modules/services/certmonger.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/certmonger.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/certmonger.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,74 @@
 +policy_module(certmonger,1.0.0)
 +
@@ -12595,9 +12586,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	unconfined_dbus_send(certmonger_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.fc serefpolicy-3.7.4/policy/modules/services/chronyd.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.fc serefpolicy-3.7.4/policy/modules/services/chronyd.fc
 --- nsaserefpolicy/policy/modules/services/chronyd.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/chronyd.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/chronyd.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,11 @@
 +
 +/etc/rc\.d/init\.d/chronyd         --      gen_context(system_u:object_r:chronyd_initrc_exec_t,s0)
@@ -12610,9 +12601,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +/var/run/chronyd\.pid              --      gen_context(system_u:object_r:chronyd_var_run_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.if serefpolicy-3.7.4/policy/modules/services/chronyd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.if serefpolicy-3.7.4/policy/modules/services/chronyd.if
 --- nsaserefpolicy/policy/modules/services/chronyd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/chronyd.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/chronyd.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,105 @@
 +## <summary>chrony background daemon</summary>
 +
@@ -12719,9 +12710,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/chronyd.te serefpolicy-3.7.4/policy/modules/services/chronyd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/chronyd.te serefpolicy-3.7.4/policy/modules/services/chronyd.te
 --- nsaserefpolicy/policy/modules/services/chronyd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/chronyd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/chronyd.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,67 @@
 +policy_module(chronyd,1.0.0)
 +
@@ -12790,9 +12781,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +miscfiles_read_localization(chronyd_t)
 +
 +permissive chronyd_t;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.7.4/policy/modules/services/clamav.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.7.4/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/clamav.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/clamav.te	2009-12-17 14:26:49.000000000 -0500
 @@ -57,6 +57,7 @@
  #
  
@@ -12844,17 +12835,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
  	apache_read_sys_content(clamscan_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.fc serefpolicy-3.7.4/policy/modules/services/clogd.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.fc serefpolicy-3.7.4/policy/modules/services/clogd.fc
 --- nsaserefpolicy/policy/modules/services/clogd.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/clogd.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/clogd.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,4 @@
 +
 +/usr/sbin/clogd			--	gen_context(system_u:object_r:clogd_exec_t,s0)
 +
 +/var/run/clogd\.pid             --      gen_context(system_u:object_r:clogd_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.if serefpolicy-3.7.4/policy/modules/services/clogd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.if serefpolicy-3.7.4/policy/modules/services/clogd.if
 --- nsaserefpolicy/policy/modules/services/clogd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/clogd.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/clogd.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,98 @@
 +## <summary>clogd - clustered mirror log server</summary>
 +
@@ -12954,9 +12945,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +        allow $1 clogd_t:shm { rw_shm_perms destroy };
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.te serefpolicy-3.7.4/policy/modules/services/clogd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clogd.te serefpolicy-3.7.4/policy/modules/services/clogd.te
 --- nsaserefpolicy/policy/modules/services/clogd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/clogd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/clogd.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,62 @@
 +
 +policy_module(clogd,1.0.0)
@@ -13020,15 +13011,15 @@ 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/cobbler.fc serefpolicy-3.7.4/policy/modules/services/cobbler.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.fc serefpolicy-3.7.4/policy/modules/services/cobbler.fc
 --- nsaserefpolicy/policy/modules/services/cobbler.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/cobbler.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/cobbler.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,2 @@
 +
 +/var/lib/cobbler(/.*)?			gen_context(system_u:object_r:cobbler_var_lib_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.if serefpolicy-3.7.4/policy/modules/services/cobbler.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.if serefpolicy-3.7.4/policy/modules/services/cobbler.if
 --- nsaserefpolicy/policy/modules/services/cobbler.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/cobbler.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/cobbler.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,44 @@
 +## <summary>
 +##	Cobbler var_lib_t
@@ -13074,18 +13065,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_search_var_lib($1)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.te serefpolicy-3.7.4/policy/modules/services/cobbler.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cobbler.te serefpolicy-3.7.4/policy/modules/services/cobbler.te
 --- nsaserefpolicy/policy/modules/services/cobbler.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/cobbler.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/cobbler.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,5 @@
 +
 +policy_module(cobbler, 1.10.0)
 +
 +type cobbler_var_lib_t;
 +files_type(cobbler_var_lib_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-3.7.4/policy/modules/services/consolekit.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.fc serefpolicy-3.7.4/policy/modules/services/consolekit.fc
 --- nsaserefpolicy/policy/modules/services/consolekit.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/consolekit.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/consolekit.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -2,4 +2,5 @@
  
  /var/log/ConsoleKit(/.*)?		gen_context(system_u:object_r:consolekit_log_t,s0)
@@ -13093,9 +13084,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/run/ConsoleKit(/.*)?		gen_context(system_u:object_r:consolekit_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.7.4/policy/modules/services/consolekit.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.if serefpolicy-3.7.4/policy/modules/services/consolekit.if
 --- nsaserefpolicy/policy/modules/services/consolekit.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/consolekit.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/consolekit.if	2009-12-17 14:26:49.000000000 -0500
 @@ -57,3 +57,42 @@
  	read_files_pattern($1, consolekit_log_t, consolekit_log_t)
  	files_search_pids($1)
@@ -13139,9 +13130,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	read_files_pattern($1, consolekit_var_run_t, consolekit_var_run_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.7.4/policy/modules/services/consolekit.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/consolekit.te serefpolicy-3.7.4/policy/modules/services/consolekit.te
 --- nsaserefpolicy/policy/modules/services/consolekit.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/consolekit.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/consolekit.te	2009-12-17 14:26:49.000000000 -0500
 @@ -21,7 +21,7 @@
  # consolekit local policy
  #
@@ -13217,9 +13208,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	unconfined_stream_connect(consolekit_t)
  ')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.fc serefpolicy-3.7.4/policy/modules/services/corosync.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.fc serefpolicy-3.7.4/policy/modules/services/corosync.fc
 --- nsaserefpolicy/policy/modules/services/corosync.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/corosync.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/corosync.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,13 @@
 +
 +/etc/rc\.d/init\.d/corosync     --      gen_context(system_u:object_r:corosync_initrc_exec_t,s0)
@@ -13234,9 +13225,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +/var/run/corosync\.pid          --      gen_context(system_u:object_r:corosync_var_run_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.if serefpolicy-3.7.4/policy/modules/services/corosync.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.if serefpolicy-3.7.4/policy/modules/services/corosync.if
 --- nsaserefpolicy/policy/modules/services/corosync.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/corosync.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/corosync.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,108 @@
 +## <summary>SELinux policy for Corosync Cluster Engine</summary>
 +
@@ -13346,9 +13337,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/corosync.te serefpolicy-3.7.4/policy/modules/services/corosync.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/corosync.te serefpolicy-3.7.4/policy/modules/services/corosync.te
 --- nsaserefpolicy/policy/modules/services/corosync.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/corosync.te	2009-12-16 13:52:21.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/corosync.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,110 @@
 +
 +policy_module(corosync,1.0.0)
@@ -13460,9 +13451,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +permissive corosync_t;
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.if serefpolicy-3.7.4/policy/modules/services/courier.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.if serefpolicy-3.7.4/policy/modules/services/courier.if
 --- nsaserefpolicy/policy/modules/services/courier.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/courier.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/courier.if	2009-12-17 14:26:49.000000000 -0500
 @@ -179,6 +179,24 @@
  
  ########################################
@@ -13488,9 +13479,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Read and write to courier spool pipes.
  ## </summary>
  ## <param name="domain">
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.7.4/policy/modules/services/courier.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.7.4/policy/modules/services/courier.te
 --- nsaserefpolicy/policy/modules/services/courier.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/courier.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/courier.te	2009-12-17 14:26:49.000000000 -0500
 @@ -10,6 +10,7 @@
  
  type courier_etc_t;
@@ -13499,9 +13490,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  courier_domain_template(pcp)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.7.4/policy/modules/services/cron.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-3.7.4/policy/modules/services/cron.fc
 --- nsaserefpolicy/policy/modules/services/cron.fc	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/cron.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/cron.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -14,7 +14,7 @@
  /var/run/anacron\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
  /var/run/atd\.pid		--	gen_context(system_u:object_r:crond_var_run_t,s0)
@@ -13519,9 +13510,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/lib/glpi/files(/.*)?		gen_context(system_u:object_r:cron_var_lib_t,s0)
 +
 +/var/log/mcelog.*		--	gen_context(system_u:object_r:cron_log_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.7.4/policy/modules/services/cron.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-3.7.4/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/cron.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/cron.if	2009-12-17 14:26:49.000000000 -0500
 @@ -12,6 +12,10 @@
  ## </param>
  #
@@ -13663,9 +13654,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	manage_files_pattern($1, system_cronjob_var_lib_t,  system_cronjob_var_lib_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.7.4/policy/modules/services/cron.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-3.7.4/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/cron.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/cron.te	2009-12-17 14:26:49.000000000 -0500
 @@ -38,6 +38,7 @@
  type cron_var_lib_t;
  files_type(cron_var_lib_t)
@@ -13931,9 +13922,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	unconfined_domain(system_cronjob_t)
  	userdom_user_home_dir_filetrans_user_home_content(system_cronjob_t, { dir file lnk_file fifo_file sock_file })
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.7.4/policy/modules/services/cups.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-3.7.4/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2009-07-28 15:51:13.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/cups.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/cups.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -13,10 +13,14 @@
  /etc/cups/certs/.*	--	gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
  /etc/rc\.d/init\.d/cups	--	gen_context(system_u:object_r:cupsd_initrc_exec_t,s0)
@@ -13977,9 +13968,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/local/Printer/(.*/)?inf(/.*)?      gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
 +
 +/usr/local/linuxprinter/ppd(/.*)?      gen_context(system_u:object_r:cupsd_rw_etc_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.7.4/policy/modules/services/cups.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-3.7.4/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/cups.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/cups.te	2009-12-17 14:26:49.000000000 -0500
 @@ -23,6 +23,9 @@
  type cupsd_initrc_exec_t;
  init_script_file(cupsd_initrc_exec_t)
@@ -14169,18 +14160,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  dev_read_sysfs(hplip_t)
  dev_rw_printer(hplip_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.7.4/policy/modules/services/cvs.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-3.7.4/policy/modules/services/cvs.te
 --- nsaserefpolicy/policy/modules/services/cvs.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/cvs.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/cvs.te	2009-12-17 14:26:49.000000000 -0500
 @@ -112,4 +112,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/cyrus.te serefpolicy-3.7.4/policy/modules/services/cyrus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-3.7.4/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/cyrus.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/cyrus.te	2009-12-17 14:26:49.000000000 -0500
 @@ -137,6 +137,7 @@
  optional_policy(`
  	snmp_read_snmp_var_lib_files(cyrus_t)
@@ -14189,9 +14180,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/dbus.if serefpolicy-3.7.4/policy/modules/services/dbus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-3.7.4/policy/modules/services/dbus.if
 --- nsaserefpolicy/policy/modules/services/dbus.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/dbus.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/dbus.if	2009-12-17 14:26:49.000000000 -0500
 @@ -42,8 +42,10 @@
  	gen_require(`
  		class dbus { send_msg acquire_svc };
@@ -14325,9 +14316,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	manage_files_pattern($1, system_dbusd_var_lib_t, system_dbusd_var_lib_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.7.4/policy/modules/services/dbus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.7.4/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/dbus.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/dbus.te	2009-12-17 14:26:49.000000000 -0500
 @@ -86,6 +86,7 @@
  dev_read_sysfs(system_dbusd_t)
  
@@ -14380,9 +14371,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow dbusd_unconfined session_bus_type:dbus all_dbus_perms;
 +allow dbusd_unconfined dbusd_unconfined:dbus all_dbus_perms;
 +allow session_bus_type dbusd_unconfined:dbus send_msg;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.7.4/policy/modules/services/dcc.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dcc.te serefpolicy-3.7.4/policy/modules/services/dcc.te
 --- nsaserefpolicy/policy/modules/services/dcc.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/dcc.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/dcc.te	2009-12-17 14:26:49.000000000 -0500
 @@ -130,11 +130,13 @@
  
  # Access files in /var/dcc. The map file can be updated
@@ -14409,9 +14400,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	spamassassin_read_spamd_tmp_files(dcc_client_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.if serefpolicy-3.7.4/policy/modules/services/ddclient.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.if serefpolicy-3.7.4/policy/modules/services/ddclient.if
 --- nsaserefpolicy/policy/modules/services/ddclient.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ddclient.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ddclient.if	2009-12-17 14:26:49.000000000 -0500
 @@ -21,6 +21,31 @@
  
  ########################################
@@ -14444,18 +14435,24 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	All of the rules required to administrate 
  ##	an ddclient environment
  ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.fc serefpolicy-3.7.4/policy/modules/services/devicekit.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.fc serefpolicy-3.7.4/policy/modules/services/devicekit.fc
 --- nsaserefpolicy/policy/modules/services/devicekit.fc	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/devicekit.fc	2009-12-15 14:56:49.000000000 -0500
-@@ -5,4 +5,4 @@
++++ serefpolicy-3.7.4/policy/modules/services/devicekit.fc	2009-12-17 14:32:32.000000000 -0500
+@@ -1,8 +1,11 @@
+ /usr/libexec/devkit-daemon	--	gen_context(system_u:object_r:devicekit_exec_t,s0)
+ /usr/libexec/devkit-disks-daemon --	gen_context(system_u:object_r:devicekit_disk_exec_t,s0)
+ /usr/libexec/devkit-power-daemon --	gen_context(system_u:object_r:devicekit_power_exec_t,s0)
++/usr/libexec/udisks-daemon	--	gen_context(system_u:object_r:devicekit_disk_exec_t,s0)
+ 
  /var/lib/DeviceKit-.*			gen_context(system_u:object_r:devicekit_var_lib_t,s0)
++/var/lib/udisks(/.*)?			gen_context(system_u:object_r:devicekit_var_lib_t,s0)
  
  /var/run/devkit(/.*)?			gen_context(system_u:object_r:devicekit_var_run_t,s0)
--/var/run/DeviceKit-disk(/.*)?		gen_context(system_u:object_r:devicekit_var_run_t,s0)
-+/var/run/DeviceKit-disks(/.*)?		gen_context(system_u:object_r:devicekit_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.if serefpolicy-3.7.4/policy/modules/services/devicekit.if
+ /var/run/DeviceKit-disk(/.*)?		gen_context(system_u:object_r:devicekit_var_run_t,s0)
++/var/run/udisks(/.*)?			gen_context(system_u:object_r:devicekit_var_run_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.if serefpolicy-3.7.4/policy/modules/services/devicekit.if
 --- nsaserefpolicy/policy/modules/services/devicekit.if	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/devicekit.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/devicekit.if	2009-12-17 14:26:49.000000000 -0500
 @@ -139,6 +139,26 @@
  
  ########################################
@@ -14483,26 +14480,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	All of the rules required to administrate 
  ##	an devicekit environment
  ## </summary>
-@@ -162,7 +182,7 @@
- interface(`devicekit_admin',`
- 	gen_require(`
- 		type devicekit_t, devicekit_disk_t, devicekit_power_t;
--		type devicekit_var_run_t;
-+		type devicekit_var_lib_t, devicekit_var_run_t, devicekit_tmp_t;
- 	')
- 
- 	allow $1 devicekit_t:process { ptrace signal_perms getattr };
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.7.4/policy/modules/services/devicekit.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/devicekit.te serefpolicy-3.7.4/policy/modules/services/devicekit.te
 --- nsaserefpolicy/policy/modules/services/devicekit.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/devicekit.te	2009-12-15 14:56:49.000000000 -0500
-@@ -36,12 +36,15 @@
- manage_dirs_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t)
- manage_files_pattern(devicekit_t, devicekit_var_run_t, devicekit_var_run_t)
- files_pid_filetrans(devicekit_t, devicekit_var_run_t, { file dir })
-+allow devicekit_disk_t devicekit_var_run_t:dir mounton;
- 
- dev_read_sysfs(devicekit_t)
- dev_read_urand(devicekit_t)
++++ serefpolicy-3.7.4/policy/modules/services/devicekit.te	2009-12-17 14:31:12.000000000 -0500
+@@ -42,6 +42,8 @@
  
  files_read_etc_files(devicekit_t)
  
@@ -14511,92 +14492,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  miscfiles_read_localization(devicekit_t)
  
  optional_policy(`
-@@ -60,8 +63,11 @@
- # DeviceKit disk local policy
- #
- 
--allow devicekit_disk_t self:capability { chown dac_override fowner fsetid sys_nice sys_ptrace sys_rawio };
-+allow devicekit_disk_t self:capability { chown setuid setgid dac_override fowner fsetid net_admin sys_nice sys_ptrace sys_rawio };
-+allow devicekit_disk_t self:process signal_perms;
-+
- allow devicekit_disk_t self:fifo_file rw_fifo_file_perms;
-+allow devicekit_disk_t self:netlink_kobject_uevent_socket create_socket_perms;
- 
- manage_dirs_pattern(devicekit_disk_t, devicekit_tmp_t, devicekit_tmp_t)
- manage_files_pattern(devicekit_disk_t, devicekit_tmp_t, devicekit_tmp_t)
-@@ -71,7 +77,10 @@
- manage_files_pattern(devicekit_disk_t, devicekit_var_lib_t, devicekit_var_lib_t)
- files_var_lib_filetrans(devicekit_disk_t, devicekit_var_lib_t, dir)
- 
-+kernel_read_fs_sysctls(devicekit_disk_t)
- kernel_read_software_raid_state(devicekit_disk_t)
-+kernel_read_system_state(devicekit_disk_t)
-+kernel_request_load_module(devicekit_disk_t)
- kernel_setsched(devicekit_disk_t)
- 
- corecmd_exec_bin(devicekit_disk_t)
-@@ -79,21 +88,35 @@
- dev_rw_sysfs(devicekit_disk_t)
- dev_read_urand(devicekit_disk_t)
- dev_getattr_usbfs_dirs(devicekit_disk_t)
-+dev_manage_generic_files(devicekit_disk_t)
-+dev_getattr_all_chr_files(devicekit_disk_t)
- 
-+domain_read_all_domains_state(devicekit_disk_t)
-+domain_getattr_all_sockets(devicekit_disk_t)
-+domain_getattr_all_pipes(devicekit_disk_t)
-+
-+files_getattr_all_sockets(devicekit_disk_t)
-+files_getattr_all_mountpoints(devicekit_disk_t)
-+files_getattr_all_files(devicekit_disk_t)
- files_manage_mnt_dirs(devicekit_disk_t)
- files_read_etc_files(devicekit_disk_t)
- files_read_etc_runtime_files(devicekit_disk_t)
- files_read_usr_files(devicekit_disk_t)
-+files_manage_isid_type_dirs(devicekit_disk_t)
- 
-+fs_list_inotifyfs(devicekit_disk_t)
-+fs_manage_fusefs_dirs(devicekit_disk_t)
- fs_mount_all_fs(devicekit_disk_t)
- fs_unmount_all_fs(devicekit_disk_t)
--fs_manage_fusefs_dirs(devicekit_disk_t)
-+fs_search_all(devicekit_disk_t)
- 
- storage_raw_read_fixed_disk(devicekit_disk_t)
- storage_raw_write_fixed_disk(devicekit_disk_t)
- storage_raw_read_removable_device(devicekit_disk_t)
- storage_raw_write_removable_device(devicekit_disk_t)
- 
-+term_use_all_terms(devicekit_disk_t)
-+
- auth_use_nsswitch(devicekit_disk_t)
- 
- miscfiles_read_localization(devicekit_disk_t)
-@@ -110,6 +133,7 @@
- ')
- 
- optional_policy(`
-+	policykit_dbus_chat(devicekit_disk_t)
- 	policykit_domtrans_auth(devicekit_disk_t)
- 	policykit_read_lib(devicekit_disk_t)
- 	policykit_read_reload(devicekit_disk_t)
-@@ -134,14 +158,26 @@
- 	udev_read_db(devicekit_disk_t)
- ')
- 
-+
-+optional_policy(`
-+	virt_manage_images(devicekit_disk_t)
-+')
-+
-+optional_policy(`
-+	unconfined_domain(devicekit_t)
-+	unconfined_domain(devicekit_power_t)
-+	unconfined_domain(devicekit_disk_t)
-+')
-+
- ########################################
- #
+@@ -139,9 +141,10 @@
  # DeviceKit-Power local policy
  #
  
@@ -14608,7 +14504,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  manage_dirs_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
  manage_files_pattern(devicekit_power_t, devicekit_var_lib_t, devicekit_var_lib_t)
-@@ -151,6 +187,7 @@
+@@ -151,6 +154,7 @@
  kernel_read_system_state(devicekit_power_t)
  kernel_rw_hotplug_sysctls(devicekit_power_t)
  kernel_rw_kernel_sysctl(devicekit_power_t)
@@ -14616,7 +14512,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  corecmd_exec_bin(devicekit_power_t)
  corecmd_exec_shell(devicekit_power_t)
-@@ -159,6 +196,7 @@
+@@ -159,6 +163,7 @@
  
  domain_read_all_domains_state(devicekit_power_t)
  
@@ -14624,7 +14520,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  dev_rw_generic_usb_dev(devicekit_power_t)
  dev_rw_netcontrol(devicekit_power_t)
  dev_rw_sysfs(devicekit_power_t)
-@@ -167,12 +205,17 @@
+@@ -167,12 +172,17 @@
  files_read_etc_files(devicekit_power_t)
  files_read_usr_files(devicekit_power_t)
  
@@ -14642,20 +14538,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  userdom_read_all_users_state(devicekit_power_t)
  
  optional_policy(`
-@@ -180,8 +223,11 @@
+@@ -180,8 +190,13 @@
  ')
  
  optional_policy(`
--	dbus_system_bus_client(devicekit_power_t)
 +	cron_initrc_domtrans(devicekit_power_t)
 +')
- 
++
 +optional_policy(`
-+	dbus_system_bus_client(devicekit_power_t)
+ 	dbus_system_bus_client(devicekit_power_t)
+ 
++	allow devicekit_disk_t devicekit_t:dbus send_msg;
  	allow devicekit_power_t devicekit_t:dbus send_msg;
  
  	optional_policy(`
-@@ -203,17 +249,23 @@
+@@ -203,17 +218,23 @@
  
  optional_policy(`
  	hal_domtrans_mac(devicekit_power_t)
@@ -14679,9 +14576,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
  	vbetool_domtrans(devicekit_power_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.7.4/policy/modules/services/dnsmasq.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dnsmasq.te serefpolicy-3.7.4/policy/modules/services/dnsmasq.te
 --- nsaserefpolicy/policy/modules/services/dnsmasq.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/dnsmasq.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/dnsmasq.te	2009-12-17 14:26:49.000000000 -0500
 @@ -83,6 +83,18 @@
  userdom_dontaudit_search_user_home_dirs(dnsmasq_t)
  
@@ -14701,9 +14598,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	seutil_sigchld_newrole(dnsmasq_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.7.4/policy/modules/services/dovecot.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-3.7.4/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/dovecot.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/dovecot.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -34,6 +34,7 @@
  
  /var/lib/dovecot(/.*)?			gen_context(system_u:object_r:dovecot_var_lib_t,s0)
@@ -14712,9 +14609,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.te serefpolicy-3.7.4/policy/modules/services/dovecot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-3.7.4/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/dovecot.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/dovecot.te	2009-12-17 14:26:49.000000000 -0500
 @@ -56,7 +56,7 @@
  
  allow dovecot_t self:capability { dac_override dac_read_search chown net_bind_service setgid setuid sys_chroot };
@@ -14802,9 +14699,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	fs_manage_cifs_symlinks(dovecot_deliver_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.7.4/policy/modules/services/exim.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/exim.te serefpolicy-3.7.4/policy/modules/services/exim.te
 --- nsaserefpolicy/policy/modules/services/exim.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/exim.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/exim.te	2009-12-17 14:26:49.000000000 -0500
 @@ -111,6 +111,7 @@
  files_search_var(exim_t)
  files_read_etc_files(exim_t)
@@ -14824,9 +14721,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/fail2ban.if serefpolicy-3.7.4/policy/modules/services/fail2ban.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.if serefpolicy-3.7.4/policy/modules/services/fail2ban.if
 --- nsaserefpolicy/policy/modules/services/fail2ban.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/fail2ban.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/fail2ban.if	2009-12-17 14:26:49.000000000 -0500
 @@ -98,6 +98,26 @@
  	allow $1 fail2ban_var_run_t:file read_file_perms;
  ')
@@ -14854,9 +14751,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
  ## <summary>
  ##	All of the rules required to administrate 
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.7.4/policy/modules/services/fail2ban.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fail2ban.te serefpolicy-3.7.4/policy/modules/services/fail2ban.te
 --- nsaserefpolicy/policy/modules/services/fail2ban.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/fail2ban.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/fail2ban.te	2009-12-17 14:26:49.000000000 -0500
 @@ -33,6 +33,7 @@
  allow fail2ban_t self:process signal;
  allow fail2ban_t self:fifo_file rw_fifo_file_perms;
@@ -14873,9 +14770,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  miscfiles_read_localization(fail2ban_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.7.4/policy/modules/services/fetchmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-3.7.4/policy/modules/services/fetchmail.te
 --- nsaserefpolicy/policy/modules/services/fetchmail.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/fetchmail.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/fetchmail.te	2009-12-17 14:26:49.000000000 -0500
 @@ -47,6 +47,9 @@
  kernel_read_proc_symlinks(fetchmail_t)
  kernel_dontaudit_read_system_state(fetchmail_t)
@@ -14886,9 +14783,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  corenet_all_recvfrom_unlabeled(fetchmail_t)
  corenet_all_recvfrom_netlabel(fetchmail_t)
  corenet_tcp_sendrecv_generic_if(fetchmail_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.7.4/policy/modules/services/fprintd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fprintd.te serefpolicy-3.7.4/policy/modules/services/fprintd.te
 --- nsaserefpolicy/policy/modules/services/fprintd.te	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/fprintd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/fprintd.te	2009-12-17 14:26:49.000000000 -0500
 @@ -37,6 +37,8 @@
  files_read_etc_files(fprintd_t)
  files_read_usr_files(fprintd_t)
@@ -14907,9 +14804,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	policykit_dbus_chat_auth(fprintd_t)
  ')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.7.4/policy/modules/services/ftp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-3.7.4/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ftp.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ftp.te	2009-12-17 14:26:49.000000000 -0500
 @@ -41,6 +41,13 @@
  
  ## <desc>
@@ -15033,9 +14930,9 @@ 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/git.fc serefpolicy-3.7.4/policy/modules/services/git.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/git.fc serefpolicy-3.7.4/policy/modules/services/git.fc
 --- nsaserefpolicy/policy/modules/services/git.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/git.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/git.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,3 +1,9 @@
  /var/cache/cgit(/.*)?		gen_context(system_u:object_r:httpd_git_script_rw_t,s0)
 -/var/lib/git(/.*)?		gen_context(system_u:object_r:httpd_git_content_t,s0)
@@ -15047,9 +14944,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +# Conflict with Fedora cgit fc spec.
 +/var/lib/git(/.*)?				gen_context(system_u:object_r:git_data_t, s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/git.if serefpolicy-3.7.4/policy/modules/services/git.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/git.if serefpolicy-3.7.4/policy/modules/services/git.if
 --- nsaserefpolicy/policy/modules/services/git.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/git.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/git.if	2009-12-17 14:26:49.000000000 -0500
 @@ -1 +1,285 @@
 -## <summary>GIT revision control system</summary>
 +## <summary>Git daemon is a really simple server for Git repositories.</summary>
@@ -15337,9 +15234,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	seutil_domtrans_setfiles($1)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/git.te serefpolicy-3.7.4/policy/modules/services/git.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/git.te serefpolicy-3.7.4/policy/modules/services/git.te
 --- nsaserefpolicy/policy/modules/services/git.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/git.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/git.te	2009-12-17 14:26:49.000000000 -0500
 @@ -1,9 +1,173 @@
  
  policy_module(git, 1.0)
@@ -15515,9 +15412,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  apache_content_template(git)
 +git_read_data_content(httpd_git_script_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.te serefpolicy-3.7.4/policy/modules/services/gpm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpm.te serefpolicy-3.7.4/policy/modules/services/gpm.te
 --- nsaserefpolicy/policy/modules/services/gpm.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/gpm.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/gpm.te	2009-12-17 14:26:49.000000000 -0500
 @@ -27,7 +27,8 @@
  # Local policy
  #
@@ -15528,9 +15425,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow gpm_t self:unix_stream_socket create_stream_socket_perms;
  
  allow gpm_t gpm_conf_t:dir list_dir_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.fc serefpolicy-3.7.4/policy/modules/services/gpsd.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.fc serefpolicy-3.7.4/policy/modules/services/gpsd.fc
 --- nsaserefpolicy/policy/modules/services/gpsd.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/gpsd.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/gpsd.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1 +1,6 @@
 +/etc/rc\.d/init\.d/gpsd         --      gen_context(system_u:object_r:gpsd_initrc_exec_t,s0)
 +
@@ -15538,9 +15435,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +/var/run/gpsd\.pid               --      gen_context(system_u:object_r:gpsd_var_run_t,s0)
 +/var/run/gpsd\.sock              -s      gen_context(system_u:object_r:gpsd_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.if serefpolicy-3.7.4/policy/modules/services/gpsd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.if serefpolicy-3.7.4/policy/modules/services/gpsd.if
 --- nsaserefpolicy/policy/modules/services/gpsd.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/gpsd.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/gpsd.if	2009-12-17 14:26:49.000000000 -0500
 @@ -33,11 +33,6 @@
  ##	The role to be allowed the gpsd domain.
  ##	</summary>
@@ -15586,9 +15483,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +        rw_files_pattern($1, gpsd_tmpfs_t, gpsd_tmpfs_t)
 +        read_lnk_files_pattern($1, gpsd_tmpfs_t, gpsd_tmpfs_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.te serefpolicy-3.7.4/policy/modules/services/gpsd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/gpsd.te serefpolicy-3.7.4/policy/modules/services/gpsd.te
 --- nsaserefpolicy/policy/modules/services/gpsd.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/gpsd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/gpsd.te	2009-12-17 14:26:49.000000000 -0500
 @@ -11,15 +11,21 @@
  application_domain(gpsd_t, gpsd_exec_t)
  init_daemon_domain(gpsd_t, gpsd_exec_t)
@@ -15630,9 +15527,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	ntpd_rw_shm(gpsd_t)
 +	ntp_rw_shm(gpsd_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.7.4/policy/modules/services/hal.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-3.7.4/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/hal.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/hal.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -26,6 +26,7 @@
  /var/run/pm(/.*)?				gen_context(system_u:object_r:hald_var_run_t,s0)
  /var/run/pm-utils(/.*)?				gen_context(system_u:object_r:hald_var_run_t,s0)
@@ -15641,9 +15538,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ifdef(`distro_gentoo',`
  /var/lib/cache/hald(/.*)?			gen_context(system_u:object_r:hald_cache_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.7.4/policy/modules/services/hal.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-3.7.4/policy/modules/services/hal.if
 --- nsaserefpolicy/policy/modules/services/hal.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/hal.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/hal.if	2009-12-17 14:26:49.000000000 -0500
 @@ -413,3 +413,21 @@
  	files_search_pids($1)
  	manage_files_pattern($1, hald_var_run_t, hald_var_run_t)
@@ -15666,9 +15563,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	dontaudit $1 hald_t:unix_dgram_socket { read write };
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.7.4/policy/modules/services/hal.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-3.7.4/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/hal.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/hal.te	2009-12-17 14:26:49.000000000 -0500
 @@ -55,6 +55,9 @@
  type hald_var_lib_t;
  files_type(hald_var_lib_t)
@@ -15821,9 +15718,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	dbus_system_bus_client(hald_dccm_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/howl.te serefpolicy-3.7.4/policy/modules/services/howl.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/howl.te serefpolicy-3.7.4/policy/modules/services/howl.te
 --- nsaserefpolicy/policy/modules/services/howl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/howl.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/howl.te	2009-12-17 14:26:49.000000000 -0500
 @@ -30,7 +30,7 @@
  
  kernel_read_network_state(howl_t)
@@ -15833,18 +15730,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  kernel_list_proc(howl_t)
  kernel_read_proc_symlinks(howl_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.fc serefpolicy-3.7.4/policy/modules/services/inetd.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.fc serefpolicy-3.7.4/policy/modules/services/inetd.fc
 --- nsaserefpolicy/policy/modules/services/inetd.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/inetd.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/inetd.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -9,4 +9,4 @@
  
  /var/log/(x)?inetd\.log	--	gen_context(system_u:object_r:inetd_log_t,s0)
  
 -/var/run/inetd\.pid	--	gen_context(system_u:object_r:inetd_var_run_t,s0)
 +/var/run/(x)?inetd\.pid	--	gen_context(system_u:object_r:inetd_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.7.4/policy/modules/services/inetd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-3.7.4/policy/modules/services/inetd.te
 --- nsaserefpolicy/policy/modules/services/inetd.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/inetd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/inetd.te	2009-12-17 14:26:49.000000000 -0500
 @@ -104,6 +104,8 @@
  corenet_tcp_bind_telnetd_port(inetd_t)
  corenet_udp_bind_tftp_port(inetd_t)
@@ -15863,9 +15760,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  logging_send_syslog_msg(inetd_t)
  
  miscfiles_read_localization(inetd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-3.7.4/policy/modules/services/irqbalance.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-3.7.4/policy/modules/services/irqbalance.te
 --- nsaserefpolicy/policy/modules/services/irqbalance.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/irqbalance.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/irqbalance.te	2009-12-17 14:26:49.000000000 -0500
 @@ -18,11 +18,11 @@
  # Local policy
  #
@@ -15880,9 +15777,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  manage_files_pattern(irqbalance_t, irqbalance_var_run_t, irqbalance_var_run_t)
  files_pid_filetrans(irqbalance_t, irqbalance_var_run_t, file)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.7.4/policy/modules/services/kerberos.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-3.7.4/policy/modules/services/kerberos.if
 --- nsaserefpolicy/policy/modules/services/kerberos.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/kerberos.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/kerberos.if	2009-12-17 14:26:49.000000000 -0500
 @@ -74,7 +74,7 @@
  	')
  
@@ -15903,9 +15800,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	tunable_policy(`allow_kerberos',`
  		allow $1 self:tcp_socket create_socket_perms;
  		allow $1 self:udp_socket create_socket_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.7.4/policy/modules/services/kerberos.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-3.7.4/policy/modules/services/kerberos.te
 --- nsaserefpolicy/policy/modules/services/kerberos.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/kerberos.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/kerberos.te	2009-12-17 14:26:49.000000000 -0500
 @@ -110,8 +110,9 @@
  manage_files_pattern(kadmind_t, kadmind_var_run_t, kadmind_var_run_t)
  files_pid_filetrans(kadmind_t, kadmind_var_run_t, file)
@@ -15956,9 +15853,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  sysnet_dns_name_resolve(kpropd_t)
  
  kerberos_use(kpropd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.7.4/policy/modules/services/kerneloops.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerneloops.te serefpolicy-3.7.4/policy/modules/services/kerneloops.te
 --- nsaserefpolicy/policy/modules/services/kerneloops.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/kerneloops.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/kerneloops.te	2009-12-17 14:26:49.000000000 -0500
 @@ -22,7 +22,7 @@
  #
  
@@ -15968,18 +15865,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow kerneloops_t self:fifo_file rw_file_perms;
  
  manage_files_pattern(kerneloops_t, kerneloops_tmp_t, kerneloops_tmp_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.fc serefpolicy-3.7.4/policy/modules/services/ksmtuned.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.fc serefpolicy-3.7.4/policy/modules/services/ksmtuned.fc
 --- nsaserefpolicy/policy/modules/services/ksmtuned.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/ksmtuned.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ksmtuned.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,5 @@
 +/etc/rc\.d/init\.d/ksmtuned	--	gen_context(system_u:object_r:ksmtuned_initrc_exec_t,s0)
 +
 +/usr/sbin/ksmtuned	--	gen_context(system_u:object_r:ksmtuned_exec_t,s0)
 +
 +/var/run/ksmtune\.pid		--	gen_context(system_u:object_r:ntpd_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.if serefpolicy-3.7.4/policy/modules/services/ksmtuned.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.if serefpolicy-3.7.4/policy/modules/services/ksmtuned.if
 --- nsaserefpolicy/policy/modules/services/ksmtuned.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/ksmtuned.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ksmtuned.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,76 @@
 +
 +## <summary>policy for Kernel Samepage Merging (KSM) Tuning Daemon</summary>
@@ -16057,9 +15954,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow $2 system_r;
 +
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.te serefpolicy-3.7.4/policy/modules/services/ksmtuned.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ksmtuned.te serefpolicy-3.7.4/policy/modules/services/ksmtuned.te
 --- nsaserefpolicy/policy/modules/services/ksmtuned.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/ksmtuned.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ksmtuned.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,46 @@
 +policy_module(ksmtuned,1.0.0)
 +
@@ -16107,9 +16004,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +files_read_etc_files(ksmtuned_t)
 +
 +miscfiles_read_localization(ksmtuned_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-3.7.4/policy/modules/services/ktalk.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-3.7.4/policy/modules/services/ktalk.te
 --- nsaserefpolicy/policy/modules/services/ktalk.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ktalk.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ktalk.te	2009-12-17 14:26:49.000000000 -0500
 @@ -69,6 +69,7 @@
  files_read_etc_files(ktalkd_t)
  
@@ -16118,9 +16015,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  auth_use_nsswitch(ktalkd_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-3.7.4/policy/modules/services/ldap.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-3.7.4/policy/modules/services/ldap.fc
 --- nsaserefpolicy/policy/modules/services/ldap.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ldap.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ldap.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,5 +1,7 @@
  
  /etc/ldap/slapd\.conf	--	gen_context(system_u:object_r:slapd_etc_t,s0)
@@ -16129,18 +16026,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /etc/rc\.d/init\.d/ldap	--	gen_context(system_u:object_r:slapd_initrc_exec_t,s0)
  
  /usr/sbin/slapd		--	gen_context(system_u:object_r:slapd_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.fc serefpolicy-3.7.4/policy/modules/services/lircd.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.fc serefpolicy-3.7.4/policy/modules/services/lircd.fc
 --- nsaserefpolicy/policy/modules/services/lircd.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/lircd.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/lircd.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -6,3 +6,5 @@
  /usr/sbin/lircd		--	gen_context(system_u:object_r:lircd_exec_t,s0)
  
  /var/run/lircd\.pid		gen_context(system_u:object_r:lircd_var_run_t,s0)
 +/var/run/lircd(/.*)?		gen_context(system_u:object_r:lircd_var_run_t,s0)
 +/var/run/lirc(/.*)?		gen_context(system_u:object_r:lircd_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.if serefpolicy-3.7.4/policy/modules/services/lircd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.if serefpolicy-3.7.4/policy/modules/services/lircd.if
 --- nsaserefpolicy/policy/modules/services/lircd.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/lircd.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/lircd.if	2009-12-17 14:26:49.000000000 -0500
 @@ -32,12 +32,11 @@
  #
  interface(`lircd_stream_connect',`
@@ -16172,9 +16069,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -
 -	admin_pattern($1, lircd_sock_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.7.4/policy/modules/services/lircd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lircd.te serefpolicy-3.7.4/policy/modules/services/lircd.te
 --- nsaserefpolicy/policy/modules/services/lircd.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/lircd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/lircd.te	2009-12-17 14:26:49.000000000 -0500
 @@ -16,13 +16,9 @@
  type lircd_etc_t;
  files_type(lircd_etc_t)
@@ -16221,9 +16118,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
  miscfiles_read_localization(lircd_t)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.7.4/policy/modules/services/mailman.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-3.7.4/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/mailman.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/mailman.te	2009-12-17 14:26:49.000000000 -0500
 @@ -78,6 +78,10 @@
  mta_dontaudit_rw_queue(mailman_mail_t)
  
@@ -16235,9 +16132,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	cron_read_pipes(mailman_mail_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.te serefpolicy-3.7.4/policy/modules/services/memcached.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/memcached.te serefpolicy-3.7.4/policy/modules/services/memcached.te
 --- nsaserefpolicy/policy/modules/services/memcached.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/memcached.te	2009-12-15 15:58:54.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/memcached.te	2009-12-17 14:26:49.000000000 -0500
 @@ -44,6 +44,10 @@
  
  files_read_etc_files(memcached_t)
@@ -16249,9 +16146,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  miscfiles_read_localization(memcached_t)
  
  sysnet_dns_name_resolve(memcached_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.7.4/policy/modules/services/milter.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.7.4/policy/modules/services/milter.if
 --- nsaserefpolicy/policy/modules/services/milter.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/milter.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/milter.if	2009-12-17 14:26:49.000000000 -0500
 @@ -35,6 +35,8 @@
  	# Create other data files and directories in the data directory
  	manage_files_pattern($1_milter_t, $1_milter_data_t, $1_milter_data_t)
@@ -16261,9 +16158,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	miscfiles_read_localization($1_milter_t)
  
  	logging_send_syslog_msg($1_milter_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/modemmanager.te serefpolicy-3.7.4/policy/modules/services/modemmanager.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/modemmanager.te serefpolicy-3.7.4/policy/modules/services/modemmanager.te
 --- nsaserefpolicy/policy/modules/services/modemmanager.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/modemmanager.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/modemmanager.te	2009-12-17 14:26:49.000000000 -0500
 @@ -16,7 +16,8 @@
  #
  # ModemManager local policy
@@ -16286,18 +16183,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  term_use_unallocated_ttys(modemmanager_t)
  
  miscfiles_read_localization(modemmanager_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.7.4/policy/modules/services/mta.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.7.4/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/mta.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/mta.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -26,3 +26,5 @@
  /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)
  /var/spool/mail(/.*)?		gen_context(system_u:object_r:mail_spool_t,s0)
 +HOME_DIR/\.forward	--	gen_context(system_u:object_r:mail_forward_t,s0)
 +/root/\.forward		--	gen_context(system_u:object_r:mail_forward_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.7.4/policy/modules/services/mta.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-3.7.4/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/mta.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/mta.if	2009-12-17 14:26:49.000000000 -0500
 @@ -69,6 +69,7 @@
  	can_exec($1_mail_t, sendmail_exec_t)
  	allow $1_mail_t sendmail_exec_t:lnk_file read_lnk_file_perms;
@@ -16378,9 +16275,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	read_lnk_files_pattern($1, mail_spool_t, mail_spool_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.7.4/policy/modules/services/mta.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-3.7.4/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/mta.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/mta.te	2009-12-17 14:26:49.000000000 -0500
 @@ -27,6 +27,9 @@
  type mail_spool_t;
  files_mountpoint(mail_spool_t)
@@ -16470,9 +16367,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
  #
  # User send mail local policy
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.fc serefpolicy-3.7.4/policy/modules/services/munin.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.fc serefpolicy-3.7.4/policy/modules/services/munin.fc
 --- nsaserefpolicy/policy/modules/services/munin.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/munin.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/munin.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -9,3 +9,6 @@
  /var/lib/munin(/.*)?			gen_context(system_u:object_r:munin_var_lib_t,s0)
  /var/log/munin.*			gen_context(system_u:object_r:munin_log_t,s0)
@@ -16480,9 +16377,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.te serefpolicy-3.7.4/policy/modules/services/munin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/munin.te serefpolicy-3.7.4/policy/modules/services/munin.te
 --- nsaserefpolicy/policy/modules/services/munin.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/munin.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/munin.te	2009-12-17 14:26:49.000000000 -0500
 @@ -33,7 +33,7 @@
  # Local policy
  #
@@ -16500,9 +16397,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/mysql.te serefpolicy-3.7.4/policy/modules/services/mysql.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mysql.te serefpolicy-3.7.4/policy/modules/services/mysql.te
 --- nsaserefpolicy/policy/modules/services/mysql.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/mysql.te	2009-12-16 14:02:23.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/mysql.te	2009-12-17 14:26:49.000000000 -0500
 @@ -1,6 +1,13 @@
  
  policy_module(mysql, 1.11.0)
@@ -16562,9 +16459,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  mysql_read_config(mysqld_safe_t)
  mysql_search_pid_files(mysqld_safe_t)
  mysql_write_log(mysqld_safe_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.7.4/policy/modules/services/nagios.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-3.7.4/policy/modules/services/nagios.fc
 --- nsaserefpolicy/policy/modules/services/nagios.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nagios.fc	2009-12-15 15:35:42.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nagios.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,16 +1,52 @@
  /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)
@@ -16623,9 +16520,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/lib(64)?/nagios/plugins/check_ssh       	--      gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
 +/usr/lib(64)?/nagios/plugins/check_tcp		--      gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
 +/usr/lib(64)?/nagios/plugins/check_time		--      gen_context(system_u:object_r:nagios_services_plugin_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.7.4/policy/modules/services/nagios.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.if serefpolicy-3.7.4/policy/modules/services/nagios.if
 --- nsaserefpolicy/policy/modules/services/nagios.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nagios.if	2009-12-15 15:35:42.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nagios.if	2009-12-17 14:26:49.000000000 -0500
 @@ -64,7 +64,7 @@
  
  ########################################
@@ -16781,9 +16678,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.7.4/policy/modules/services/nagios.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-3.7.4/policy/modules/services/nagios.te
 --- nsaserefpolicy/policy/modules/services/nagios.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nagios.te	2009-12-16 08:29:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nagios.te	2009-12-17 14:26:49.000000000 -0500
 @@ -6,17 +6,23 @@
  # Declarations
  #
@@ -17073,9 +16970,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	init_read_utmp(nagios_system_plugin_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.7.4/policy/modules/services/networkmanager.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-3.7.4/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/networkmanager.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/networkmanager.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,12 +1,28 @@
 +/etc/rc\.d/init\.d/wicd		--	gen_context(system_u:object_r:NetworkManager_initrc_exec_t, s0)
 +/etc/NetworkManager/dispatcher\.d(/.*)	gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0)
@@ -17105,9 +17002,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /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.7.4/policy/modules/services/networkmanager.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.if serefpolicy-3.7.4/policy/modules/services/networkmanager.if
 --- nsaserefpolicy/policy/modules/services/networkmanager.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/networkmanager.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/networkmanager.if	2009-12-17 14:26:49.000000000 -0500
 @@ -118,6 +118,24 @@
  
  ########################################
@@ -17184,9 +17081,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	role $2 types NetworkManager_t;
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.7.4/policy/modules/services/networkmanager.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-3.7.4/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/networkmanager.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/networkmanager.te	2009-12-17 14:26:49.000000000 -0500
 @@ -19,6 +19,9 @@
  type NetworkManager_tmp_t;
  files_tmp_file(NetworkManager_tmp_t)
@@ -17428,9 +17325,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.7.4/policy/modules/services/nis.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-3.7.4/policy/modules/services/nis.fc
 --- nsaserefpolicy/policy/modules/services/nis.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nis.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nis.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,4 +1,7 @@
 -
 +/etc/rc\.d/init\.d/ypbind	--	gen_context(system_u:object_r:ypbind_initrc_exec_t,s0)
@@ -17440,9 +17337,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /etc/ypserv\.conf	--	gen_context(system_u:object_r:ypserv_conf_t,s0)
  
  /sbin/ypbind		--	gen_context(system_u:object_r:ypbind_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.7.4/policy/modules/services/nis.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-3.7.4/policy/modules/services/nis.if
 --- nsaserefpolicy/policy/modules/services/nis.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nis.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nis.if	2009-12-17 14:26:49.000000000 -0500
 @@ -28,7 +28,7 @@
  		type var_yp_t;
  	')
@@ -17584,9 +17481,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	role $2 types ypbind_t;
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.7.4/policy/modules/services/nis.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-3.7.4/policy/modules/services/nis.te
 --- nsaserefpolicy/policy/modules/services/nis.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nis.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nis.te	2009-12-17 14:26:49.000000000 -0500
 @@ -13,6 +13,9 @@
  type ypbind_exec_t;
  init_daemon_domain(ypbind_t, ypbind_exec_t)
@@ -17636,9 +17533,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  corenet_tcp_bind_all_rpc_ports(ypxfr_t)
  corenet_udp_bind_all_rpc_ports(ypxfr_t)
  corenet_dontaudit_tcp_bind_all_reserved_ports(ypxfr_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.7.4/policy/modules/services/nscd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-3.7.4/policy/modules/services/nscd.if
 --- nsaserefpolicy/policy/modules/services/nscd.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nscd.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nscd.if	2009-12-17 14:26:49.000000000 -0500
 @@ -121,6 +121,24 @@
  
  ########################################
@@ -17664,9 +17561,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Use NSCD services by mapping the database from
  ##	an inherited NSCD file descriptor.
  ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.7.4/policy/modules/services/nscd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-3.7.4/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/nscd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nscd.te	2009-12-17 14:26:49.000000000 -0500
 @@ -1,10 +1,17 @@
  
 -policy_module(nscd, 1.10.0)
@@ -17711,9 +17608,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	unconfined_dontaudit_rw_packet_sockets(nscd_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nslcd.if serefpolicy-3.7.4/policy/modules/services/nslcd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nslcd.if serefpolicy-3.7.4/policy/modules/services/nslcd.if
 --- nsaserefpolicy/policy/modules/services/nslcd.if	2009-09-09 09:23:16.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nslcd.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nslcd.if	2009-12-17 14:26:49.000000000 -0500
 @@ -94,6 +94,7 @@
  interface(`nslcd_admin',`
  	gen_require(`
@@ -17734,9 +17631,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	manage_lnk_files_pattern($1,nslcd_var_run_t,nslcd_var_run_t)
  ')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntop.fc serefpolicy-3.7.4/policy/modules/services/ntop.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntop.fc serefpolicy-3.7.4/policy/modules/services/ntop.fc
 --- nsaserefpolicy/policy/modules/services/ntop.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ntop.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ntop.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,7 +1,6 @@
  /etc/ntop(/.*)?			gen_context(system_u:object_r:ntop_etc_t,s0)
  
@@ -17745,9 +17642,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  /var/lib/ntop(/.*)?		gen_context(system_u:object_r:ntop_var_lib_t,s0)
  /var/run/ntop\.pid	--	gen_context(system_u:object_r:ntop_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntop.te serefpolicy-3.7.4/policy/modules/services/ntop.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntop.te serefpolicy-3.7.4/policy/modules/services/ntop.te
 --- nsaserefpolicy/policy/modules/services/ntop.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ntop.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ntop.te	2009-12-17 14:26:49.000000000 -0500
 @@ -14,9 +14,6 @@
  type ntop_etc_t;
  files_config_file(ntop_etc_t)
@@ -17822,9 +17719,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	seutil_sigchld_newrole(ntop_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.7.4/policy/modules/services/ntp.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.if serefpolicy-3.7.4/policy/modules/services/ntp.if
 --- nsaserefpolicy/policy/modules/services/ntp.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ntp.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ntp.if	2009-12-17 14:26:49.000000000 -0500
 @@ -37,6 +37,32 @@
  
  ########################################
@@ -17892,9 +17789,9 @@ 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.7.4/policy/modules/services/ntp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-3.7.4/policy/modules/services/ntp.te
 --- nsaserefpolicy/policy/modules/services/ntp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ntp.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ntp.te	2009-12-17 14:26:49.000000000 -0500
 @@ -41,10 +41,11 @@
  
  # sys_resource and setrlimit is for locking memory
@@ -17941,9 +17838,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/nut.fc serefpolicy-3.7.4/policy/modules/services/nut.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.fc serefpolicy-3.7.4/policy/modules/services/nut.fc
 --- nsaserefpolicy/policy/modules/services/nut.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/nut.fc	2009-12-15 15:40:47.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nut.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,16 @@
 +
 +/etc/ups(/.*)?          gen_context(system_u:object_r:nut_conf_t,s0)
@@ -17961,9 +17858,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/www/nut-cgi-bin/upsset\.cgi    --  gen_context(system_u:object_r:httpd_nutups_cgi_script_exec_t,s0)
 +/var/www/nut-cgi-bin/upsstats\.cgi  --  gen_context(system_u:object_r:httpd_nutups_cgi_script_exec_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.if serefpolicy-3.7.4/policy/modules/services/nut.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.if serefpolicy-3.7.4/policy/modules/services/nut.if
 --- nsaserefpolicy/policy/modules/services/nut.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/nut.if	2009-12-15 15:40:52.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nut.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,58 @@
 +## <summary>SELinux policy for NUT - Network UPS Tools </summary>
 +
@@ -18023,9 +17920,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	corecmd_search_bin($1)
 +	domtrans_pattern($1, nut_upsdrvctl_exec_t, nut_upsdrvctl_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.te serefpolicy-3.7.4/policy/modules/services/nut.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nut.te serefpolicy-3.7.4/policy/modules/services/nut.te
 --- nsaserefpolicy/policy/modules/services/nut.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/nut.te	2009-12-15 15:40:40.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nut.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,188 @@
 +
 +policy_module(nut, 1.0.0)
@@ -18215,9 +18112,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/nx.fc serefpolicy-3.7.4/policy/modules/services/nx.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.fc serefpolicy-3.7.4/policy/modules/services/nx.fc
 --- nsaserefpolicy/policy/modules/services/nx.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nx.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nx.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,7 +1,15 @@
  /opt/NX/bin/nxserver		--	gen_context(system_u:object_r:nx_server_exec_t,s0)
  
@@ -18235,9 +18132,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/lib/nxserver(/.*)? 		gen_context(system_u:object_r:nx_server_var_lib_t,s0)
 +
  /usr/libexec/nx/nxserver	--	gen_context(system_u:object_r:nx_server_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.if serefpolicy-3.7.4/policy/modules/services/nx.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.if serefpolicy-3.7.4/policy/modules/services/nx.if
 --- nsaserefpolicy/policy/modules/services/nx.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nx.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nx.if	2009-12-17 14:26:49.000000000 -0500
 @@ -17,3 +17,70 @@
  
  	spec_domtrans_pattern($1, nx_server_exec_t, nx_server_t)
@@ -18309,9 +18206,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	filetrans_pattern($1, nx_server_var_lib_t, $2, $3)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.te serefpolicy-3.7.4/policy/modules/services/nx.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nx.te serefpolicy-3.7.4/policy/modules/services/nx.te
 --- nsaserefpolicy/policy/modules/services/nx.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/nx.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/nx.te	2009-12-17 14:26:49.000000000 -0500
 @@ -25,6 +25,12 @@
  type nx_server_var_run_t;
  files_pid_file(nx_server_var_run_t)
@@ -18346,9 +18243,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  kernel_read_system_state(nx_server_t)
  kernel_read_kernel_sysctls(nx_server_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-3.7.4/policy/modules/services/oddjob.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.if serefpolicy-3.7.4/policy/modules/services/oddjob.if
 --- nsaserefpolicy/policy/modules/services/oddjob.if	2009-07-28 13:28:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/oddjob.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/oddjob.if	2009-12-17 14:26:49.000000000 -0500
 @@ -44,6 +44,7 @@
  	')
  
@@ -18357,9 +18254,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/oddjob.te serefpolicy-3.7.4/policy/modules/services/oddjob.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/oddjob.te serefpolicy-3.7.4/policy/modules/services/oddjob.te
 --- nsaserefpolicy/policy/modules/services/oddjob.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/oddjob.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/oddjob.te	2009-12-17 14:26:49.000000000 -0500
 @@ -100,8 +100,7 @@
  
  # Add/remove user home directories
@@ -18371,9 +18268,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +userdom_manage_user_home_content_dirs(oddjob_mkhomedir_t)
 +userdom_manage_user_home_content(oddjob_mkhomedir_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.7.4/policy/modules/services/openvpn.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-3.7.4/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/openvpn.te	2009-12-16 14:04:12.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/openvpn.te	2009-12-17 14:26:49.000000000 -0500
 @@ -41,7 +41,7 @@
  # openvpn local policy
  #
@@ -18401,9 +18298,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  sysnet_etc_filetrans_config(openvpn_t)
  
  userdom_use_user_terminals(openvpn_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.if serefpolicy-3.7.4/policy/modules/services/pcscd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.if serefpolicy-3.7.4/policy/modules/services/pcscd.if
 --- nsaserefpolicy/policy/modules/services/pcscd.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/pcscd.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/pcscd.if	2009-12-17 14:26:49.000000000 -0500
 @@ -39,6 +39,44 @@
  
  ########################################
@@ -18457,9 +18354,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	allow $1 pcscd_t:unix_stream_socket connectto;
 +	stream_connect_pattern($1, pcscd_var_run_t, pcscd_var_run_t, pcscd_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.7.4/policy/modules/services/pcscd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-3.7.4/policy/modules/services/pcscd.te
 --- nsaserefpolicy/policy/modules/services/pcscd.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/pcscd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/pcscd.te	2009-12-17 14:26:49.000000000 -0500
 @@ -29,6 +29,7 @@
  
  manage_dirs_pattern(pcscd_t, pcscd_var_run_t, pcscd_var_run_t)
@@ -18484,9 +18381,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  term_use_unallocated_ttys(pcscd_t)
  term_dontaudit_getattr_pty_dirs(pcscd_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.7.4/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-3.7.4/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/pegasus.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/pegasus.te	2009-12-17 14:26:49.000000000 -0500
 @@ -30,7 +30,7 @@
  # Local policy
  #
@@ -18558,18 +18455,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	xen_stream_connect(pegasus_t)
 +	xen_stream_connect_xenstore(pegasus_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.fc serefpolicy-3.7.4/policy/modules/services/plymouth.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.fc serefpolicy-3.7.4/policy/modules/services/plymouth.fc
 --- nsaserefpolicy/policy/modules/services/plymouth.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/plymouth.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/plymouth.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,5 @@
 +/sbin/plymouthd				--	gen_context(system_u:object_r:plymouthd_exec_t, s0)
 +/bin/plymouth				--	gen_context(system_u:object_r:plymouth_exec_t, s0)
 +/var/spool/plymouth(/.*)?			gen_context(system_u:object_r:plymouthd_spool_t, s0)
 +/var/lib/plymouth(/.*)?				gen_context(system_u:object_r:plymouthd_var_lib_t, s0)
 +/var/run/plymouth(/.*)?				gen_context(system_u:object_r:plymouthd_var_run_t, s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.if serefpolicy-3.7.4/policy/modules/services/plymouth.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.if serefpolicy-3.7.4/policy/modules/services/plymouth.if
 --- nsaserefpolicy/policy/modules/services/plymouth.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/plymouth.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/plymouth.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,304 @@
 +## <summary>policy for plymouthd</summary>
 +
@@ -18875,9 +18772,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	allow $1 plymouthd_t:unix_stream_socket connectto;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.te serefpolicy-3.7.4/policy/modules/services/plymouth.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/plymouth.te serefpolicy-3.7.4/policy/modules/services/plymouth.te
 --- nsaserefpolicy/policy/modules/services/plymouth.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/plymouth.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/plymouth.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,102 @@
 +policy_module(plymouthd, 1.0.0)
 +
@@ -18981,9 +18878,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	hal_dontaudit_rw_pipes(plymouth_t)
 +')
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.fc serefpolicy-3.7.4/policy/modules/services/policykit.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.fc serefpolicy-3.7.4/policy/modules/services/policykit.fc
 --- nsaserefpolicy/policy/modules/services/policykit.fc	2009-08-18 11:41:14.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/policykit.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/policykit.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -6,10 +6,13 @@
  /usr/libexec/polkit-read-auth-helper	--	gen_context(system_u:object_r:policykit_auth_exec_t,s0)
  /usr/libexec/polkit-grant-helper.*	--	gen_context(system_u:object_r:policykit_grant_exec_t,s0)
@@ -18999,9 +18896,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/lib/PolicyKit-public(/.*)?			gen_context(system_u:object_r:policykit_var_lib_t,s0)
  /var/run/PolicyKit(/.*)?			gen_context(system_u:object_r:policykit_var_run_t,s0)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.if serefpolicy-3.7.4/policy/modules/services/policykit.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.if serefpolicy-3.7.4/policy/modules/services/policykit.if
 --- nsaserefpolicy/policy/modules/services/policykit.if	2009-08-18 18:39:50.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/policykit.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/policykit.if	2009-12-17 14:26:49.000000000 -0500
 @@ -17,12 +17,37 @@
  		class dbus send_msg;
  	')
@@ -19098,9 +18995,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	allow $1 policykit_auth_t:process signal;
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.te serefpolicy-3.7.4/policy/modules/services/policykit.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/policykit.te serefpolicy-3.7.4/policy/modules/services/policykit.te
 --- nsaserefpolicy/policy/modules/services/policykit.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/policykit.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/policykit.te	2009-12-17 14:26:49.000000000 -0500
 @@ -36,11 +36,12 @@
  # policykit local policy
  #
@@ -19253,9 +19150,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow policykit_resolve_t self:unix_dgram_socket create_socket_perms;
  allow policykit_resolve_t self:unix_stream_socket create_stream_socket_perms;
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.te serefpolicy-3.7.4/policy/modules/services/portreserve.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portreserve.te serefpolicy-3.7.4/policy/modules/services/portreserve.te
 --- nsaserefpolicy/policy/modules/services/portreserve.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/portreserve.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/portreserve.te	2009-12-17 14:26:49.000000000 -0500
 @@ -21,6 +21,7 @@
  # Portreserve local policy
  #
@@ -19264,9 +19161,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow portreserve_t self:fifo_file rw_fifo_file_perms;
  allow portreserve_t self:unix_stream_socket create_stream_socket_perms;
  allow portreserve_t self:unix_dgram_socket { create_socket_perms sendto };
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.7.4/policy/modules/services/postfix.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.fc serefpolicy-3.7.4/policy/modules/services/postfix.fc
 --- nsaserefpolicy/policy/modules/services/postfix.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/postfix.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/postfix.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -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)
@@ -19280,9 +19177,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.7.4/policy/modules/services/postfix.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-3.7.4/policy/modules/services/postfix.if
 --- nsaserefpolicy/policy/modules/services/postfix.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/postfix.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/postfix.if	2009-12-17 14:26:49.000000000 -0500
 @@ -46,6 +46,7 @@
  
  	allow postfix_$1_t postfix_etc_t:dir list_dir_perms;
@@ -19529,9 +19426,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	role $2 types postfix_postdrop_t;
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.7.4/policy/modules/services/postfix.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.7.4/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/postfix.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/postfix.te	2009-12-17 14:26:49.000000000 -0500
 @@ -6,6 +6,15 @@
  # Declarations
  #
@@ -19924,9 +19821,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +userdom_manage_user_home_content(postfix_virtual_t)
 +userdom_home_filetrans_user_home_dir(postfix_virtual_t)
 +userdom_user_home_dir_filetrans_user_home_content(postfix_virtual_t, {file dir })
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.7.4/policy/modules/services/postgresql.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.fc serefpolicy-3.7.4/policy/modules/services/postgresql.fc
 --- nsaserefpolicy/policy/modules/services/postgresql.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/postgresql.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/postgresql.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -2,6 +2,8 @@
  # /etc
  #
@@ -19964,9 +19861,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/postgresql(/.*)?		gen_context(system_u:object_r:postgresql_var_run_t,s0)
 +
 +/var/run/postmaster.*			gen_context(system_u:object_r:postgresql_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.7.4/policy/modules/services/postgresql.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.if serefpolicy-3.7.4/policy/modules/services/postgresql.if
 --- nsaserefpolicy/policy/modules/services/postgresql.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/postgresql.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/postgresql.if	2009-12-17 14:26:49.000000000 -0500
 @@ -384,3 +384,46 @@
  
  	typeattribute $1 sepgsql_unconfined_type;
@@ -20014,9 +19911,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.7.4/policy/modules/services/postgresql.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgresql.te serefpolicy-3.7.4/policy/modules/services/postgresql.te
 --- nsaserefpolicy/policy/modules/services/postgresql.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/postgresql.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/postgresql.te	2009-12-17 14:26:49.000000000 -0500
 @@ -32,6 +32,9 @@
  type postgresql_etc_t;
  files_config_file(postgresql_etc_t)
@@ -20061,9 +19958,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  miscfiles_read_localization(postgresql_t)
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.7.4/policy/modules/services/ppp.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.if serefpolicy-3.7.4/policy/modules/services/ppp.if
 --- nsaserefpolicy/policy/modules/services/ppp.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ppp.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ppp.if	2009-12-17 14:26:49.000000000 -0500
 @@ -177,10 +177,16 @@
  interface(`ppp_run',`
  	gen_require(`
@@ -20081,9 +19978,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/ppp.te serefpolicy-3.7.4/policy/modules/services/ppp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-3.7.4/policy/modules/services/ppp.te
 --- nsaserefpolicy/policy/modules/services/ppp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ppp.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ppp.te	2009-12-17 14:26:49.000000000 -0500
 @@ -38,7 +38,7 @@
  files_type(pppd_etc_rw_t)
  
@@ -20135,9 +20032,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	hostname_exec(pptp_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.7.4/policy/modules/services/prelude.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelude.te serefpolicy-3.7.4/policy/modules/services/prelude.te
 --- nsaserefpolicy/policy/modules/services/prelude.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/prelude.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/prelude.te	2009-12-17 14:26:49.000000000 -0500
 @@ -122,7 +122,8 @@
  #
  # prelude_audisp local policy
@@ -20148,9 +20045,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  allow prelude_audisp_t self:fifo_file rw_file_perms;
  allow prelude_audisp_t self:unix_stream_socket create_stream_socket_perms;
  allow prelude_audisp_t self:unix_dgram_socket create_socket_perms;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.fc serefpolicy-3.7.4/policy/modules/services/privoxy.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.fc serefpolicy-3.7.4/policy/modules/services/privoxy.fc
 --- nsaserefpolicy/policy/modules/services/privoxy.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/privoxy.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/privoxy.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,6 +1,5 @@
  
 -/etc/privoxy/user\.action --	gen_context(system_u:object_r:privoxy_etc_rw_t,s0)
@@ -20159,9 +20056,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /etc/rc\.d/init\.d/privoxy --	gen_context(system_u:object_r:privoxy_initrc_exec_t,s0)
  
  /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.te serefpolicy-3.7.4/policy/modules/services/privoxy.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-3.7.4/policy/modules/services/privoxy.te
 --- nsaserefpolicy/policy/modules/services/privoxy.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/privoxy.te	2009-12-15 16:09:20.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/privoxy.te	2009-12-17 14:26:49.000000000 -0500
 @@ -47,9 +47,8 @@
  manage_files_pattern(privoxy_t, privoxy_var_run_t, privoxy_var_run_t)
  files_pid_filetrans(privoxy_t, privoxy_var_run_t, file)
@@ -20173,9 +20070,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  corenet_all_recvfrom_unlabeled(privoxy_t)
  corenet_all_recvfrom_netlabel(privoxy_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.7.4/policy/modules/services/procmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-3.7.4/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/procmail.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/procmail.te	2009-12-17 14:26:49.000000000 -0500
 @@ -22,7 +22,7 @@
  # Local policy
  #
@@ -20223,9 +20120,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/pyzor.fc serefpolicy-3.7.4/policy/modules/services/pyzor.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.fc serefpolicy-3.7.4/policy/modules/services/pyzor.fc
 --- nsaserefpolicy/policy/modules/services/pyzor.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/pyzor.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/pyzor.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,6 +1,10 @@
  /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)
@@ -20237,9 +20134,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.7.4/policy/modules/services/pyzor.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-3.7.4/policy/modules/services/pyzor.if
 --- nsaserefpolicy/policy/modules/services/pyzor.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/pyzor.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/pyzor.if	2009-12-17 14:26:49.000000000 -0500
 @@ -88,3 +88,50 @@
  	corecmd_search_bin($1)
  	can_exec($1, pyzor_exec_t)
@@ -20291,9 +20188,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.7.4/policy/modules/services/pyzor.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-3.7.4/policy/modules/services/pyzor.te
 --- nsaserefpolicy/policy/modules/services/pyzor.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/pyzor.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/pyzor.te	2009-12-17 14:26:49.000000000 -0500
 @@ -6,6 +6,38 @@
  # Declarations
  #
@@ -20358,9 +20255,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  userdom_dontaudit_search_user_home_dirs(pyzor_t)
  
  optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-3.7.4/policy/modules/services/radvd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-3.7.4/policy/modules/services/radvd.te
 --- nsaserefpolicy/policy/modules/services/radvd.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/radvd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/radvd.te	2009-12-17 14:26:49.000000000 -0500
 @@ -41,6 +41,7 @@
  kernel_rw_net_sysctls(radvd_t)
  kernel_read_network_state(radvd_t)
@@ -20369,17 +20266,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  corenet_all_recvfrom_unlabeled(radvd_t)
  corenet_all_recvfrom_netlabel(radvd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.7.4/policy/modules/services/razor.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.fc serefpolicy-3.7.4/policy/modules/services/razor.fc
 --- nsaserefpolicy/policy/modules/services/razor.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/razor.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/razor.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,3 +1,4 @@
 +/root/\.razor(/.*)?		gen_context(system_u:object_r: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.7.4/policy/modules/services/razor.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-3.7.4/policy/modules/services/razor.if
 --- nsaserefpolicy/policy/modules/services/razor.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/razor.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/razor.if	2009-12-17 14:26:49.000000000 -0500
 @@ -157,3 +157,45 @@
  
  	domtrans_pattern($1, razor_exec_t, razor_t)
@@ -20426,9 +20323,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.7.4/policy/modules/services/razor.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-3.7.4/policy/modules/services/razor.te
 --- nsaserefpolicy/policy/modules/services/razor.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/razor.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/razor.te	2009-12-17 14:26:49.000000000 -0500
 @@ -6,6 +6,32 @@
  # Declarations
  #
@@ -20480,9 +20377,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/rgmanager.fc serefpolicy-3.7.4/policy/modules/services/rgmanager.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.fc serefpolicy-3.7.4/policy/modules/services/rgmanager.fc
 --- nsaserefpolicy/policy/modules/services/rgmanager.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/rgmanager.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rgmanager.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,8 @@
 +
 +/usr/sbin/rgmanager                    --      gen_context(system_u:object_r:rgmanager_exec_t,s0)
@@ -20492,9 +20389,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/run/rgmanager\.pid                --      gen_context(system_u:object_r:rgmanager_var_run_t,s0)
 +
 +/var/run/cluster/rgmanager\.sk        -s      gen_context(system_u:object_r:rgmanager_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.if serefpolicy-3.7.4/policy/modules/services/rgmanager.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.if serefpolicy-3.7.4/policy/modules/services/rgmanager.if
 --- nsaserefpolicy/policy/modules/services/rgmanager.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/rgmanager.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rgmanager.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,59 @@
 +## <summary>SELinux policy for rgmanager</summary>
 +
@@ -20555,9 +20452,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	stream_connect_pattern($1, rgmanager_var_run_t, rgmanager_var_run_t, rgmanager_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.te serefpolicy-3.7.4/policy/modules/services/rgmanager.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rgmanager.te serefpolicy-3.7.4/policy/modules/services/rgmanager.te
 --- nsaserefpolicy/policy/modules/services/rgmanager.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/rgmanager.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rgmanager.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,83 @@
 +
 +policy_module(rgmanager,1.0.0)
@@ -20642,9 +20539,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	ccs_stream_connect(rgmanager_t)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.fc serefpolicy-3.7.4/policy/modules/services/rhcs.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.fc serefpolicy-3.7.4/policy/modules/services/rhcs.fc
 --- nsaserefpolicy/policy/modules/services/rhcs.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/rhcs.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rhcs.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,22 @@
 +
 +/sbin/dlm_controld                     --      gen_context(system_u:object_r:dlm_controld_exec_t,s0)
@@ -20668,9 +20565,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/lib/qdiskd(/.*)?                          gen_context(system_u:object_r:qdiskd_var_lib_t,s0)
 +/var/log/cluster/qdiskd\.log.*         --      gen_context(system_u:object_r:qdiskd_var_log_t,s0)
 +/var/run/qdiskd\.pid                   --      gen_context(system_u:object_r:qdiskd_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.if serefpolicy-3.7.4/policy/modules/services/rhcs.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.if serefpolicy-3.7.4/policy/modules/services/rhcs.if
 --- nsaserefpolicy/policy/modules/services/rhcs.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/rhcs.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rhcs.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,348 @@
 +## <summary>SELinux policy for RHCS - Red Hat Cluster Suite </summary>
 +
@@ -21020,9 +20917,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/rhcs.te serefpolicy-3.7.4/policy/modules/services/rhcs.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhcs.te serefpolicy-3.7.4/policy/modules/services/rhcs.te
 --- nsaserefpolicy/policy/modules/services/rhcs.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/rhcs.te	2009-12-15 15:39:36.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rhcs.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,398 @@
 +
 +policy_module(rhcs,1.0.0)
@@ -21422,9 +21319,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/ricci.te serefpolicy-3.7.4/policy/modules/services/ricci.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-3.7.4/policy/modules/services/ricci.te
 --- nsaserefpolicy/policy/modules/services/ricci.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ricci.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ricci.te	2009-12-17 14:26:49.000000000 -0500
 @@ -194,10 +194,13 @@
  # ricci_modcluster local policy
  #
@@ -21514,9 +21411,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	ccs_stream_connect(ricci_modstorage_t)
  	ccs_read_config(ricci_modstorage_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.7.4/policy/modules/services/rpcbind.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.if serefpolicy-3.7.4/policy/modules/services/rpcbind.if
 --- nsaserefpolicy/policy/modules/services/rpcbind.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/rpcbind.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rpcbind.if	2009-12-17 14:26:49.000000000 -0500
 @@ -97,6 +97,26 @@
  
  ########################################
@@ -21544,9 +21441,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	All of the rules required to administrate 
  ##	an rpcbind environment
  ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.7.4/policy/modules/services/rpcbind.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpcbind.te serefpolicy-3.7.4/policy/modules/services/rpcbind.te
 --- nsaserefpolicy/policy/modules/services/rpcbind.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/rpcbind.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rpcbind.te	2009-12-17 14:26:49.000000000 -0500
 @@ -42,6 +42,7 @@
  
  kernel_read_system_state(rpcbind_t)
@@ -21555,9 +21452,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  corenet_all_recvfrom_unlabeled(rpcbind_t)
  corenet_all_recvfrom_netlabel(rpcbind_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.7.4/policy/modules/services/rpc.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.if serefpolicy-3.7.4/policy/modules/services/rpc.if
 --- nsaserefpolicy/policy/modules/services/rpc.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/rpc.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rpc.if	2009-12-17 14:26:49.000000000 -0500
 @@ -54,7 +54,7 @@
  	allow $1_t self:unix_dgram_socket create_socket_perms;
  	allow $1_t self:unix_stream_socket create_stream_socket_perms;
@@ -21586,9 +21483,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  		seutil_sigchld_newrole($1_t)
  	')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.7.4/policy/modules/services/rpc.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-3.7.4/policy/modules/services/rpc.te
 --- nsaserefpolicy/policy/modules/services/rpc.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/rpc.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rpc.te	2009-12-17 14:26:49.000000000 -0500
 @@ -53,7 +53,8 @@
  # RPC local policy
  #
@@ -21678,9 +21575,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/rsync.te serefpolicy-3.7.4/policy/modules/services/rsync.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-3.7.4/policy/modules/services/rsync.te
 --- nsaserefpolicy/policy/modules/services/rsync.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/rsync.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rsync.te	2009-12-17 14:26:49.000000000 -0500
 @@ -8,6 +8,13 @@
  
  ## <desc>
@@ -21723,9 +21620,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
  auth_can_read_shadow_passwords(rsync_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rtkit.if serefpolicy-3.7.4/policy/modules/services/rtkit.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rtkit.if serefpolicy-3.7.4/policy/modules/services/rtkit.if
 --- nsaserefpolicy/policy/modules/services/rtkit.if	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/rtkit.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rtkit.if	2009-12-17 14:26:49.000000000 -0500
 @@ -38,3 +38,23 @@
  	allow $1 rtkit_daemon_t:dbus send_msg;
  	allow rtkit_daemon_t $1:dbus send_msg;
@@ -21750,9 +21647,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow rtkit_daemon_t $1:process { getsched setsched };
 +	rtkit_daemon_dbus_chat($1)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rtkit.te serefpolicy-3.7.4/policy/modules/services/rtkit.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rtkit.te serefpolicy-3.7.4/policy/modules/services/rtkit.te
 --- nsaserefpolicy/policy/modules/services/rtkit.te	2009-09-16 09:09:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/rtkit.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/rtkit.te	2009-12-17 14:26:49.000000000 -0500
 @@ -17,9 +17,11 @@
  
  allow rtkit_daemon_t self:capability { dac_read_search setuid sys_chroot setgid sys_nice sys_ptrace };
@@ -21774,9 +21671,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  optional_policy(`
  	policykit_dbus_chat(rtkit_daemon_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.7.4/policy/modules/services/samba.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.fc serefpolicy-3.7.4/policy/modules/services/samba.fc
 --- nsaserefpolicy/policy/modules/services/samba.fc	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/samba.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/samba.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -51,3 +51,7 @@
  /var/run/winbindd(/.*)?			gen_context(system_u:object_r:winbind_var_run_t,s0)
  
@@ -21785,9 +21682,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.7.4/policy/modules/services/samba.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-3.7.4/policy/modules/services/samba.if
 --- nsaserefpolicy/policy/modules/services/samba.if	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/samba.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/samba.if	2009-12-17 14:26:49.000000000 -0500
 @@ -62,6 +62,25 @@
  
  ########################################
@@ -21960,9 +21857,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	admin_pattern($1, winbind_var_run_t)
 +	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.7.4/policy/modules/services/samba.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-3.7.4/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/samba.te	2009-12-15 15:41:43.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/samba.te	2009-12-17 14:26:49.000000000 -0500
 @@ -66,6 +66,13 @@
  ## </desc>
  gen_tunable(samba_share_nfs, false)
@@ -22203,9 +22100,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +',`
 +	can_exec(smbd_t, samba_unconfined_script_exec_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.7.4/policy/modules/services/sasl.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-3.7.4/policy/modules/services/sasl.te
 --- nsaserefpolicy/policy/modules/services/sasl.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/sasl.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/sasl.te	2009-12-17 14:26:49.000000000 -0500
 @@ -31,7 +31,7 @@
  # Local policy
  #
@@ -22268,9 +22165,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.7.4/policy/modules/services/sendmail.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-3.7.4/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/sendmail.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/sendmail.if	2009-12-17 14:26:49.000000000 -0500
 @@ -59,20 +59,20 @@
  
  ########################################
@@ -22443,9 +22340,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.7.4/policy/modules/services/sendmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-3.7.4/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/sendmail.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/sendmail.te	2009-12-17 14:26:49.000000000 -0500
 @@ -20,13 +20,17 @@
  mta_mailserver_delivery(sendmail_t)
  mta_mailserver_sender(sendmail_t)
@@ -22621,18 +22518,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.7.4/policy/modules/services/setroubleshoot.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-3.7.4/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/setroubleshoot.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/setroubleshoot.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -5,3 +5,5 @@
  /var/log/setroubleshoot(/.*)?		gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
  
  /var/lib/setroubleshoot(/.*)?		gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 +
 +/usr/share/setroubleshoot/SetroubleshootFixit\.py* 	--	gen_context(system_u:object_r:setroubleshoot_fixit_exec_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.7.4/policy/modules/services/setroubleshoot.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-3.7.4/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/setroubleshoot.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/setroubleshoot.if	2009-12-17 14:26:49.000000000 -0500
 @@ -16,8 +16,8 @@
  	')
  
@@ -22770,9 +22667,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.7.4/policy/modules/services/setroubleshoot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-3.7.4/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/setroubleshoot.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/setroubleshoot.te	2009-12-17 14:26:49.000000000 -0500
 @@ -22,13 +22,19 @@
  type setroubleshoot_var_run_t;
  files_pid_file(setroubleshoot_var_run_t)
@@ -22914,9 +22811,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +        policykit_dbus_chat(setroubleshoot_fixit_t)
 +	userdom_read_all_users_state(setroubleshoot_fixit_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.7.4/policy/modules/services/smartmon.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-3.7.4/policy/modules/services/smartmon.te
 --- nsaserefpolicy/policy/modules/services/smartmon.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/smartmon.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/smartmon.te	2009-12-17 14:26:49.000000000 -0500
 @@ -19,14 +19,18 @@
  type fsdaemon_tmp_t;
  files_tmp_file(fsdaemon_tmp_t)
@@ -22977,9 +22874,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.if serefpolicy-3.7.4/policy/modules/services/snmp.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-3.7.4/policy/modules/services/snmp.if
 --- nsaserefpolicy/policy/modules/services/snmp.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/snmp.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/snmp.if	2009-12-17 14:26:49.000000000 -0500
 @@ -50,6 +50,24 @@
  
  ########################################
@@ -23032,9 +22929,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
  ## <summary>
  ##	All of the rules required to administrate 
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.7.4/policy/modules/services/snmp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-3.7.4/policy/modules/services/snmp.te
 --- nsaserefpolicy/policy/modules/services/snmp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/snmp.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/snmp.te	2009-12-17 14:26:49.000000000 -0500
 @@ -27,7 +27,7 @@
  #
  allow snmpd_t self:capability { dac_override kill ipc_lock sys_ptrace net_admin sys_nice sys_tty_config };
@@ -23053,9 +22950,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  dev_list_sysfs(snmpd_t)
  dev_read_sysfs(snmpd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.te serefpolicy-3.7.4/policy/modules/services/snort.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snort.te serefpolicy-3.7.4/policy/modules/services/snort.te
 --- nsaserefpolicy/policy/modules/services/snort.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/snort.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/snort.te	2009-12-17 14:26:49.000000000 -0500
 @@ -37,6 +37,7 @@
  allow snort_t self:tcp_socket create_stream_socket_perms;
  allow snort_t self:udp_socket create_socket_perms;
@@ -23064,9 +22961,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  # Snort IPS node. unverified.
  allow snort_t self:netlink_firewall_socket { bind create getattr };
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.7.4/policy/modules/services/spamassassin.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.fc serefpolicy-3.7.4/policy/modules/services/spamassassin.fc
 --- nsaserefpolicy/policy/modules/services/spamassassin.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/spamassassin.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/spamassassin.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,15 +1,26 @@
 -HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamassassin_home_t,s0)
 +HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamc_home_t,s0)
@@ -23096,9 +22993,9 @@ 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_var_run_t,s0)
 +/var/spool/MIMEDefang(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.7.4/policy/modules/services/spamassassin.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-3.7.4/policy/modules/services/spamassassin.if
 --- nsaserefpolicy/policy/modules/services/spamassassin.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/spamassassin.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/spamassassin.if	2009-12-17 14:26:49.000000000 -0500
 @@ -111,6 +111,27 @@
  	')
  
@@ -23207,9 +23104,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_list_pids($1)
 +	admin_pattern($1, spamd_var_run_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.7.4/policy/modules/services/spamassassin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-3.7.4/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/spamassassin.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/spamassassin.te	2009-12-17 14:26:49.000000000 -0500
 @@ -20,6 +20,35 @@
  ## </desc>
  gen_tunable(spamd_enable_home_dirs, true)
@@ -23512,9 +23409,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
  	udev_read_db(spamd_t)
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.7.4/policy/modules/services/squid.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-3.7.4/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/squid.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/squid.te	2009-12-17 14:26:49.000000000 -0500
 @@ -67,7 +67,9 @@
  
  can_exec(squid_t, squid_exec_t)
@@ -23543,18 +23440,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.7.4/policy/modules/services/ssh.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.fc serefpolicy-3.7.4/policy/modules/services/ssh.fc
 --- nsaserefpolicy/policy/modules/services/ssh.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ssh.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ssh.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -14,3 +14,5 @@
  /usr/sbin/sshd			--	gen_context(system_u:object_r:sshd_exec_t,s0)
  
  /var/run/sshd\.init\.pid	--	gen_context(system_u:object_r:sshd_var_run_t,s0)
 +
 +/root/\.ssh(/.*)?			gen_context(system_u:object_r:home_ssh_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.7.4/policy/modules/services/ssh.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-3.7.4/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2009-07-23 14:11:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ssh.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ssh.if	2009-12-17 14:26:49.000000000 -0500
 @@ -36,6 +36,7 @@
  	gen_require(`
  		attribute ssh_server;
@@ -23902,9 +23799,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	files_search_pids($1)
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.7.4/policy/modules/services/ssh.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-3.7.4/policy/modules/services/ssh.te
 --- nsaserefpolicy/policy/modules/services/ssh.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/ssh.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/ssh.te	2009-12-17 14:26:49.000000000 -0500
 @@ -8,6 +8,31 @@
  
  ## <desc>
@@ -24191,9 +24088,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +    fs_manage_cifs_dirs(sftpd_t)
 +    fs_manage_cifs_files(sftpd_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.fc serefpolicy-3.7.4/policy/modules/services/sssd.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.fc serefpolicy-3.7.4/policy/modules/services/sssd.fc
 --- nsaserefpolicy/policy/modules/services/sssd.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/sssd.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/sssd.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,6 +1,9 @@
 -/etc/rc.d/init.d/sssd	--	gen_context(system_u:object_r:sssd_initrc_exec_t,s0)
 +/etc/rc\.d/init\.d/sssd	--	gen_context(system_u:object_r:sssd_initrc_exec_t,s0)
@@ -24205,9 +24102,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/log/sssd(/.*)?		gen_context(system_u:object_r:sssd_var_lib_t,s0)
 +
  /var/run/sssd.pid	--	gen_context(system_u:object_r:sssd_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.if serefpolicy-3.7.4/policy/modules/services/sssd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.if serefpolicy-3.7.4/policy/modules/services/sssd.if
 --- nsaserefpolicy/policy/modules/services/sssd.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/sssd.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/sssd.if	2009-12-17 14:26:49.000000000 -0500
 @@ -12,12 +12,32 @@
  #
  interface(`sssd_domtrans',`
@@ -24296,9 +24193,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Send and receive messages from
  ##	sssd over dbus.
  ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.7.4/policy/modules/services/sssd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sssd.te serefpolicy-3.7.4/policy/modules/services/sssd.te
 --- nsaserefpolicy/policy/modules/services/sssd.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/sssd.te	2009-12-16 11:14:38.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/sssd.te	2009-12-17 14:26:49.000000000 -0500
 @@ -16,6 +16,9 @@
  type sssd_var_lib_t;
  files_type(sssd_var_lib_t)
@@ -24354,9 +24251,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  optional_policy(`
  	dbus_system_bus_client(sssd_t)
  	dbus_connect_system_bus(sssd_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-3.7.4/policy/modules/services/sysstat.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sysstat.te serefpolicy-3.7.4/policy/modules/services/sysstat.te
 --- nsaserefpolicy/policy/modules/services/sysstat.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/sysstat.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/sysstat.te	2009-12-17 14:26:49.000000000 -0500
 @@ -19,14 +19,15 @@
  # Local policy
  #
@@ -24375,18 +24272,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  logging_log_filetrans(sysstat_t, sysstat_log_t, { file dir })
  
  # get info from /proc
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-3.7.4/policy/modules/services/tftp.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.fc serefpolicy-3.7.4/policy/modules/services/tftp.fc
 --- nsaserefpolicy/policy/modules/services/tftp.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/tftp.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/tftp.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -5,4 +5,4 @@
  /tftpboot		-d	gen_context(system_u:object_r:tftpdir_t,s0)
  /tftpboot/.*			gen_context(system_u:object_r:tftpdir_t,s0)
  
 -/var/lib/tftpboot(/.*)?		gen_context(system_u:object_r:tftpdir_t,s0)
 +/var/lib/tftpboot(/.*)?		gen_context(system_u:object_r:tftpdir_rw_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tgtd.if serefpolicy-3.7.4/policy/modules/services/tgtd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tgtd.if serefpolicy-3.7.4/policy/modules/services/tgtd.if
 --- nsaserefpolicy/policy/modules/services/tgtd.if	2009-11-12 12:51:51.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/tgtd.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/tgtd.if	2009-12-17 14:26:49.000000000 -0500
 @@ -9,3 +9,20 @@
  ##	</p>
  ## </desc>
@@ -24408,9 +24305,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +        allow $1 tgtd_t:sem { rw_sem_perms };
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.te serefpolicy-3.7.4/policy/modules/services/tor.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.te serefpolicy-3.7.4/policy/modules/services/tor.te
 --- nsaserefpolicy/policy/modules/services/tor.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/tor.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/tor.te	2009-12-17 14:26:49.000000000 -0500
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -24442,9 +24339,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +tunable_policy(`tor_bind_all_unreserved_ports', `
 +	corenet_tcp_bind_all_unreserved_ports(tor_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tuned.te serefpolicy-3.7.4/policy/modules/services/tuned.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tuned.te serefpolicy-3.7.4/policy/modules/services/tuned.te
 --- nsaserefpolicy/policy/modules/services/tuned.te	2009-11-12 12:51:51.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/tuned.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/tuned.te	2009-12-17 14:26:49.000000000 -0500
 @@ -16,12 +16,14 @@
  type tuned_var_run_t;
  files_pid_file(tuned_var_run_t)
@@ -24461,294 +24358,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  manage_files_pattern(tuned_t, tuned_var_run_t, tuned_var_run_t)
  files_pid_filetrans(tuned_t, tuned_var_run_t, file)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/u serefpolicy-3.7.4/policy/modules/services/u
---- nsaserefpolicy/policy/modules/services/u	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/u	2009-12-15 17:01:58.000000000 -0500
-@@ -0,0 +1,6 @@
-+
-+/usr/libexec/udisks-daemon	--	gen_context(system_u:object_r:udisks_daemon_exec_t,s0)
-+
-+/var/lib/udisks(/.*)?			gen_context(system_u:object_r:udisks_daemon_var_lib_t,s0)
-+
-+/var/run/udisks(/.*)?			gen_context(system_u:object_r:udisks_daemon_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/udisks.fc serefpolicy-3.7.4/policy/modules/services/udisks.fc
---- nsaserefpolicy/policy/modules/services/udisks.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/udisks.fc	2009-12-15 17:04:41.000000000 -0500
-@@ -0,0 +1,5 @@
-+/usr/libexec/udisks-daemon	--	gen_context(system_u:object_r:udisks_daemon_exec_t,s0)
-+
-+/var/lib/udisks(/.*)?			gen_context(system_u:object_r:udisks_daemon_var_lib_t,s0)
-+
-+/var/run/udisks(/.*)?			gen_context(system_u:object_r:udisks_daemon_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/udisks.if serefpolicy-3.7.4/policy/modules/services/udisks.if
---- nsaserefpolicy/policy/modules/services/udisks.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/udisks.if	2009-12-15 17:04:23.000000000 -0500
-@@ -0,0 +1,192 @@
-+
-+## <summary>policy for udisks</summary>
-+
-+########################################
-+## <summary>
-+##	Execute a domain transition to run udisks.
-+## </summary>
-+## <param name="domain">
-+## <summary>
-+##	Domain allowed to transition.
-+## </summary>
-+## </param>
-+#
-+interface(`udisks_domtrans',`
-+	gen_require(`
-+		type udisks_daemon_t, udisks_daemon_exec_t;
-+	')
-+
-+	domtrans_pattern($1, udisks_daemon_exec_t, udisks_daemon_t)
-+')
-+
-+
-+########################################
-+## <summary>
-+##	Read udisks PID files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`udisks_read_pid_files',`
-+	gen_require(`
-+		type udisks_daemon_var_run_t;
-+	')
-+
-+	files_search_pids($1)
-+	allow $1 udisks_daemon_var_run_t:file read_file_perms;
-+')
-+
-+########################################
-+## <summary>
-+##	Manage udisks var_run files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`udisks_manage_var_run',`
-+	gen_require(`
-+		type udisks_daemon_var_run_t;
-+	')
-+
-+         manage_dirs_pattern($1, udisks_daemon_var_run_t, udisks_daemon_var_run_t)
-+         manage_files_pattern($1, udisks_daemon_var_run_t, udisks_daemon_var_run_t)
-+         manage_lnk_files_pattern($1, udisks_daemon_var_run_t, udisks_daemon_var_run_t)
-+')
-+
-+
-+########################################
-+## <summary>
-+##	Search udisks lib directories.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`udisks_search_lib',`
-+	gen_require(`
-+		type udisks_daemon_var_lib_t;
-+	')
-+
-+	allow $1 udisks_daemon_var_lib_t:dir search_dir_perms;
-+	files_search_var_lib($1)
-+')
-+
-+########################################
-+## <summary>
-+##	Read udisks lib files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`udisks_read_lib_files',`
-+	gen_require(`
-+		type udisks_daemon_var_lib_t;
-+	')
-+
-+	files_search_var_lib($1)
-+        read_files_pattern($1, udisks_daemon_var_lib_t, udisks_daemon_var_lib_t)
-+')
-+
-+########################################
-+## <summary>
-+##	Create, read, write, and delete
-+##	udisks lib files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`udisks_manage_lib_files',`
-+	gen_require(`
-+		type udisks_daemon_var_lib_t;
-+	')
-+
-+	files_search_var_lib($1)
-+        manage_files_pattern($1, udisks_daemon_var_lib_t,  udisks_daemon_var_lib_t)
-+')
-+
-+########################################
-+## <summary>
-+##	Manage udisks var_lib files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`udisks_manage_var_lib',`
-+	gen_require(`
-+		type udisks_daemon_var_lib_t;
-+	')
-+
-+         manage_dirs_pattern($1, udisks_daemon_var_lib_t, udisks_daemon_var_lib_t)
-+         manage_files_pattern($1, udisks_daemon_var_lib_t, udisks_daemon_var_lib_t)
-+         manage_lnk_files_pattern($1, udisks_daemon_var_lib_t, udisks_daemon_var_lib_t)
-+')
-+
-+
-+########################################
-+## <summary>
-+##	Send and receive messages from
-+##	udisks over dbus.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`udisks_dbus_chat',`
-+	gen_require(`
-+		type udisks_daemon_t;
-+		class dbus send_msg;
-+	')
-+
-+	allow $1 udisks_daemon_t:dbus send_msg;
-+	allow udisks_daemon_t $1:dbus send_msg;
-+')
-+
-+########################################
-+## <summary>
-+##	All of the rules required to administrate 
-+##	an udisks environment
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+## <param name="role">
-+##	<summary>
-+##	Role allowed access.
-+##	</summary>
-+## </param>
-+## <rolecap/>
-+#
-+interface(`udisks_admin',`
-+	gen_require(`
-+		type udisks_daemon_t;
-+	')
-+
-+	allow $1 udisks_daemon_t:process { ptrace signal_perms getattr };
-+	read_files_pattern($1, udisks_daemon_t, udisks_daemon_t)
-+
-+	udisks_manage_var_run($1)
-+
-+	udisks_manage_var_lib($1)
-+
-+')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/udisks.te serefpolicy-3.7.4/policy/modules/services/udisks.te
---- nsaserefpolicy/policy/modules/services/udisks.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/udisks.te	2009-12-15 17:03:08.000000000 -0500
-@@ -0,0 +1,66 @@
-+policy_module(udisks,1.0.0)
-+
-+########################################
-+#
-+# Declarations
-+#
-+
-+type udisks_daemon_t;
-+type udisks_daemon_exec_t;
-+dbus_system_domain(udisks_daemon_t, udisks_daemon_exec_t)
-+
-+permissive udisks_daemon_t;
-+
-+type udisks_daemon_var_run_t;
-+files_pid_file(udisks_daemon_var_run_t)
-+
-+type udisks_daemon_var_lib_t;
-+files_type(udisks_daemon_var_lib_t)
-+
-+########################################
-+#
-+# udisks_daemon local policy
-+#
-+
-+allow udisks_daemon_t self:capability { kill sys_rawio };
-+allow udisks_daemon_t self:process { fork };
-+allow udisks_daemon_t self:fifo_file rw_fifo_file_perms;
-+allow udisks_daemon_t self:netlink_kobject_uevent_socket create_socket_perms;
-+
-+manage_dirs_pattern(udisks_daemon_t, udisks_daemon_var_run_t,  udisks_daemon_var_run_t)
-+manage_files_pattern(udisks_daemon_t, udisks_daemon_var_run_t,  udisks_daemon_var_run_t)
-+files_pid_filetrans(udisks_daemon_t, udisks_daemon_var_run_t, { file dir })
-+
-+manage_dirs_pattern(udisks_daemon_t, udisks_daemon_var_lib_t,  udisks_daemon_var_lib_t)
-+manage_files_pattern(udisks_daemon_t, udisks_daemon_var_lib_t,  udisks_daemon_var_lib_t)
-+files_var_lib_filetrans(udisks_daemon_t, udisks_daemon_var_lib_t, { file dir } )
-+
-+kernel_read_software_raid_state(udisks_daemon_t)
-+
-+corecmd_exec_bin(udisks_daemon_t)
-+
-+files_manage_mnt_dirs(udisks_daemon_t)
-+
-+dev_read_sysfs(udisks_daemon_t)
-+
-+storage_raw_read_fixed_disk(udisks_daemon_t)
-+storage_raw_read_removable_device(udisks_daemon_t)
-+
-+auth_use_nsswitch(udisks_daemon_t)
-+
-+optional_policy(`
-+	mount_domtrans(udisks_daemon_t)
-+')
-+
-+optional_policy(`
-+	policykit_dbus_chat(udisks_daemon_t)
-+')
-+
-+optional_policy(`
-+	dbus_system_bus_client(udisks_daemon_t)
-+	dbus_connect_system_bus(udisks_daemon_t)
-+')
-+
-+optional_policy(`
-+	udev_read_db(udisks_daemon_t)
-+')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.7.4/policy/modules/services/uucp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-3.7.4/policy/modules/services/uucp.te
 --- nsaserefpolicy/policy/modules/services/uucp.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/uucp.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/uucp.te	2009-12-17 14:26:49.000000000 -0500
 @@ -90,17 +90,26 @@
  fs_getattr_xattr_fs(uucpd_t)
  
@@ -24784,9 +24396,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/vhostmd.fc serefpolicy-3.7.4/policy/modules/services/vhostmd.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/vhostmd.fc serefpolicy-3.7.4/policy/modules/services/vhostmd.fc
 --- nsaserefpolicy/policy/modules/services/vhostmd.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/vhostmd.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/vhostmd.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,6 @@
 +
 +/usr/sbin/vhostmd	        --	gen_context(system_u:object_r:vhostmd_exec_t,s0)
@@ -24794,9 +24406,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/rc.d/init.d/vhostmd	--	gen_context(system_u:object_r:vhostmd_initrc_exec_t,s0)
 +/var/run/vhostmd.pid		--	gen_context(system_u:object_r:vhostmd_var_run_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/vhostmd.if serefpolicy-3.7.4/policy/modules/services/vhostmd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/vhostmd.if serefpolicy-3.7.4/policy/modules/services/vhostmd.if
 --- nsaserefpolicy/policy/modules/services/vhostmd.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/vhostmd.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/vhostmd.if	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,228 @@
 +
 +## <summary>policy for vhostmd</summary>
@@ -25026,9 +24638,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	vhostmd_manage_var_run($1)
 +
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/vhostmd.te serefpolicy-3.7.4/policy/modules/services/vhostmd.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/vhostmd.te serefpolicy-3.7.4/policy/modules/services/vhostmd.te
 --- nsaserefpolicy/policy/modules/services/vhostmd.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/vhostmd.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/vhostmd.te	2009-12-17 14:26:49.000000000 -0500
 @@ -0,0 +1,86 @@
 +
 +policy_module(vhostmd,1.0.0)
@@ -25116,9 +24728,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +    xen_stream_connect_xenstore(vhostmd_t)
 +    xen_stream_connect_xm(vhostmd_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.7.4/policy/modules/services/virt.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.fc serefpolicy-3.7.4/policy/modules/services/virt.fc
 --- nsaserefpolicy/policy/modules/services/virt.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/virt.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/virt.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -8,5 +8,18 @@
  
  /var/lib/libvirt(/.*)?		gen_context(system_u:object_r:virt_var_lib_t,s0)
@@ -25138,9 +24750,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/cache/libvirt(/.*)?	gen_context(system_u:object_r:svirt_cache_t,s0)
 +
 +/var/run/libvirt/qemu(/.*)? 	gen_context(system_u:object_r:svirt_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.7.4/policy/modules/services/virt.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.if serefpolicy-3.7.4/policy/modules/services/virt.if
 --- nsaserefpolicy/policy/modules/services/virt.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/virt.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/virt.if	2009-12-17 14:26:49.000000000 -0500
 @@ -136,7 +136,7 @@
  	')
  
@@ -25401,9 +25013,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +		ptchown_run(svirt_t, $2)
 +	')
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.7.4/policy/modules/services/virt.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.7.4/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/virt.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/virt.te	2009-12-17 14:26:49.000000000 -0500
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -25650,7 +25262,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  optional_policy(`
-@@ -196,8 +303,152 @@
+@@ -196,8 +303,153 @@
  
  	xen_stream_connect(virtd_t)
  	xen_stream_connect_xenstore(virtd_t)
@@ -25659,6 +25271,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +optional_policy(`
 +	udev_domtrans(virtd_t)
++	udev_read_db(virtd_t)
  ')
  
  optional_policy(`
@@ -25803,9 +25416,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	virt_read_content(virt_domain)
 +	virt_stream_connect(virt_domain)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.7.4/policy/modules/services/w3c.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/w3c.te serefpolicy-3.7.4/policy/modules/services/w3c.te
 --- nsaserefpolicy/policy/modules/services/w3c.te	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/w3c.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/w3c.te	2009-12-17 14:26:49.000000000 -0500
 @@ -8,11 +8,18 @@
  
  apache_content_template(w3c_validator)
@@ -25825,9 +25438,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.7.4/policy/modules/services/xserver.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-3.7.4/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/xserver.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/xserver.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -3,12 +3,21 @@
  #
  HOME_DIR/\.fonts\.conf	--	gen_context(system_u:object_r:user_fonts_config_t,s0)
@@ -25924,9 +25537,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +/var/lib/nxserver/home/\.xauth.*	--	gen_context(system_u:object_r:xauth_home_t,s0)
 +/var/lib/nxserver/home/\.Xauthority.*	--	gen_context(system_u:object_r:xauth_home_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.7.4/policy/modules/services/xserver.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-3.7.4/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/xserver.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/xserver.if	2009-12-17 14:26:49.000000000 -0500
 @@ -22,6 +22,24 @@
  		type user_fonts_t, user_fonts_cache_t, user_fonts_config_t;
  		type iceauth_t, iceauth_exec_t, iceauth_home_t;
@@ -26753,8 +26366,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -		class x_pointer all_x_pointer_perms;
 -		class x_keyboard all_x_keyboard_perms;
 +		type xauth_exec_t;
-+	')
-+
+ 	')
+ 
+-	allow $1 xserver_t:{ x_device x_pointer x_keyboard } *;
 +	allow $1 xauth_exec_t:file getattr;
 +')
 +
@@ -26771,9 +26385,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +template(`xserver_read_user_iceauth',`
 +	gen_require(`
 +		type iceauth_home_t;
- 	')
- 
--	allow $1 xserver_t:{ x_device x_pointer x_keyboard } *;
++	')
++
 +	# Read .Iceauthority file
 +	allow $1 iceauth_home_t:file read_file_perms;
 +')
@@ -26848,7 +26461,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	typeattribute $1 x_domain;
  	typeattribute $1 xserver_unconfined_type;
 +	typeattribute $1 x_domain;
-+')
+ ')
 +
 +########################################
 +## <summary>
@@ -26870,7 +26483,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	gen_require(`
 +		class x_drawable all_x_drawable_perms;
 +		class x_resource all_x_resource_perms;
- ')
++')
 +
 +	allow $1 $2:x_drawable all_x_drawable_perms;
 +	allow $2 $1:x_drawable all_x_drawable_perms;
@@ -26943,9 +26556,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	allow xdm_t $1:dbus send_msg;
 +')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.7.4/policy/modules/services/xserver.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-3.7.4/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/services/xserver.te	2009-12-15 14:58:11.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/xserver.te	2009-12-17 14:26:49.000000000 -0500
 @@ -1,5 +1,5 @@
  
 -policy_module(xserver, 3.3.1)
@@ -26976,7 +26589,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ## Allow xdm logins as sysadm
  ## </p>
  ## </desc>
-@@ -48,56 +53,57 @@
+@@ -48,108 +53,107 @@
  ## </desc>
  gen_tunable(xserver_object_manager, false)
  
@@ -27029,7 +26642,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +type debug_xext_t, xextension_type;
 +type directhw_xext_t alias disallowed_xext_t, xextension_type;
 +type focus_xevent_t, xevent_type;
-+
+ 
+-# X Drawables
+-attribute xdrawable_type;
+-attribute xcolormap_type;
+-type root_xdrawable_t, xdrawable_type;
+-type root_xcolormap_t, xcolormap_type;
 +type iceauth_t;
 +type iceauth_exec_t;
 +typealias iceauth_t alias { user_iceauth_t staff_iceauth_t sysadm_iceauth_t xguest_iceauth_t };
@@ -27037,18 +26655,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +application_domain(iceauth_t, iceauth_exec_t)
 +ubac_constrained(iceauth_t)
  
--# X Drawables
--attribute xdrawable_type;
--attribute xcolormap_type;
--type root_xdrawable_t, xdrawable_type;
--type root_xcolormap_t, xcolormap_type;
+-attribute xserver_unconfined_type;
 +type iceauth_home_t;
 +typealias iceauth_home_t alias { user_iceauth_home_t staff_iceauth_home_t sysadm_iceauth_home_t };
 +typealias iceauth_home_t alias { auditadm_iceauth_home_t secadm_iceauth_home_t xguest_iceauth_home_t };
 +files_poly_member(iceauth_home_t)
 +userdom_user_home_content(iceauth_home_t)
  
--attribute xserver_unconfined_type;
+-xserver_object_types_template(root)
+-xserver_object_types_template(user)
 +type info_xproperty_t, xproperty_type;
 +type input_xevent_t, xevent_type;
 +type manage_xevent_t, xevent_type;
@@ -27068,15 +26683,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +type video_xext_t, xextension_type;
 +type unknown_xevent_t, xevent_type;
  
--xserver_object_types_template(root)
- xserver_object_types_template(user)
--
++xserver_object_types_template(user)
  typealias user_xproperty_t alias { staff_xproperty_t sysadm_xproperty_t };
  typealias user_xproperty_t alias { auditadm_xproperty_t secadm_xproperty_t };
  typealias user_input_xevent_t alias { staff_input_xevent_t sysadm_input_xevent_t };
-@@ -102,54 +108,52 @@
- typealias user_xproperty_t alias { auditadm_xproperty_t secadm_xproperty_t };
- typealias user_input_xevent_t alias { staff_input_xevent_t sysadm_input_xevent_t };
  typealias user_input_xevent_t alias { auditadm_input_xevent_t secadm_input_xevent_t };
 -
 -type remote_t;
@@ -28129,9 +27739,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -#
 -allow xdm_t user_home_type:file unlink;
 -') dnl end TODO
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.if serefpolicy-3.7.4/policy/modules/services/zebra.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.if serefpolicy-3.7.4/policy/modules/services/zebra.if
 --- nsaserefpolicy/policy/modules/services/zebra.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/services/zebra.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/services/zebra.if	2009-12-17 14:26:49.000000000 -0500
 @@ -24,6 +24,26 @@
  
  ########################################
@@ -28159,9 +27769,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	All of the rules required to administrate 
  ##	an zebra environment
  ## </summary>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-3.7.4/policy/modules/system/application.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/application.te serefpolicy-3.7.4/policy/modules/system/application.te
 --- nsaserefpolicy/policy/modules/system/application.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/application.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/application.te	2009-12-17 14:26:49.000000000 -0500
 @@ -7,6 +7,13 @@
  # Executables to be run by user
  attribute application_exec_type;
@@ -28176,9 +27786,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.7.4/policy/modules/system/authlogin.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.fc serefpolicy-3.7.4/policy/modules/system/authlogin.fc
 --- nsaserefpolicy/policy/modules/system/authlogin.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/authlogin.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/authlogin.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -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)
@@ -28204,9 +27814,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /var/run/sudo(/.*)?		gen_context(system_u:object_r:pam_var_run_t,s0)
 +/var/run/pam_ssh(/.*)?		gen_context(system_u:object_r:var_auth_t,s0)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.7.4/policy/modules/system/authlogin.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-3.7.4/policy/modules/system/authlogin.if
 --- nsaserefpolicy/policy/modules/system/authlogin.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/authlogin.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/authlogin.if	2009-12-17 14:26:49.000000000 -0500
 @@ -40,17 +40,76 @@
  ##	</summary>
  ## </param>
@@ -28522,9 +28132,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/authlogin.te serefpolicy-3.7.4/policy/modules/system/authlogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-3.7.4/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/authlogin.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/authlogin.te	2009-12-17 14:26:49.000000000 -0500
 @@ -103,8 +103,10 @@
  
  fs_dontaudit_getattr_xattr_fs(chkpwd_t)
@@ -28555,9 +28165,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ########################################
  #
  # PAM local policy
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.7.4/policy/modules/system/fstools.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-3.7.4/policy/modules/system/fstools.fc
 --- nsaserefpolicy/policy/modules/system/fstools.fc	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/fstools.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/fstools.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -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)
@@ -28571,9 +28181,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.7.4/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-3.7.4/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/fstools.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/fstools.te	2009-12-17 14:26:49.000000000 -0500
 @@ -118,6 +118,8 @@
  fs_search_tmpfs(fsadm_t)
  fs_getattr_tmpfs_dirs(fsadm_t)
@@ -28593,9 +28203,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  ifdef(`distro_redhat',`
  	optional_policy(`
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-3.7.4/policy/modules/system/init.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-3.7.4/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/init.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/init.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -4,10 +4,10 @@
  /etc/init\.d/.*		--	gen_context(system_u:object_r:initrc_exec_t,s0)
  
@@ -28619,9 +28229,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.7.4/policy/modules/system/init.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-3.7.4/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2009-11-12 12:51:51.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/init.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/init.if	2009-12-17 14:26:49.000000000 -0500
 @@ -162,6 +162,7 @@
  	gen_require(`
  		attribute direct_run_init, direct_init, direct_init_entry;
@@ -28876,9 +28486,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.7.4/policy/modules/system/init.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-3.7.4/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2009-11-12 12:51:51.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/init.te	2009-12-15 16:39:54.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/init.te	2009-12-17 14:26:49.000000000 -0500
 @@ -17,6 +17,20 @@
  ## </desc>
  gen_tunable(init_upstart, false)
@@ -29469,9 +29079,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	fail2ban_read_lib_files(daemon)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.fc serefpolicy-3.7.4/policy/modules/system/ipsec.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.fc serefpolicy-3.7.4/policy/modules/system/ipsec.fc
 --- nsaserefpolicy/policy/modules/system/ipsec.fc	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/ipsec.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/ipsec.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -37,6 +37,8 @@
  
  /var/racoon(/.*)?			gen_context(system_u:object_r:ipsec_var_run_t,s0)
@@ -29482,9 +29092,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/var/run/racoon\.pid		--	gen_context(system_u:object_r:ipsec_var_run_t,s0)
  
 -/var/run/racoon.pid		--	gen_context(system_u:object_r:ipsec_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-3.7.4/policy/modules/system/ipsec.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-3.7.4/policy/modules/system/ipsec.if
 --- nsaserefpolicy/policy/modules/system/ipsec.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/ipsec.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/ipsec.if	2009-12-17 14:26:49.000000000 -0500
 @@ -39,6 +39,25 @@
  
  ########################################
@@ -29602,9 +29212,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	ipsec_domtrans_racoon($1)
 +	role $2 types racoon_t;
  ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.7.4/policy/modules/system/ipsec.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-3.7.4/policy/modules/system/ipsec.te
 --- nsaserefpolicy/policy/modules/system/ipsec.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/ipsec.te	2009-12-15 15:49:35.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/ipsec.te	2009-12-17 14:26:49.000000000 -0500
 @@ -29,9 +29,15 @@
  type ipsec_key_file_t;
  files_type(ipsec_key_file_t)
@@ -29708,9 +29318,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  userdom_use_user_terminals(setkey_t)
 +userdom_read_user_tmp_files(setkey_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.7.4/policy/modules/system/iptables.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.fc serefpolicy-3.7.4/policy/modules/system/iptables.fc
 --- nsaserefpolicy/policy/modules/system/iptables.fc	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/iptables.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/iptables.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,13 +1,17 @@
  /etc/rc\.d/init\.d/ip6?tables	--	gen_context(system_u:object_r:iptables_initrc_exec_t,s0)
  /etc/sysconfig/ip6?tables.*	--	gen_context(system_u:object_r:iptables_conf_t,s0)
@@ -29731,9 +29341,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/etc/sysctl\.conf.*  --  
 +gen_context(system_u:object_r:iptables_conf_t,s0)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.7.4/policy/modules/system/iptables.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-3.7.4/policy/modules/system/iptables.te
 --- nsaserefpolicy/policy/modules/system/iptables.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/iptables.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/iptables.te	2009-12-17 14:26:49.000000000 -0500
 @@ -30,6 +30,7 @@
  
  allow iptables_t self:capability { dac_read_search dac_override net_admin net_raw };
@@ -29761,9 +29371,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	udev_read_db(iptables_t)
  ')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.7.4/policy/modules/system/iscsi.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iscsi.te serefpolicy-3.7.4/policy/modules/system/iscsi.te
 --- nsaserefpolicy/policy/modules/system/iscsi.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/iscsi.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/iscsi.te	2009-12-17 14:26:49.000000000 -0500
 @@ -69,11 +69,18 @@
  dev_rw_sysfs(iscsid_t)
  
@@ -29783,18 +29393,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +optional_policy(`
 +	tgtd_rw_semaphores(iscsid_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/kdump.te serefpolicy-3.7.4/policy/modules/system/kdump.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/kdump.te serefpolicy-3.7.4/policy/modules/system/kdump.te
 --- nsaserefpolicy/policy/modules/system/kdump.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/kdump.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/kdump.te	2009-12-17 14:26:49.000000000 -0500
 @@ -35,3 +35,5 @@
  dev_read_sysfs(kdump_t)
  
  term_use_console(kdump_t)
 +
 +permissive kdump_t;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.7.4/policy/modules/system/libraries.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-3.7.4/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/libraries.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/libraries.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -60,12 +60,15 @@
  #
  # /opt
@@ -30009,7 +29619,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ') dnl end distro_redhat
  
  #
-@@ -307,10 +315,105 @@
+@@ -307,10 +315,109 @@
  
  /var/mailman/pythonlib(/.*)?/.+\.so(\..*)? --	gen_context(system_u:object_r:lib_t,s0)
  
@@ -30115,9 +29725,13 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/usr/lib(64)?/httpd/modules/libphp5\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +')
 +/opt/VBoxGuestAdditions.*/lib/VBox.*\.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.if serefpolicy-3.7.4/policy/modules/system/libraries.if
++
++/usr/lib(64)?/nmm/liba52\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/lampp/lib/libct\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/opt/VirtualBox(/.*)?/VBox.*\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-3.7.4/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/libraries.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/libraries.if	2009-12-17 14:26:49.000000000 -0500
 @@ -17,6 +17,7 @@
  
  	corecmd_search_bin($1)
@@ -30144,9 +29758,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	allow $1 lib_t:dir list_dir_perms;
  	read_lnk_files_pattern($1, lib_t, { lib_t textrel_shlib_t })
  	mmap_files_pattern($1, lib_t, { lib_t textrel_shlib_t })
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.7.4/policy/modules/system/libraries.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-3.7.4/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/libraries.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/libraries.te	2009-12-17 14:26:49.000000000 -0500
 @@ -58,11 +58,11 @@
  # ldconfig local policy
  #
@@ -30208,9 +29822,9 @@ 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.7.4/policy/modules/system/locallogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-3.7.4/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/locallogin.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/locallogin.te	2009-12-17 14:26:49.000000000 -0500
 @@ -33,7 +33,7 @@
  # Local login local policy
  #
@@ -30299,9 +29913,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.7.4/policy/modules/system/logging.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-3.7.4/policy/modules/system/logging.fc
 --- nsaserefpolicy/policy/modules/system/logging.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/logging.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/logging.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -51,17 +51,21 @@
  
  ifdef(`distro_redhat',`
@@ -30328,9 +29942,9 @@ 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)
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.7.4/policy/modules/system/logging.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-3.7.4/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2009-08-28 14:58:20.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/logging.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/logging.if	2009-12-17 14:26:49.000000000 -0500
 @@ -69,6 +69,20 @@
  
  ########################################
@@ -30372,9 +29986,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/logging.te serefpolicy-3.7.4/policy/modules/system/logging.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-3.7.4/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/logging.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/logging.te	2009-12-17 14:26:49.000000000 -0500
 @@ -123,10 +123,10 @@
  
  allow auditd_t self:capability { chown fsetid sys_nice sys_resource };
@@ -30482,9 +30096,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	inn_manage_log(syslogd_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.7.4/policy/modules/system/lvm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-3.7.4/policy/modules/system/lvm.te
 --- nsaserefpolicy/policy/modules/system/lvm.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/lvm.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/lvm.te	2009-12-17 14:26:49.000000000 -0500
 @@ -142,6 +142,10 @@
  ')
  
@@ -30523,9 +30137,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	bootloader_rw_tmp_files(lvm_t)
  ')
  
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-3.7.4/policy/modules/system/miscfiles.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-3.7.4/policy/modules/system/miscfiles.fc
 --- nsaserefpolicy/policy/modules/system/miscfiles.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/miscfiles.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/miscfiles.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -42,6 +42,7 @@
  /usr/man(/.*)?			gen_context(system_u:object_r:man_t,s0)
  
@@ -30534,9 +30148,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  /usr/share/ghostscript/fonts(/.*)? gen_context(system_u:object_r:fonts_t,s0)
  /usr/share/locale(/.*)?		gen_context(system_u:object_r:locale_t,s0)
  /usr/share/man(/.*)?		gen_context(system_u:object_r:man_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.7.4/policy/modules/system/modutils.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.7.4/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2009-12-04 09:43:33.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/modutils.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/modutils.te	2009-12-17 14:26:49.000000000 -0500
 @@ -19,6 +19,7 @@
  type insmod_exec_t;
  application_domain(insmod_t, insmod_exec_t)
@@ -30626,9 +30240,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/system/mount.fc serefpolicy-3.7.4/policy/modules/system/mount.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.fc serefpolicy-3.7.4/policy/modules/system/mount.fc
 --- nsaserefpolicy/policy/modules/system/mount.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/mount.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/mount.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,4 +1,9 @@
  /bin/mount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
  /bin/umount.*			--	gen_context(system_u:object_r:mount_exec_t,s0)
@@ -30640,9 +30254,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -/usr/bin/fusermount		--	gen_context(system_u:object_r:mount_exec_t,s0)
 +/var/cache/davfs2(/.*)?		gen_context(system_u:object_r:mount_var_run_t,s0)
 +/var/run/davfs2(/.*)?		gen_context(system_u:object_r:mount_var_run_t,s0)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.7.4/policy/modules/system/mount.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.if serefpolicy-3.7.4/policy/modules/system/mount.if
 --- nsaserefpolicy/policy/modules/system/mount.if	2009-07-29 15:15:33.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/mount.if	2009-12-15 15:15:30.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/mount.if	2009-12-17 14:26:49.000000000 -0500
 @@ -84,9 +84,11 @@
  interface(`mount_signal',`
  	gen_require(`
@@ -30713,9 +30327,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	dontaudit $1 fusermount_exec_t:file exec_file_perms;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.7.4/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-3.7.4/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/mount.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/mount.te	2009-12-17 14:26:49.000000000 -0500
 @@ -18,8 +18,15 @@
  init_system_domain(mount_t, mount_exec_t)
  role system_r types mount_t;
@@ -30927,9 +30541,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	rpc_domtrans_rpcd(unconfined_mount_t)
  ')
 +
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.7.4/policy/modules/system/raid.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-3.7.4/policy/modules/system/raid.te
 --- nsaserefpolicy/policy/modules/system/raid.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/raid.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/raid.te	2009-12-17 14:26:49.000000000 -0500
 @@ -51,11 +51,13 @@
  dev_dontaudit_getattr_generic_chr_files(mdadm_t)
  dev_dontaudit_getattr_generic_blk_files(mdadm_t)
@@ -30944,9 +30558,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.7.4/policy/modules/system/selinuxutil.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-3.7.4/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -6,13 +6,13 @@
  /etc/selinux(/.*)?			gen_context(system_u:object_r:selinux_config_t,s0)
  /etc/selinux/([^/]*/)?contexts(/.*)?	gen_context(system_u:object_r:default_context_t,s0)
@@ -30986,9 +30600,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.7.4/policy/modules/system/selinuxutil.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-3.7.4/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.if	2009-12-17 14:26:49.000000000 -0500
 @@ -351,6 +351,27 @@
  
  ########################################
@@ -31344,9 +30958,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.7.4/policy/modules/system/selinuxutil.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.7.4/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/selinuxutil.te	2009-12-17 14:26:49.000000000 -0500
 @@ -23,6 +23,9 @@
  type selinux_config_t;
  files_type(selinux_config_t)
@@ -31722,9 +31336,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/sysnetwork.fc serefpolicy-3.7.4/policy/modules/system/sysnetwork.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.fc serefpolicy-3.7.4/policy/modules/system/sysnetwork.fc
 --- nsaserefpolicy/policy/modules/system/sysnetwork.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -11,15 +11,20 @@
  /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)
@@ -31760,9 +31374,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.7.4/policy/modules/system/sysnetwork.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.if serefpolicy-3.7.4/policy/modules/system/sysnetwork.if
 --- nsaserefpolicy/policy/modules/system/sysnetwork.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.if	2009-12-15 16:39:30.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.if	2009-12-17 14:26:49.000000000 -0500
 @@ -43,6 +43,36 @@
  
  	sysnet_domtrans_dhcpc($1)
@@ -31937,9 +31551,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.7.4/policy/modules/system/sysnetwork.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-3.7.4/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/sysnetwork.te	2009-12-17 14:26:49.000000000 -0500
 @@ -20,6 +20,9 @@
  init_daemon_domain(dhcpc_t, dhcpc_exec_t)
  role system_r types dhcpc_t;
@@ -32161,9 +31775,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	hal_dontaudit_rw_pipes(ifconfig_t)
 +	hal_dontaudit_rw_dgram_sockets(ifconfig_t)
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.7.4/policy/modules/system/udev.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.7.4/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/udev.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/udev.if	2009-12-17 14:26:49.000000000 -0500
 @@ -186,6 +186,7 @@
  
  	dev_list_all_dev_nodes($1)
@@ -32172,9 +31786,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/udev.te serefpolicy-3.7.4/policy/modules/system/udev.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-3.7.4/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/udev.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/udev.te	2009-12-17 14:26:49.000000000 -0500
 @@ -50,6 +50,7 @@
  allow udev_t self:unix_stream_socket connectto;
  allow udev_t self:netlink_kobject_uevent_socket create_socket_perms;
@@ -32222,9 +31836,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	kernel_write_xen_state(udev_t)
  	kernel_read_xen_state(udev_t)
  	xen_manage_log(udev_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.7.4/policy/modules/system/unconfined.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-3.7.4/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/unconfined.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/unconfined.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,16 +1 @@
  # Add programs here which should not be confined by SELinux
 -# e.g.:
@@ -32242,9 +31856,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -ifdef(`distro_gentoo',`
 -/usr/lib32/openoffice/program/[^/]+\.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.7.4/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-3.7.4/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/unconfined.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/unconfined.if	2009-12-17 14:26:49.000000000 -0500
 @@ -12,14 +12,13 @@
  #
  interface(`unconfined_domain_noaudit',`
@@ -32748,9 +32362,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -
 -	allow $1 unconfined_t:dbus acquire_svc;
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.7.4/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-3.7.4/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/unconfined.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/unconfined.te	2009-12-17 14:26:49.000000000 -0500
 @@ -5,227 +5,5 @@
  #
  # Declarations
@@ -32980,9 +32594,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -		hal_dbus_chat(unconfined_execmem_t)
 -	')
 -')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.7.4/policy/modules/system/userdomain.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-3.7.4/policy/modules/system/userdomain.fc
 --- nsaserefpolicy/policy/modules/system/userdomain.fc	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/userdomain.fc	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/userdomain.fc	2009-12-17 14:26:49.000000000 -0500
 @@ -1,4 +1,9 @@
  HOME_DIR	-d	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
 +HOME_DIR	-l	gen_context(system_u:object_r:user_home_dir_t,s0-mls_systemhigh)
@@ -32994,9 +32608,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +/dev/shm/mono.*		gen_context(system_u:object_r:user_tmpfs_t,s0)
 +HOME_DIR/\.cert(/.*)?	gen_context(system_u:object_r:home_cert_t,s0)
 +HOME_DIR/\.gvfs(/.*)?	<<none>>
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.7.4/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.7.4/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.7.4/policy/modules/system/userdomain.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/userdomain.if	2009-12-17 14:26:49.000000000 -0500
 @@ -30,8 +30,9 @@
  	')
  
@@ -33290,7 +32904,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	files_search_tmp($1)
  ')
  
-@@ -368,46 +367,41 @@
+@@ -368,51 +367,46 @@
  
  #######################################
  ## <summary>
@@ -33312,10 +32926,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	gen_require(`
 -		type $1_t;
 -	')
--
++interface(`userdom_basic_networking',`
+ 
 -	allow $1_t self:tcp_socket create_stream_socket_perms;
 -	allow $1_t self:udp_socket create_socket_perms;
-+interface(`userdom_basic_networking',`
++	allow $1 self:tcp_socket create_stream_socket_perms;
++	allow $1 self:udp_socket create_socket_perms;
  
 -	corenet_all_recvfrom_unlabeled($1_t)
 -	corenet_all_recvfrom_netlabel($1_t)
@@ -33327,9 +32943,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	corenet_udp_sendrecv_all_ports($1_t)
 -	corenet_tcp_connect_all_ports($1_t)
 -	corenet_sendrecv_all_client_packets($1_t)
-+	allow $1 self:tcp_socket create_stream_socket_perms;
-+	allow $1 self:udp_socket create_socket_perms;
- 
+-
 -	corenet_all_recvfrom_labeled($1_t, $1_t)
 +	corenet_all_recvfrom_unlabeled($1)
 +	corenet_all_recvfrom_netlabel($1)
@@ -33357,9 +32971,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ')
  
  #######################################
-@@ -412,7 +406,7 @@
- 
- #######################################
  ## <summary>
 -##	The template for creating a user xwindows client.  (Deprecated)
 +##	The template for creating a user xwindows client.
@@ -33416,16 +33027,16 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	optional_policy(`
 +		udev_read_db($1)
 +	')
++
++	optional_policy(`
++		setroubleshoot_dontaudit_dbus_chat($1)
++	')
  
 -	xserver_user_x_domain_template($1, $1_t, user_tmpfs_t)
 -	xserver_xsession_entry_type($1_t)
 -	xserver_dontaudit_write_log($1_t)
 -	xserver_stream_connect_xdm($1_t)
 +	optional_policy(`
-+		setroubleshoot_dontaudit_dbus_chat($1)
-+	')
-+
-+	optional_policy(`
 +		xserver_user_client($1, user_tmpfs_t)
 +		xserver_xsession_entry_type($1)
 +		xserver_dontaudit_write_log($1)
@@ -33474,27 +33085,27 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +	kernel_get_sysvipc_info($1_usertype)
  	# Find CDROM devices:
 -	kernel_read_device_sysctls($1_t)
--
--	corecmd_exec_bin($1_t)
 +	kernel_read_device_sysctls($1_usertype)
 +	kernel_request_load_module($1_usertype)
  
--	corenet_udp_bind_generic_node($1_t)
--	corenet_udp_bind_generic_port($1_t)
+-	corecmd_exec_bin($1_t)
 +	corenet_udp_bind_generic_node($1_usertype)
 +	corenet_udp_bind_generic_port($1_usertype)
  
--	dev_read_rand($1_t)
--	dev_write_sound($1_t)
--	dev_read_sound($1_t)
--	dev_read_sound_mixer($1_t)
--	dev_write_sound_mixer($1_t)
+-	corenet_udp_bind_generic_node($1_t)
+-	corenet_udp_bind_generic_port($1_t)
 +	dev_read_rand($1_usertype)
 +	dev_write_sound($1_usertype)
 +	dev_read_sound($1_usertype)
 +	dev_read_sound_mixer($1_usertype)
 +	dev_write_sound_mixer($1_usertype)
  
+-	dev_read_rand($1_t)
+-	dev_write_sound($1_t)
+-	dev_read_sound($1_t)
+-	dev_read_sound_mixer($1_t)
+-	dev_write_sound_mixer($1_t)
+-
 -	files_exec_etc_files($1_t)
 -	files_search_locks($1_t)
 +	files_exec_etc_files($1_usertype)
@@ -33566,32 +33177,33 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	tunable_policy(`user_direct_mouse',`
 -		dev_read_mouse($1_t)
 +		dev_read_mouse($1_usertype)
-+	')
-+
-+	optional_policy(`
-+		alsa_read_rw_config($1_usertype)
  	')
  
 -	tunable_policy(`user_ttyfile_stat',`
 -		term_getattr_all_user_ttys($1_t)
 +	optional_policy(`
-+		# Allow graphical boot to check battery lifespan
-+		apm_stream_connect($1_usertype)
++		alsa_read_rw_config($1_usertype)
  	')
  
  	optional_policy(`
 -		alsa_read_rw_config($1_t)
-+		canna_stream_connect($1_usertype)
++		# Allow graphical boot to check battery lifespan
++		apm_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
 -		# Allow graphical boot to check battery lifespan
 -		apm_stream_connect($1_t)
-+		chrome_role($1_r, $1_usertype)
++		canna_stream_connect($1_usertype)
  	')
  
  	optional_policy(`
 -		canna_stream_connect($1_t)
++		chrome_role($1_r, $1_usertype)
+ 	')
+ 
+ 	optional_policy(`
+-		dbus_system_bus_client($1_t)
 +		dbus_system_bus_client($1_usertype)
 +
 +		allow $1_usertype $1_usertype:dbus  send_msg;
@@ -33599,22 +33211,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +		optional_policy(`
 +			avahi_dbus_chat($1_usertype)
 +		')
-+
-+		optional_policy(`
-+			bluetooth_dbus_chat($1_usertype)
- 	')
  
- 	optional_policy(`
--		dbus_system_bus_client($1_t)
+ 		optional_policy(`
+-			bluetooth_dbus_chat($1_t)
++			bluetooth_dbus_chat($1_usertype)
++	')
++
++	optional_policy(`
 +			consolekit_dbus_chat($1_usertype)
 +			consolekit_read_log($1_usertype)
 +	')
- 
- 		optional_policy(`
--			bluetooth_dbus_chat($1_t)
++
++	optional_policy(`
 +		devicekit_dbus_chat($1_usertype)
-+		devicekit_dbus_chat_disk($1_usertype)
 +		devicekit_dbus_chat_power($1_usertype)
++		devicekit_dbus_chat_disk($1_usertype)
  		')
  
  		optional_policy(`
@@ -33632,12 +33243,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  		optional_policy(`
 -			hal_dbus_chat($1_t)
 +		networkmanager_dbus_chat($1_usertype)
-+		networkmanager_read_var_lib_files($1_usertype)
++			networkmanager_read_var_lib_files($1_usertype)
  		')
  
  		optional_policy(`
 -			networkmanager_dbus_chat($1_t)
-+		vpnc_dbus_chat($1_usertype)
++			vpnc_dbus_chat($1_usertype)
  		')
  	')
  
@@ -33666,21 +33277,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	optional_policy(`
 -		modutils_read_module_config($1_t)
 +		modutils_read_module_config($1_usertype)
++	')
++
++	optional_policy(`
++		mta_rw_spool($1_usertype)
++		mta_manage_queue($1_usertype)
  	')
  
  	optional_policy(`
 -		mta_rw_spool($1_t)
-+		mta_rw_spool($1_usertype)
-+		mta_manage_queue($1_usertype)
++		nsplugin_role($1_r, $1_usertype)
  	')
  
  	optional_policy(`
 -		tunable_policy(`allow_user_mysql_connect',`
 -			mysql_stream_connect($1_t)
-+		nsplugin_role($1_r, $1_usertype)
-+	')
-+
-+	optional_policy(`
 +		tunable_policy(`allow_user_postgresql_connect',`
 +			postgresql_stream_connect($1_usertype)
  		')
@@ -33746,17 +33357,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
 -	userdom_manage_home_role($1_r, $1_t)
 +	userdom_manage_home_role($1_r, $1_usertype)
- 
--	userdom_manage_tmp_role($1_r, $1_t)
--	userdom_manage_tmpfs_role($1_r, $1_t)
++
 +	userdom_manage_tmp_role($1_r, $1_usertype)
 +	userdom_manage_tmpfs_role($1_r, $1_usertype)
- 
--	userdom_exec_user_tmp_files($1_t)
--	userdom_exec_user_home_content_files($1_t)
++
 +	ifelse(`$1',`unconfined',`',`
 +		gen_tunable(allow_$1_exec_content, true)
-+
+ 
+-	userdom_manage_tmp_role($1_r, $1_t)
+-	userdom_manage_tmpfs_role($1_r, $1_t)
 +		tunable_policy(`allow_$1_exec_content',`
 +			userdom_exec_user_tmp_files($1_usertype)
 +			userdom_exec_user_home_content_files($1_usertype)
@@ -33764,7 +33373,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +		tunable_policy(`allow_$1_exec_content && use_nfs_home_dirs',`
 +                        fs_exec_nfs_files($1_usertype)
 +		')
-+
+ 
+-	userdom_exec_user_tmp_files($1_t)
+-	userdom_exec_user_home_content_files($1_t)
 +		tunable_policy(`allow_$1_exec_content && use_samba_home_dirs',`
 +			fs_exec_cifs_files($1_usertype)
 +		')
@@ -34039,9 +33650,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	# cjp: why?
 -	files_read_kernel_symbol_table($1_t)
 +	storage_rw_fuse($1_t)
- 
--	ifndef(`enable_mls',`
--		fs_exec_noxattr($1_t)
++
 +	# Allow users to run TCP servers (bind to ports and accept connection from
 +	# the same domain and outside users) disabling this forces FTP passive mode
 +	# and may change other protocols
@@ -34049,6 +33658,12 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +		corenet_tcp_bind_all_unreserved_ports($1_usertype)
 +	')
  
+-	ifndef(`enable_mls',`
+-		fs_exec_noxattr($1_t)
++	optional_policy(`
++		cdrecord_role($1_r, $1_t)
++		')
+ 
 -		tunable_policy(`user_rw_noexattrfile',`
 -			fs_manage_noxattr_fs_files($1_t)
 -			fs_manage_noxattr_fs_dirs($1_t)
@@ -34058,11 +33673,11 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -		',`
 -			storage_raw_read_removable_device($1_t)
 +	optional_policy(`
-+		cdrecord_role($1_r, $1_t)
++		cron_role($1_r, $1_t)
  		')
 +
 +	optional_policy(`
-+		cron_role($1_r, $1_t)
++		games_rw_data($1_usertype)
  	')
  
 -	tunable_policy(`user_dmesg',`
@@ -34070,7 +33685,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -	',`
 -		kernel_dontaudit_read_ring_buffer($1_t)
 +	optional_policy(`
-+		games_rw_data($1_usertype)
++		gpg_role($1_r, $1_usertype)
  	')
  
 -	# Allow users to run TCP servers (bind to ports and accept connection from
@@ -34080,28 +33695,21 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 -		corenet_tcp_bind_generic_node($1_t)
 -		corenet_tcp_bind_generic_port($1_t)
 +	optional_policy(`
-+		gpg_role($1_r, $1_usertype)
++		gnomeclock_dbus_chat($1_t)
  	')
  
  	optional_policy(`
 -		netutils_run_ping_cond($1_t,$1_r)
 -		netutils_run_traceroute_cond($1_t,$1_r)
-+		gnomeclock_dbus_chat($1_t)
- 	')
- 
- 	optional_policy(`
--		postgresql_role($1_r,$1_t)
 +		gpm_stream_connect($1_usertype)
  	')
  
--	# Run pppd in pppd_t by default for user
  	optional_policy(`
--		ppp_run_cond($1_t,$1_r)
+-		postgresql_role($1_r,$1_t)
 +		execmem_role_template($1, $1_r, $1_t)
- 	')
- 
- 	optional_policy(`
--		setroubleshoot_stream_connect($1_t)
++	')
++
++	optional_policy(`
 +		java_role_template($1, $1_r, $1_t)
 +	')
 +
@@ -34115,14 +33723,17 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	optional_policy(`
 +		wine_role_template($1, $1_r, $1_t)
-+	')
-+
-+	optional_policy(`
+ 	')
+ 
+-	# Run pppd in pppd_t by default for user
+ 	optional_policy(`
+-		ppp_run_cond($1_t,$1_r)
 +		postfix_run_postdrop($1_t, $1_r)
-+	')
-+
+ 	')
+ 
 +	# Run pppd in pppd_t by default for user
-+	optional_policy(`
+ 	optional_policy(`
+-		setroubleshoot_stream_connect($1_t)
 +		ppp_run_cond($1_t, $1_r)
  	')
  ')
@@ -34423,86 +34034,105 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	')
  
  	manage_files_pattern($1, user_home_t, user_home_t)
-@@ -2196,7 +2403,7 @@
+@@ -2196,6 +2403,25 @@
  
  ########################################
  ## <summary>
--##	Do not audit attempts to manage users
 +##	Do not audit attempts to write users
++##	temporary files.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_write_user_tmp_files',`
++	gen_require(`
++		type user_tmp_t;
++	')
++
++	dontaudit $1 user_tmp_t:file write;
++')
++
++########################################
++## <summary>
+ ##	Do not audit attempts to manage users
  ##	temporary files.
  ## </summary>
+@@ -2276,7 +2502,7 @@
+ ########################################
+ ## <summary>
+ ##	Create, read, write, and delete user
+-##	temporary symbolic links.
++##	temporary chr files.
+ ## </summary>
  ## <param name="domain">
-@@ -2205,37 +2412,56 @@
+ ##	<summary>
+@@ -2284,19 +2510,19 @@
  ##	</summary>
  ## </param>
  #
--interface(`userdom_dontaudit_manage_user_tmp_files',`
-+interface(`userdom_dontaudit_write_user_tmp_files',`
+-interface(`userdom_manage_user_tmp_symlinks',`
++interface(`userdom_manage_user_tmp_chr_files',`
  	gen_require(`
  		type user_tmp_t;
  	')
  
--	dontaudit $1 user_tmp_t:file manage_file_perms;
-+	dontaudit $1 user_tmp_t:file write;
+-	manage_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
++	manage_chr_files_pattern($1, user_tmp_t, user_tmp_t)
+ 	files_search_tmp($1)
  ')
  
  ########################################
  ## <summary>
--##	Read user temporary symbolic links.
-+##	Do not audit attempts to manage users
-+##	temporary files.
+ ##	Create, read, write, and delete user
+-##	temporary named pipes.
++##	temporary blk files.
  ## </summary>
  ## <param name="domain">
  ##	<summary>
--##	Domain allowed access.
-+##	Domain to not audit.
+@@ -2304,19 +2530,19 @@
  ##	</summary>
  ## </param>
  #
--interface(`userdom_read_user_tmp_symlinks',`
-+interface(`userdom_dontaudit_manage_user_tmp_files',`
+-interface(`userdom_manage_user_tmp_pipes',`
++interface(`userdom_manage_user_tmp_blk_files',`
  	gen_require(`
  		type user_tmp_t;
  	')
  
--	read_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
--	allow $1 user_tmp_t:dir list_dir_perms;
--	files_search_tmp($1)
-+	dontaudit $1 user_tmp_t:file manage_file_perms;
+-	manage_fifo_files_pattern($1, user_tmp_t, user_tmp_t)
++	manage_blk_files_pattern($1, user_tmp_t, user_tmp_t)
+ 	files_search_tmp($1)
  ')
  
  ########################################
  ## <summary>
--##	Create, read, write, and delete user
-+##	Read user temporary symbolic links.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`userdom_read_user_tmp_symlinks',`
+ ##	Create, read, write, and delete user
+-##	temporary named sockets.
++##	temporary symbolic links.
+ ## </summary>
+ ## <param name="domain">
+ ##	<summary>
+@@ -2324,7 +2550,47 @@
+ ##	</summary>
+ ## </param>
+ #
+-interface(`userdom_manage_user_tmp_sockets',`
++interface(`userdom_manage_user_tmp_symlinks',`
 +	gen_require(`
 +		type user_tmp_t;
 +	')
 +
-+	read_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
-+	allow $1 user_tmp_t:dir list_dir_perms;
++	manage_lnk_files_pattern($1, user_tmp_t, user_tmp_t)
 +	files_search_tmp($1)
 +')
 +
 +########################################
 +## <summary>
 +##	Create, read, write, and delete user
- ##	temporary directories.
- ## </summary>
- ## <param name="domain">
-@@ -2276,6 +2502,46 @@
- ########################################
- ## <summary>
- ##	Create, read, write, and delete user
-+##	temporary chr files.
++##	temporary named pipes.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -34510,19 +34140,19 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_user_tmp_chr_files',`
++interface(`userdom_manage_user_tmp_pipes',`
 +	gen_require(`
 +		type user_tmp_t;
 +	')
 +
-+	manage_chr_files_pattern($1, user_tmp_t, user_tmp_t)
++	manage_fifo_files_pattern($1, user_tmp_t, user_tmp_t)
 +	files_search_tmp($1)
 +')
 +
 +########################################
 +## <summary>
 +##	Create, read, write, and delete user
-+##	temporary blk files.
++##	temporary named sockets.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -34530,21 +34160,10 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +##	</summary>
 +## </param>
 +#
-+interface(`userdom_manage_user_tmp_blk_files',`
-+	gen_require(`
-+		type user_tmp_t;
-+	')
-+
-+	manage_blk_files_pattern($1, user_tmp_t, user_tmp_t)
-+	files_search_tmp($1)
-+')
-+
-+########################################
-+## <summary>
-+##	Create, read, write, and delete user
- ##	temporary symbolic links.
- ## </summary>
- ## <param name="domain">
++interface(`userdom_manage_user_tmp_sockets',`
+ 	gen_require(`
+ 		type user_tmp_t;
+ 	')
 @@ -2391,7 +2657,7 @@
  
  ########################################
@@ -35355,9 +34974,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +
 +	dontaudit $1 admin_home_t:file getattr;
 +')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.4/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.7.4/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2009-11-17 10:54:26.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/userdomain.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/userdomain.te	2009-12-17 14:26:49.000000000 -0500
 @@ -8,13 +8,6 @@
  
  ## <desc>
@@ -35446,9 +35065,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 +
 +allow userdomain userdomain:process signull;
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.7.4/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.7.4/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/xen.if	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/xen.if	2009-12-17 14:26:49.000000000 -0500
 @@ -180,6 +180,25 @@
  
  ########################################
@@ -35475,9 +35094,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Connect to xend over an unix domain stream socket.
  ## </summary>
  ## <param name="domain">
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.4/policy/modules/system/xen.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.7.4/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/modules/system/xen.te	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/modules/system/xen.te	2009-12-17 14:26:49.000000000 -0500
 @@ -85,6 +85,7 @@
  type xenconsoled_t;
  type xenconsoled_exec_t;
@@ -35516,9 +35135,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  	#Should have a boolean wrapping these
  	fs_list_auto_mountpoints(xend_t)
  	files_search_mnt(xend_t)
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.4/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.7.4/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2009-11-25 11:47:19.000000000 -0500
-+++ serefpolicy-3.7.4/policy/support/obj_perm_sets.spt	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/support/obj_perm_sets.spt	2009-12-17 14:26:49.000000000 -0500
 @@ -199,12 +199,14 @@
  #
  define(`getattr_file_perms',`{ getattr }')
@@ -35561,9 +35180,9 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +define(`all_dbus_perms', `{ acquire_svc send_msg } ')
 +define(`all_passwd_perms', `{ passwd chfn chsh rootok crontab } ')
 +define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.4/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.7.4/policy/users
 --- nsaserefpolicy/policy/users	2009-07-14 14:19:57.000000000 -0400
-+++ serefpolicy-3.7.4/policy/users	2009-12-15 14:56:49.000000000 -0500
++++ serefpolicy-3.7.4/policy/users	2009-12-17 14:26:49.000000000 -0500
 @@ -25,11 +25,8 @@
  # permit any access to such users, then remove this entry.
  #