diff --git a/.cvsignore b/.cvsignore index f0cf620..4d3e6b6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -37,3 +37,4 @@ serefpolicy-2.2.9.tgz serefpolicy-2.2.10.tgz serefpolicy-2.2.11.tgz serefpolicy-2.2.12.tgz +serefpolicy-2.2.13.tgz diff --git a/modules-mls.conf b/modules-mls.conf index 84d6c2a..0044066 100644 --- a/modules-mls.conf +++ b/modules-mls.conf @@ -838,6 +838,13 @@ init = base selinuxutil = base # Layer: system +# Module: semodule +# +# Policy for semodule +# +semodule = base + +# Layer: system # Module: udev # # Policy for udev. @@ -970,3 +977,5 @@ slocate = base # logwatch executable # logwatch = base + + diff --git a/modules-strict.conf b/modules-strict.conf index 5d7d2b3..8f9aa46 100644 --- a/modules-strict.conf +++ b/modules-strict.conf @@ -1022,6 +1022,13 @@ init = module selinuxutil = module # Layer: system +# Module: semodule +# +# Policy for semodule +# +semodule = base + +# Layer: system # Module: udev # # Policy for udev. diff --git a/policygentool b/policygentool index 5fa47a1..ee31b35 100644 --- a/policygentool +++ b/policygentool @@ -26,23 +26,7 @@ import re ########################### Interface File ############################# interface="\n\ -## <summary>TEMPLATETYPE policy</summary>\n\ -## <desc>\n\ -## <p>\n\ -## More descriptive text about TEMPLATETYPE. The <desc>\n\ -## tag can also use <p>, <ul>, and <ol>\n\ -## html tags for formatting.\n\ -## </p>\n\ -## <p>\n\ -## This policy supports the following TEMPLATETYPE features:\n\ -## <ul>\n\ -## <li>Feature A</li>\n\ -## <li>Feature B</li>\n\ -## <li>Feature C</li>\n\ -## </ul>\n\ -## </p>\n\ -## </desc>\n\ -#\n\ +## <summary>policy for TEMPLATETYPE</summary>\n\ \n\ ########################################\n\ ## <summary>\n\ @@ -61,8 +45,8 @@ interface(`TEMPLATETYPE_domtrans',`\n\ \n\ allow $1 TEMPLATETYPE_t:fd use;\n\ allow TEMPLATETYPE_t $1:fd use;\n\ - allow $1 TEMPLATETYPE_t:fifo_file rw_file_perms;\n\ - allow $1 TEMPLATETYPE_t:process sigchld;\n\ + allow TEMPLATETYPE_t:$1:fifo_file rw_file_perms;\n\ + allow TEMPLATETYPE_t $1:process sigchld;\n\ ')\n\ " diff --git a/selinux-policy.spec b/selinux-policy.spec index 2094643..c4ec044 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -5,7 +5,7 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.12 +Version: 2.2.13 Release: 1 License: GPL Group: System Environment/Base @@ -295,6 +295,9 @@ SELinux Reference policy development files %changelog +* Fri Feb 10 2006 Dan Walsh <dwalsh@redhat.com> 2.2.13-1 +- Add semodule policy + * Tue Feb 7 2006 Dan Walsh <dwalsh@redhat.com> 2.2.12-1 - Update from upstream diff --git a/sources b/sources index 6064779..cd21c60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90df72dee4541507737910ff48175760 serefpolicy-2.2.12.tgz +cd259d3029bd3688b80a8b7804a75e10 serefpolicy-2.2.13.tgz