- Update to upstream

2008-10-14 23:50:08 +00:00 · 2008-10-14 23:50:08 +00:00 · 4125702a20
commit 4125702a20
parent b6cc6a84e9
5 changed files with 744 additions and 1156 deletions
--- a/modules-minimum.conf
+++ b/modules-minimum.conf
@ -1504,6 +1504,13 @@ aide = module
 # 
 w3c = module

+# Layer: services
+# Module: portreserve
+#
+#  reserve ports to prevent portmap mapping them
+# 
+portreserve = module
+
 # Layer: services
 # Module: rpcbind
 #
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@ -1504,6 +1504,13 @@ aide = module
 # 
 w3c = module

+# Layer: services
+# Module: portreserve
+#
+#  reserve ports to prevent portmap mapping them
+# 
+portreserve = module
+
 # Layer: services
 # Module: rpcbind
 #
--- a/policy-20080710.patch
+++ b/policy-20080710.patch
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@ -59,7 +59,6 @@ SELinux Base package

 %files 
 %{_mandir}/*
-%doc %{_usr}/share/doc/%{name}-%{version}
 %dir %{_usr}/share/selinux
 %dir %{_usr}/share/selinux/devel
 %dir %{_usr}/share/selinux/devel/include
@ -71,6 +70,17 @@ SELinux Base package
 %{_usr}/share/selinux/devel/policygentool
 %{_usr}/share/selinux/devel/example.*
 %{_usr}/share/selinux/devel/policy.*
+
+%package doc
+Summary: SELinux policy documentation
+Group: System Environment/Base
+Requires(pre): selinux-policy = %{version}-%{release}
+
+%description doc
+SELinux policy documentation package
+
+%files doc
+%doc %{_usr}/share/doc/%{name}-%{version}
 %attr(755,root,root) %{_usr}/share/selinux/devel/policyhelp

 %check
@ -185,7 +195,7 @@ fi;

 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision  2824.
+Based off of reference policy: Checked out revision  2837.

 %build

--- a/2
+++ b/2
@ -1 +1 @@
-6c66ffc8a5a5a5860cc5834940fa3813  serefpolicy-3.5.12.tgz
+d8844e366ff99f65df95d145a5c2c1fe  serefpolicy-3.5.12.tgz