From ce7f30a258417b871376d048eac3d5c7924ec041 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Apr 02 2007 15:17:45 +0000
Subject: - Update to upstream


---

diff --git a/.cvsignore b/.cvsignore
index 8b83df5..1d1e81b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -111,3 +111,4 @@ serefpolicy-2.5.7.tgz
 serefpolicy-2.5.8.tgz
 serefpolicy-2.5.9.tgz
 serefpolicy-2.5.10.tgz
+serefpolicy-2.5.11.tgz
diff --git a/modules-strict.conf b/modules-strict.conf
index 3324c16..797e789 100644
--- a/modules-strict.conf
+++ b/modules-strict.conf
@@ -1368,3 +1368,10 @@ zabbix = module
 #  File System in Userspace (FUSE) utilities
 # 
 fusermount = base
+
+# Layer: services
+# Module: apcupsd
+#
+# daemon for most APC’s UPS for Linux
+#
+apcupsd = module
diff --git a/modules-targeted.conf b/modules-targeted.conf
index 8e4a466..3c11034 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -1281,8 +1281,6 @@ usbmodules = module
 # 
 usernetctl = module
 
-
-
 # Layer: system
 # Module: xen
 #
@@ -1417,3 +1415,9 @@ zabbix = module
 # 
 fusermount = base
 
+# Layer: services
+# Module: apcupsd
+#
+# daemon for most APC’s UPS for Linux
+#
+apcupsd = module
diff --git a/selinux-policy.spec b/selinux-policy.spec
index cec1fb2..9c6530c 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -11,13 +11,13 @@
 %define BUILD_MLS 1
 %endif
 %define POLICYVER 21
-%define libsepolver 1.12.26-1
+%define libsepolver 2.0.1-2
 %define POLICYCOREUTILSVER 2.0.7-5
-%define CHECKPOLICYVER 1.30.11-1
+%define CHECKPOLICYVER 2.0.1-2
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.5.10
-Release: 2%{?dist}
+Version: 2.5.11
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -166,7 +166,7 @@ fi;
 
 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision 2215.
+Based off of reference policy: Checked out revision 2247.
 
 %prep 
 %setup -q -n serefpolicy-%{version}
@@ -187,15 +187,6 @@ mkdir -p %{buildroot}%{_usr}/share/selinux/{targeted,strict,mls}/
 
 # Install devel
 make clean
-make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
-mkdir %{buildroot}%{_usr}/share/selinux/devel/
-mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
-install -m 755 ${RPM_SOURCE_DIR}/policygentool %{buildroot}%{_usr}/share/selinux/devel/
-install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel %{buildroot}%{_usr}/share/selinux/devel/Makefile
-install -m 644 doc/example.* %{buildroot}%{_usr}/share/selinux/devel/
-echo  "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html"> %{buildroot}%{_usr}/share/selinux/devel/policyhelp
-chmod +x %{buildroot}%{_usr}/share/selinux/devel/policyhelp
-
 %if %{BUILD_TARGETED}
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
@@ -218,6 +209,16 @@ cp -f ${RPM_SOURCE_DIR}/modules-strict.conf  ./policy/modules.conf
 %installCmds mls strict-mls y y 
 %endif
 
+make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
+mkdir %{buildroot}%{_usr}/share/selinux/devel/
+mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
+install -m 755 ${RPM_SOURCE_DIR}/policygentool %{buildroot}%{_usr}/share/selinux/devel/
+install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel %{buildroot}%{_usr}/share/selinux/devel/Makefile
+install -m 644 doc/example.* %{buildroot}%{_usr}/share/selinux/devel/
+echo  "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html"> %{buildroot}%{_usr}/share/selinux/devel/policyhelp
+chmod +x %{buildroot}%{_usr}/share/selinux/devel/policyhelp
+
+
 %clean
 %{__rm} -fR %{buildroot}
 
@@ -356,6 +357,9 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
 %endif
 
 %changelog
+* Mon Mar 26 2007 Dan Walsh <dwalsh@redhat.com> 2.5.11-1
+- Update to upstream
+
 * Fri Mar 23 2007 Dan Walsh <dwalsh@redhat.com> 2.5.10-2
 - Allow samba to run groupadd
 
diff --git a/sources b/sources
index b67aac2..710a796 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-167cc1db2323e43bbb9af6520604d195  serefpolicy-2.5.10.tgz
+a40f265b7c28bbb4229ff896f1d145f1  serefpolicy-2.5.11.tgz