From 10b03f376bee9f57891aa92144266e0eaa55d500 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Tue, 14 Jul 2009 09:05:59 -0400
Subject: [PATCH] three debian patches from manoj

---
 policy/modules/admin/acct.fc       | 1 +
 policy/modules/admin/acct.te       | 2 +-
 policy/modules/admin/bootloader.fc | 2 ++
 policy/modules/admin/bootloader.te | 2 +-
 policy/modules/apps/cdrecord.fc    | 1 +
 policy/modules/apps/cdrecord.te    | 2 +-
 policy/modules/services/mailman.fc | 1 +
 policy/modules/services/mailman.te | 2 +-
 8 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/policy/modules/admin/acct.fc b/policy/modules/admin/acct.fc
index ab5b5e72..e81367cc 100644
--- a/policy/modules/admin/acct.fc
+++ b/policy/modules/admin/acct.fc
@@ -6,3 +6,4 @@
 /usr/sbin/accton	--	gen_context(system_u:object_r:acct_exec_t,s0)
 
 /var/account(/.*)?		gen_context(system_u:object_r:acct_data_t,s0)
+/var/log/account(/.*)?		gen_context(system_u:object_r:acct_data_t,s0)
diff --git a/policy/modules/admin/acct.te b/policy/modules/admin/acct.te
index 541d9bc7..3ab3c313 100644
--- a/policy/modules/admin/acct.te
+++ b/policy/modules/admin/acct.te
@@ -1,5 +1,5 @@
 
-policy_module(acct, 1.3.0)
+policy_module(acct, 1.3.1)
 
 ########################################
 #
diff --git a/policy/modules/admin/bootloader.fc b/policy/modules/admin/bootloader.fc
index b6383623..7a6f06f5 100644
--- a/policy/modules/admin/bootloader.fc
+++ b/policy/modules/admin/bootloader.fc
@@ -5,3 +5,5 @@
 /sbin/grub		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
 /sbin/lilo.*		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
 /sbin/ybin.*		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
+
+/usr/sbin/grub		--	gen_context(system_u:object_r:bootloader_exec_t,s0)
diff --git a/policy/modules/admin/bootloader.te b/policy/modules/admin/bootloader.te
index 7fbad96d..301ee0ff 100644
--- a/policy/modules/admin/bootloader.te
+++ b/policy/modules/admin/bootloader.te
@@ -1,5 +1,5 @@
 
-policy_module(bootloader, 1.10.0)
+policy_module(bootloader, 1.10.1)
 
 ########################################
 #
diff --git a/policy/modules/apps/cdrecord.fc b/policy/modules/apps/cdrecord.fc
index a24a80cd..91697ccd 100644
--- a/policy/modules/apps/cdrecord.fc
+++ b/policy/modules/apps/cdrecord.fc
@@ -3,3 +3,4 @@
 #
 /usr/bin/cdrecord	--	gen_context(system_u:object_r:cdrecord_exec_t,s0)
 /usr/bin/growisofs	--	gen_context(system_u:object_r:cdrecord_exec_t,s0)
+/usr/bin/wodim		--	gen_context(system_u:object_r:cdrecord_exec_t,s0)
diff --git a/policy/modules/apps/cdrecord.te b/policy/modules/apps/cdrecord.te
index b247e4e1..74dd2448 100644
--- a/policy/modules/apps/cdrecord.te
+++ b/policy/modules/apps/cdrecord.te
@@ -1,5 +1,5 @@
 
-policy_module(cdrecord, 2.0.1)
+policy_module(cdrecord, 2.0.2)
 
 ########################################
 #
diff --git a/policy/modules/services/mailman.fc b/policy/modules/services/mailman.fc
index 839017f0..e57c7136 100644
--- a/policy/modules/services/mailman.fc
+++ b/policy/modules/services/mailman.fc
@@ -3,6 +3,7 @@
 
 /var/lib/mailman(/.*)?			gen_context(system_u:object_r:mailman_data_t,s0)
 /var/lib/mailman/archives(/.*)?		gen_context(system_u:object_r:mailman_archive_t,s0)
+/var/lock/mailman(/.*)?			gen_context(system_u:object_r:mailman_lock_t,s0)
 /var/log/mailman(/.*)?			gen_context(system_u:object_r:mailman_log_t,s0)
 /var/run/mailman(/.*)?			gen_context(system_u:object_r:mailman_lock_t,s0)
 
diff --git a/policy/modules/services/mailman.te b/policy/modules/services/mailman.te
index 79326139..d62e2838 100644
--- a/policy/modules/services/mailman.te
+++ b/policy/modules/services/mailman.te
@@ -1,5 +1,5 @@
 
-policy_module(mailman, 1.6.2)
+policy_module(mailman, 1.6.3)
 
 ########################################
 #