From 9ce97af9ccf368a60d6631d92831799e943b8f9e Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Dec 15 2005 23:19:08 +0000
Subject: - Fixes to allow automount to use portmap

- Fixes to start kernel in s0-s15:c0.c255

---

diff --git a/modules-mls.conf b/modules-mls.conf
index 2701295..3da504d 100644
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@ -283,6 +283,13 @@ rshd = base
 cpucontrol = base
 
 # Layer: services
+# Module: vbetool 
+#
+# run real-mode video BIOS code to alter hardware state
+# 
+vbetool = base
+
+# Layer: services
 # Module: bind
 #
 # Berkeley internet name domain DNS server.
@@ -383,6 +390,13 @@ remotelogin = base
 telnet = base
 
 # Layer: services
+# Module: irqbalance
+#
+# IRQ balancing daemon
+# 
+irqbalance = base
+
+# Layer: services
 # Module: mailman
 #
 # Mailman is for managing electronic mail discussion and e-newsletter lists
@@ -453,6 +467,13 @@ networkmanager = base
 inn = base
 
 # Layer: services
+# Module: sysstat
+#
+# Policy for sysstat. Reports on various system states
+# 
+sysstat = base
+
+# Layer: services
 # Module: comsat
 #
 # Comsat, a biff server.
@@ -474,6 +495,13 @@ squid = base
 zebra = base
 
 # Layer: services
+# Module: xfs
+#
+# X Windows Font Server
+# 
+xfs = off
+
+# Layer: services
 # Module: ktalk
 #
 # KDE Talk daemon
@@ -502,6 +530,13 @@ lpd = base
 cyrus = base
 
 # Layer: services
+# Module: rdisc
+#
+# Network router discovery daemon
+# 
+rdisc = base
+
+# Layer: services
 # Module: xdm
 #
 # X windows login display manager
@@ -551,6 +586,13 @@ mta = base
 postfix = base
 
 # Layer: services
+# Module: fetchmail
+#
+# Remote-mail retrieval and forwarding utility
+# 
+fetchmail = base
+
+# Layer: services
 # Module: ntp
 #
 # Network time protocol daemon
@@ -600,6 +642,13 @@ apache = base
 rsync = base
 
 # Layer: services
+# Module: automount
+#
+# Filesystem automounter service.
+# 
+automount = base
+
+# Layer: services
 # Module: kerberos
 #
 # MIT Kerberos admin and KDC
@@ -873,3 +922,9 @@ miscfiles = base
 # 
 ipsec = base
 
+# Layer: apps
+# Module: java
+#
+# java executable
+# 
+java = off
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 3644dc0..0f2bb68 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.1.6
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -40,6 +40,7 @@ Prereq: coreutils
 SELinux Reference policy targeted base module.
 
 %define installCmds() \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} bare \
 cp -f ${RPM_SOURCE_DIR}/modules-%1.conf  ./policy/modules.conf \
 cp -f ${RPM_SOURCE_DIR}/booleans-%1.conf ./policy/booleans.conf \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} base.pp \
@@ -242,6 +243,10 @@ SELinux Reference policy strict base module.
 
 
 %changelog
+* Thu Dec 14 2005 Dan Walsh <dwalsh@redhat.com> 2.1.5-4
+- Fixes to allow automount to use portmap
+- Fixes to start kernel in s0-s15:c0.c255
+
 * Wed Dec 14 2005 Dan Walsh <dwalsh@redhat.com> 2.1.5-3
 - Add java unconfined/execmem policy