- Update to upstream

.cvsignore

@@ -178,3 +178,4 @@ serefpolicy-3.6.20.tgz
 serefpolicy-3.6.21.tgz
 setroubleshoot-2.2.11.tar.gz
 serefpolicy-3.6.22.tgz
+serefpolicy-3.6.23.tgz

customizable_types

@@ -1,2 +1,7 @@
 svirt_image_t
 virt_content_t
+httpd_user_htaccess_t
+httpd_user_script_exec_t
+httpd_user_content_ra_t
+httpd_user_content_rw_t
+httpd_user_content_t

modules-targeted.conf

@@ -557,11 +557,11 @@ gnomeclock = module
 hal = module
 
 # Layer: services
-# Module: polkit
+# Module: policykit
 #
 # Hardware abstraction layer
 # 
-polkit = module
+policykit = module
 
 # Layer: services
 # Module: psad

nsadiff

@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.22 > /tmp/diff
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.23 > /tmp/diff

selinux-policy.spec

@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.22
-Release: 2%{?dist}
+Version: 3.6.23
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -348,7 +348,7 @@ if [ $1 -eq 1 ]; then
    %loadpolicy targeted $packages
    restorecon -R /root /var/log /var/run 2> /dev/null
 else
-   semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null
+   semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid -r polkit_auth 2>/dev/null
    packages="%{expand:%%moduleList targeted} `get_unconfined`"
    %loadpolicy targeted $packages
    %relabel targeted
@@ -459,7 +459,7 @@ SELinux Reference policy mls base module.
 %saveFileContext mls
 
 %post mls 
-semodule -n -s mls -r mailscanner 2>/dev/null
+semodule -n -s mls -r mailscanner -r polkit_auth 2>/dev/null
 packages="%{expand:%%moduleList mls}"
 %loadpolicy mls $packages
 
@@ -475,7 +475,10 @@ exit 0
 %endif
 
 %changelog
-* Sun Jul 19 2009 Dan Walsh <dwalsh@redhat.com> 3.6.22-2
+* Thu Jul 22 2009 Dan Walsh <dwalsh@redhat.com> 3.6.23-1
+- Update to upstream
+
+* Tue Jul 20 2009 Dan Walsh <dwalsh@redhat.com> 3.6.22-3
 - Fix context for VirtualBox
 
 * Tue Jul 14 2009 Dan Walsh <dwalsh@redhat.com> 3.6.22-1

sources

@@ -1 +1 @@
-cd43ce2443ce5e627dee964df3df65a5  serefpolicy-3.6.22.tgz
+f39558603d3d7d1500b93f9d4ce27311  serefpolicy-3.6.23.tgz