From 2c3ac47d45da16ade432e64883c758ecc6796bba Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Jun 26 2007 18:43:11 +0000
Subject: trunk: pyzor and clamav updates from dan


---

diff --git a/policy/modules/services/amavis.if b/policy/modules/services/amavis.if
index 41fa0b4..19a63ef 100644
--- a/policy/modules/services/amavis.if
+++ b/policy/modules/services/amavis.if
@@ -167,3 +167,22 @@ interface(`amavis_setattr_pid_files',`
 	allow $1 amavis_var_run_t:file setattr;
 	files_search_pids($1)
 ')
+
+########################################
+## <summary>
+##	Create of amavis pid files.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`amavis_create_pid_files',`
+	gen_require(`
+		type amavis_var_run_t;
+	')
+
+	allow $1 amavis_var_run_t:file create_file_perms;
+	files_search_pids($1)
+')
diff --git a/policy/modules/services/amavis.te b/policy/modules/services/amavis.te
index 3f7450c..b46567b 100644
--- a/policy/modules/services/amavis.te
+++ b/policy/modules/services/amavis.te
@@ -1,5 +1,5 @@
 
-policy_module(amavis,1.2.1)
+policy_module(amavis,1.2.2)
 
 ########################################
 #
diff --git a/policy/modules/services/clamav.te b/policy/modules/services/clamav.te
index 5eb56ba..141cb6c 100644
--- a/policy/modules/services/clamav.te
+++ b/policy/modules/services/clamav.te
@@ -1,5 +1,5 @@
 
-policy_module(clamav,1.3.0)
+policy_module(clamav,1.3.1)
 
 ########################################
 #
@@ -126,6 +126,7 @@ optional_policy(`
 	amavis_read_lib_files(clamd_t)
 	amavis_read_spool_files(clamd_t)
 	amavis_spool_filetrans(clamd_t,clamd_var_run_t,sock_file)
+	amavis_create_pid_files(clamd_t)
 ')
 
 ########################################
diff --git a/policy/modules/services/pyzor.te b/policy/modules/services/pyzor.te
index 8ee09c7..137a111 100644
--- a/policy/modules/services/pyzor.te
+++ b/policy/modules/services/pyzor.te
@@ -1,5 +1,5 @@
 
-policy_module(pyzor,1.2.0)
+policy_module(pyzor,1.2.1)
 
 ########################################
 #
@@ -50,9 +50,13 @@ kernel_read_system_state(pyzor_t)
 corecmd_list_bin(pyzor_t)
 corecmd_getattr_bin_files(pyzor_t)
 
+corenet_tcp_sendrecv_all_if(pyzor_t)
 corenet_udp_sendrecv_all_if(pyzor_t)
+corenet_tcp_sendrecv_all_nodes(pyzor_t)
 corenet_udp_sendrecv_all_nodes(pyzor_t)
+corenet_tcp_sendrecv_all_ports(pyzor_t)
 corenet_udp_sendrecv_all_ports(pyzor_t)
+corenet_tcp_connect_http_port(pyzor_t)
 
 dev_read_urand(pyzor_t)
 
@@ -77,6 +81,7 @@ optional_policy(`
 ')
 
 optional_policy(`
+	spamassassin_signal_spamd(pyzor_t)
 	spamassassin_read_spamd_tmp_files(pyzor_t)
 ')