From 451d9b499bcc741d95cb7682f145f02b573cd010 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Fri, 6 Jan 2006 01:04:12 +0000
Subject: [PATCH] - Handle new location of hal scripts

---
 modules-targeted.conf | 58 ++++++++++++++++++++++++++++++++++++++++++-
 selinux-policy.spec   |  9 ++++++-
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/modules-targeted.conf b/modules-targeted.conf
index 649aa35d..363ba7c7 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -113,6 +113,13 @@ usermanage = base
 # 
 rpm = base
 
+# Layer: admin
+# Module: readahead
+#
+# Readahead, read files into page cache for improved performance
+# 
+readahead = base
+
 # Layer: admin
 # Module: kudzu
 #
@@ -174,7 +181,14 @@ amanda = base
 #
 # Rotate and archive system logs
 # 
-logrotate = off
+logrotate = base
+
+# Layer: admin
+# Module: ddcprobe
+#
+# ddcprobe retrieves monitor and graphics card information
+# 
+ddcprobe = module
 
 # Layer: admin
 # Module: quota
@@ -197,6 +211,13 @@ consoletype = base
 # 
 sudo = off
 
+# Layer: admin
+# Module: vbetool
+#
+# run real-mode video BIOS code to alter hardware state
+# 
+vbetool = module
+
 # Layer: admin
 # Module: firstboot
 #
@@ -303,6 +324,13 @@ bind = base
 # 
 canna = base
 
+# Layer: services
+# Module: i18n_input
+#
+# IIIMF htt server
+# 
+i18n_input = module
+
 # Layer: services
 # Module: uucp
 #
@@ -361,6 +389,13 @@ dbus = base
 # 
 howl = base
 
+# Layer: services
+# Module: timidity
+#
+# MIDI to WAV converter and player configured as a service
+# 
+timidity = module
+
 # Layer: services
 # Module: postgresql
 #
@@ -368,6 +403,13 @@ howl = base
 # 
 postgresql = base
 
+# Layer: services
+# Module: openct
+#
+# Service for handling smart card readers.
+# 
+openct = module
+
 # Layer: services
 # Module: snmp
 #
@@ -558,6 +600,13 @@ nscd = base
 # 
 ppp = base
 
+# Layer: services
+# Module: smartmon
+#
+# Smart disk monitoring daemon policy
+# 
+smartmon = module
+
 # Layer: services
 # Module: ftp
 #
@@ -635,6 +684,13 @@ rpc = base
 # 
 apache = base
 
+# Layer: services
+# Module: slrnpull
+#
+# Service for downloading news feeds the slrn newsreader.
+# 
+slrnpull = module
+
 # Layer: services
 # Module: rsync
 #
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 9aed5aea..bfcdfe16 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.1.7
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -61,6 +61,10 @@ make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic}
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} enableaudit \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} base.pp \
 install -m0644 base.pp ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/enableaudit.pp \
+for file in $(ls ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1 | grep -v -e base.pp -e enableaudit.pp ) \
+do \
+	rm ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/$file; \
+done; \
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/booleans \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/config \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/seusers \
@@ -258,6 +262,9 @@ SELinux Reference policy strict base module.
 %endif
 
 %changelog
+* Thu Jan 5 2006 Dan Walsh <dwalsh@redhat.com> 2.1.7-3
+- Handle new location of hal scripts
+
 * Thu Jan 5 2006 Dan Walsh <dwalsh@redhat.com> 2.1.7-2
 - Allow su to read /etc/mtab