diff --git a/modules-minimum.conf b/modules-minimum.conf index 4b4483b..7c892d7 100644 --- a/modules-minimum.conf +++ b/modules-minimum.conf @@ -1897,6 +1897,13 @@ xfs = module xserver = base # Layer: services +# Module: zarafa +# +# Zarafa Collaboration Platform +# +zarafa = module + +# Layer: services # Module: zebra # # Zebra border gateway protocol network routing service diff --git a/modules-targeted.conf b/modules-targeted.conf index 4b4483b..7c892d7 100644 --- a/modules-targeted.conf +++ b/modules-targeted.conf @@ -1897,6 +1897,13 @@ xfs = module xserver = base # Layer: services +# Module: zarafa +# +# Zarafa Collaboration Platform +# +zarafa = module + +# Layer: services # Module: zebra # # Zebra border gateway protocol network routing service diff --git a/policy-F14.patch b/policy-F14.patch index e731af5..356e810 100644 --- a/policy-F14.patch +++ b/policy-F14.patch @@ -679,8 +679,8 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ncftool + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ncftool.te serefpolicy-3.8.3/policy/modules/admin/ncftool.te --- nsaserefpolicy/policy/modules/admin/ncftool.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-3.8.3/policy/modules/admin/ncftool.te 2010-06-15 15:02:33.000000000 -0400 -@@ -0,0 +1,79 @@ ++++ serefpolicy-3.8.3/policy/modules/admin/ncftool.te 2010-06-16 16:18:19.000000000 -0400 +@@ -0,0 +1,80 @@ + +policy_module(ncftool, 1.0.0) + @@ -735,6 +735,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ncftool + +miscfiles_read_localization(ncftool_t) + ++modutils_list_module_config(ncftool_t) +modutils_read_module_config(ncftool_t) +modutils_domtrans_insmod(ncftool_t) + diff --git a/selinux-policy.spec b/selinux-policy.spec index 2374cee..4d7c28b 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -20,7 +20,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.8.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -469,6 +469,9 @@ exit 0 %endif %changelog +* Wed Jun 9 2010 Dan Walsh 3.8.3-4 +- Add Zarafa policy + * Wed Jun 9 2010 Dan Walsh 3.8.3-3 - Cleanup of aiccu policy - initial mock policy