- More of my patches from upstream

.cvsignore

@@ -108,3 +108,4 @@ serefpolicy-2.5.4.tgz
 serefpolicy-2.5.5.tgz
 serefpolicy-2.5.6.tgz
 serefpolicy-2.5.7.tgz
+serefpolicy-2.5.8.tgz

modules-mls.conf

@@ -1037,3 +1037,10 @@ pcscd = module
 # Policy for tzdata-update
 # 
 tzdata = base
+
+# Layer: admin
+# Module: amtu
+#
+# Abstract Machine Test Utility (AMTU)
+# 
+amtu = module

modules-strict.conf

@@ -456,7 +456,7 @@ ethereal = module
 # Layer: apps
 # Module: userhelper
 #
-# SELinux utility to run a shell with a new role
+# A helper interface to pam.
 # 
 userhelper = module
 
@@ -814,13 +814,6 @@ openct = module
 # 
 snmp = module
 
-# Layer: services
-# Module: ucspitcp
-#
-# ucspitcp policy
-# 
-ucspitcp = module
-
 # Layer: services
 # Module: publicfile
 #
@@ -1128,7 +1121,7 @@ xserver = module
 #
 # Apache web server
 # 
-apache = module
+apache = base
 
 # Layer: services
 # Module: slrnpull
@@ -1340,3 +1333,24 @@ qmail = module
 # daiemon that bans IP that makes too many password failures
 # 
 fail2ban = module
+
+# Layer: services
+# Module: pyzor
+#
+# Spam Blocker
+# 
+pyzor = module
+
+# Layer: services
+# Module: ricci
+#
+# policy for ricci
+# 
+ricci = module
+
+# Layer: admin
+# Module: amtu
+#
+# Abstract Machine Test Utility (AMTU)
+# 
+amtu = module

selinux-policy.spec

@@ -16,7 +16,7 @@
 %define CHECKPOLICYVER 1.30.11-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.5.7
+Version: 2.5.8
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -166,7 +166,7 @@ fi;
 
 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision 2204.
+Based off of reference policy: Checked out revision 2215.
 
 %prep 
 %setup -q -n serefpolicy-%{version}
@@ -356,6 +356,9 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
 %endif
 
 %changelog
+* Thu Mar 1 2007 Dan Walsh <dwalsh@redhat.com> 2.5.8-1
+- More of my patches from upstream
+
 * Thu Mar 1 2007 Dan Walsh <dwalsh@redhat.com> 2.5.7-1
 - Update to latest from upstream
 - Add fail2ban policy

sources

@@ -1 +1 @@
-5209f5a625764686415aac33935756f5  serefpolicy-2.5.7.tgz
+4fdcc031513d86d233bab7661226046a  serefpolicy-2.5.8.tgz