Index: policy/modules/kernel/corecommands.fc
===================================================================
RCS file: /cvsroot/serefpolicy/refpolicy/policy/modules/kernel/corecommands.fc,v
retrieving revision 1.11
diff -u -B -r1.11 corecommands.fc
--- policy/modules/kernel/corecommands.fc	24 Mar 2006 21:44:38 -0000	1.11
+++ policy/modules/kernel/corecommands.fc	4 Apr 2006 16:36:38 -0000
@@ -164,6 +164,7 @@
 
 ifdef(`distro_gentoo', `
 /usr/.*-.*-linux-gnu/gcc-bin/.*(/.*)?	gen_context(system_u:object_r:bin_t,s0)
+/usr/.*-.*-linux-gnu/binutils-bin(/.*)?	gen_context(system_u:object_r:bin_t,s0)
 ')
 
 ifdef(`distro_redhat', `
@@ -224,3 +225,8 @@
 ifdef(`distro_suse',`
 /var/lib/samba/bin/.+			gen_context(system_u:object_r:bin_t,s0)
 ')
+
+/var/qmail/bin                  -d      gen_context(system_u:object_r:bin_t,s0)
+/var/qmail/bin(/.*)?                    gen_context(system_u:object_r:bin_t,s0)
+/var/qmail/rc                   --      gen_context(system_u:object_r:bin_t,s0)
+
Index: policy/modules/services/mta.fc
===================================================================
RCS file: /cvsroot/serefpolicy/refpolicy/policy/modules/services/mta.fc,v
retrieving revision 1.5
diff -u -B -r1.5 mta.fc
--- policy/modules/services/mta.fc	2 Feb 2006 21:12:27 -0000	1.5
+++ policy/modules/services/mta.fc	4 Apr 2006 16:36:38 -0000
@@ -12,6 +12,7 @@
 /usr/sbin/sendmail.postfix --	gen_context(system_u:object_r:sendmail_exec_t,s0)
 /usr/sbin/sendmail(.sendmail)? -- gen_context(system_u:object_r:sendmail_exec_t,s0)
 
+/var/qmail/bin/sendmail	--	gen_context(system_u:object_r:sendmail_exec_t,s0)
 /var/mail(/.*)?			gen_context(system_u:object_r:mail_spool_t,s0)
 
 /var/spool/imap(/.*)?		gen_context(system_u:object_r:mail_spool_t,s0)
Index: policy/modules/services/mta.if
===================================================================
RCS file: /cvsroot/serefpolicy/refpolicy/policy/modules/services/mta.if,v
retrieving revision 1.47
diff -u -B -r1.47 mta.if
--- policy/modules/services/mta.if	24 Mar 2006 16:15:50 -0000	1.47
+++ policy/modules/services/mta.if	4 Apr 2006 16:36:39 -0000
@@ -112,6 +112,10 @@
 	')
 
 	optional_policy(`
+		qmail_inject_domtrans($1_mail_t)
+	')
+
+	optional_policy(`
 		gen_require(`
 			type etc_mail_t, mail_spool_t, mqueue_spool_t;
 		')
@@ -138,12 +142,6 @@
 		sendmail_create_log($1_mail_t)
 	')
 
-	ifdef(`TODO',`
-	ifdef(`qmail.te', `
-		allow $1_mail_t qmail_etc_t:dir search;
-		allow $1_mail_t qmail_etc_t:{ file lnk_file } read;
-	')
-	') dnl end TODO
 ')
 
 #######################################
Index: policy/modules/services/mta.te
===================================================================
RCS file: /cvsroot/serefpolicy/refpolicy/policy/modules/services/mta.te,v
retrieving revision 1.42
diff -u -B -r1.42 mta.te
--- policy/modules/services/mta.te	24 Mar 2006 16:15:50 -0000	1.42
+++ policy/modules/services/mta.te	4 Apr 2006 16:36:39 -0000
@@ -162,6 +162,10 @@
 ')
 
 optional_policy(`
+	qmail_inject_domtrans(system_mail_t)
+')
+
+optional_policy(`
 	userdom_dontaudit_use_unpriv_users_ptys(system_mail_t)
 
 	optional_policy(`
Index: policy/modules/services/ucspitcp.te
===================================================================
RCS file: /cvsroot/serefpolicy/refpolicy/policy/modules/services/ucspitcp.te,v
retrieving revision 1.2
diff -u -B -r1.2 ucspitcp.te
--- policy/modules/services/ucspitcp.te	24 Mar 2006 16:15:50 -0000	1.2
+++ policy/modules/services/ucspitcp.te	4 Apr 2006 16:36:39 -0000
@@ -56,6 +56,7 @@
 allow ucspitcp_t self:fifo_file { read write };
 allow ucspitcp_t self:process { fork sigchld };
 allow ucspitcp_t self:tcp_socket create_stream_socket_perms;
+allow ucspitcp_t self:udp_socket create_stream_socket_perms;
 
 corecmd_search_bin(ucspitcp_t)
 corecmd_search_sbin(ucspitcp_t)
@@ -65,6 +66,7 @@
 corenet_tcp_sendrecv_all_nodes(ucspitcp_t)
 corenet_udp_sendrecv_all_nodes(ucspitcp_t)
 corenet_tcp_sendrecv_all_ports(ucspitcp_t)
+corenet_udp_bind_inaddr_any_node(ucspitcp_t)
 corenet_udp_sendrecv_all_ports(ucspitcp_t)
 corenet_non_ipsec_sendrecv(ucspitcp_t)
 corenet_tcp_bind_all_nodes(ucspitcp_t)
Index: policy/modules/system/daemontools.fc
===================================================================
RCS file: /cvsroot/serefpolicy/refpolicy/policy/modules/system/daemontools.fc,v
retrieving revision 1.1
diff -u -B -r1.1 daemontools.fc
--- policy/modules/system/daemontools.fc	16 Jan 2006 18:55:42 -0000	1.1
+++ policy/modules/system/daemontools.fc	4 Apr 2006 16:36:39 -0000
@@ -36,6 +36,10 @@
 /var/dnscache/run	--	gen_context(system_u:object_r:svc_run_exec_t,s0)
 /var/dnscache/log/run	--	gen_context(system_u:object_r:svc_run_exec_t,s0)
 
+/var/qmail/supervise(/.*)?		gen_context(system_u:object_r:svc_svc_t,s0)
+/var/qmail/supervise/.*/run	--	gen_context(system_u:object_r:svc_run_exec_t,s0)
+/var/qmail/supervise/.*/log/run	--	gen_context(system_u:object_r:svc_run_exec_t,s0)
+
 /var/service/.*			gen_context(system_u:object_r:svc_svc_t,s0)
 /var/service/.*/env(/.*)?	gen_context(system_u:object_r:svc_conf_t,s0)
 /var/service/.*/log/main(/.*)?	gen_context(system_u:object_r:svc_log_t,s0)
Index: policy/modules/system/daemontools.te
===================================================================
RCS file: /cvsroot/serefpolicy/refpolicy/policy/modules/system/daemontools.te,v
retrieving revision 1.4
diff -u -B -r1.4 daemontools.te
--- policy/modules/system/daemontools.te	2 Mar 2006 23:45:56 -0000	1.4
+++ policy/modules/system/daemontools.te	4 Apr 2006 16:36:39 -0000
@@ -90,6 +90,10 @@
 daemontools_domtrans_multilog(svc_run_t)
 daemontools_read_svc(svc_run_t)
 
+optional_policy(`
+	qmail_read_config(svc_run_t)
+')
+
 ########################################
 #
 # local policy for service monitoring programs