rpms/selinux-policy/devel policy-20071130.patch, 1.74, 1.75 selinux-policy.spec, 1.614, 1.615
Daniel J Walsh (dwalsh)
fedora-extras-commits at redhat.com
Tue Feb 26 13:33:08 UTC 2008
Author: dwalsh
Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30800
Modified Files:
policy-20071130.patch selinux-policy.spec
Log Message:
* Tue Feb 26 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-1
- Update to upstream fixes
policy-20071130.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.74 -r 1.75 policy-20071130.patch
Index: policy-20071130.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20071130.patch,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- policy-20071130.patch 22 Feb 2008 20:15:14 -0000 1.74
+++ policy-20071130.patch 26 Feb 2008 13:33:00 -0000 1.75
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-3.3.0/Changelog
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-3.3.1/Changelog
--- nsaserefpolicy/Changelog 2008-02-19 17:24:26.000000000 -0500
-+++ serefpolicy-3.3.0/Changelog 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/Changelog 2008-02-26 08:24:17.000000000 -0500
@@ -1,6 +1,3 @@
-- Pam and samba updates from Stefan Schulze Frielinghaus.
-- Backup update on Debian from Vaclav Ovsik.
@@ -8,23 +8,23 @@
- Label /proc/kallsyms with system_map_t.
- 64-bit capabilities from Stephen Smalley.
- Labeled networking peer object class updates.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.3.0/config/appconfig-mcs/failsafe_context
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context
--- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.0/config/appconfig-mcs/failsafe_context 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/failsafe_context 2008-02-26 08:24:17.000000000 -0500
@@ -1 +1 @@
-sysadm_r:sysadm_t:s0
+system_r:unconfined_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.3.0/config/appconfig-mcs/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts
--- nsaserefpolicy/config/appconfig-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/config/appconfig-mcs/guest_u_default_contexts 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/guest_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
@@ -0,0 +1,4 @@
+system_r:local_login_t:s0 guest_r:guest_t:s0
+system_r:remote_login_t:s0 guest_r:guest_t:s0
+system_r:sshd_t:s0 guest_r:guest_t:s0
+system_r:crond_t:s0 guest_r:guest_crond_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.3.0/config/appconfig-mcs/root_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts
--- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.0/config/appconfig-mcs/root_default_contexts 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/root_default_contexts 2008-02-26 08:24:17.000000000 -0500
@@ -1,11 +1,7 @@
system_r:crond_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
system_r:local_login_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
@@ -38,17 +38,17 @@
#
-#system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+system_r:sshd_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.3.0/config/appconfig-mcs/seusers
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.3.1/config/appconfig-mcs/seusers
--- nsaserefpolicy/config/appconfig-mcs/seusers 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.0/config/appconfig-mcs/seusers 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/seusers 2008-02-26 08:24:17.000000000 -0500
@@ -1,3 +1,3 @@
system_u:system_u:s0-mcs_systemhigh
root:root:s0-mcs_systemhigh
-__default__:user_u:s0
+__default__:unconfined_u:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.3.0/config/appconfig-mcs/unconfined_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts
--- nsaserefpolicy/config/appconfig-mcs/unconfined_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/config/appconfig-mcs/unconfined_u_default_contexts 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/unconfined_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
@@ -0,0 +1,9 @@
+system_r:crond_t:s0 unconfined_r:unconfined_t:s0
+system_r:initrc_t:s0 unconfined_r:unconfined_t:s0
@@ -59,15 +59,15 @@
+system_r:sysadm_su_t:s0 unconfined_r:unconfined_t:s0
+system_r:unconfined_t:s0 unconfined_r:unconfined_t:s0
+system_r:xdm_t:s0 unconfined_r:unconfined_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.3.0/config/appconfig-mcs/userhelper_context
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context
--- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.0/config/appconfig-mcs/userhelper_context 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/userhelper_context 2008-02-26 08:24:17.000000000 -0500
@@ -1 +1 @@
-system_u:sysadm_r:sysadm_t:s0
+system_u:system_r:unconfined_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/x_contexts serefpolicy-3.3.0/config/appconfig-mcs/x_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/x_contexts serefpolicy-3.3.1/config/appconfig-mcs/x_contexts
--- nsaserefpolicy/config/appconfig-mcs/x_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/config/appconfig-mcs/x_contexts 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/x_contexts 2008-02-26 08:24:17.000000000 -0500
@@ -0,0 +1,188 @@
+#
+# Config file for XSELinux extension
@@ -257,26 +257,26 @@
+
+# Default fallback type
+event * system_u:object_r:default_xevent_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.3.0/config/appconfig-mcs/xguest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts
--- nsaserefpolicy/config/appconfig-mcs/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/config/appconfig-mcs/xguest_u_default_contexts 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mcs/xguest_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
@@ -0,0 +1,5 @@
+system_r:local_login_t xguest_r:xguest_t:s0
+system_r:remote_login_t xguest_r:xguest_t:s0
+system_r:sshd_t xguest_r:xguest_t:s0
+system_r:crond_t xguest_r:xguest_crond_t:s0
+system_r:xdm_t xguest_r:xguest_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.3.0/config/appconfig-mls/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts
--- nsaserefpolicy/config/appconfig-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/config/appconfig-mls/guest_u_default_contexts 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mls/guest_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
@@ -0,0 +1,4 @@
+system_r:local_login_t:s0 guest_r:guest_t:s0
+system_r:remote_login_t:s0 guest_r:guest_t:s0
+system_r:sshd_t:s0 guest_r:guest_t:s0
+system_r:crond_t:s0 guest_r:guest_crond_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/x_contexts serefpolicy-3.3.0/config/appconfig-mls/x_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mls/x_contexts serefpolicy-3.3.1/config/appconfig-mls/x_contexts
--- nsaserefpolicy/config/appconfig-mls/x_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/config/appconfig-mls/x_contexts 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-mls/x_contexts 2008-02-26 08:24:17.000000000 -0500
@@ -0,0 +1,188 @@
+#
+# Config file for XSELinux extension
@@ -466,17 +466,17 @@
+
+# Default fallback type
+event * system_u:object_r:default_xevent_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.3.0/config/appconfig-standard/guest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts
--- nsaserefpolicy/config/appconfig-standard/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/config/appconfig-standard/guest_u_default_contexts 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-standard/guest_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
@@ -0,0 +1,4 @@
+system_r:local_login_t guest_r:guest_t
+system_r:remote_login_t guest_r:guest_t
+system_r:sshd_t guest_r:guest_t
+system_r:crond_t guest_r:guest_crond_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.3.0/config/appconfig-standard/root_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/root_default_contexts serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts
--- nsaserefpolicy/config/appconfig-standard/root_default_contexts 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.0/config/appconfig-standard/root_default_contexts 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-standard/root_default_contexts 2008-02-26 08:24:17.000000000 -0500
@@ -1,11 +1,7 @@
system_r:crond_t unconfined_r:unconfined_t sysadm_r:sysadm_crond_t staff_r:staff_crond_t user_r:user_crond_t
system_r:local_login_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
@@ -490,9 +490,9 @@
#
-#system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
+system_r:sshd_t unconfined_r:unconfined_t sysadm_r:sysadm_t staff_r:staff_t user_r:user_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/x_contexts serefpolicy-3.3.0/config/appconfig-standard/x_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/x_contexts serefpolicy-3.3.1/config/appconfig-standard/x_contexts
--- nsaserefpolicy/config/appconfig-standard/x_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/config/appconfig-standard/x_contexts 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-standard/x_contexts 2008-02-26 08:24:17.000000000 -0500
@@ -0,0 +1,188 @@
+#
+# Config file for XSELinux extension
@@ -682,18 +682,18 @@
+
+# Default fallback type
+event * system_u:object_r:default_xevent_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.3.0/config/appconfig-standard/xguest_u_default_contexts
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts
--- nsaserefpolicy/config/appconfig-standard/xguest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/config/appconfig-standard/xguest_u_default_contexts 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/config/appconfig-standard/xguest_u_default_contexts 2008-02-26 08:24:17.000000000 -0500
@@ -0,0 +1,5 @@
+system_r:local_login_t xguest_r:xguest_t
+system_r:remote_login_t xguest_r:xguest_t
+system_r:sshd_t xguest_r:xguest_t
+system_r:crond_t xguest_r:xguest_crond_t
+system_r:xdm_t xguest_r:xguest_t
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.3.0/Makefile
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.3.1/Makefile
--- nsaserefpolicy/Makefile 2008-02-06 10:33:22.000000000 -0500
-+++ serefpolicy-3.3.0/Makefile 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/Makefile 2008-02-26 08:24:17.000000000 -0500
@@ -235,7 +235,7 @@
appdir := $(contextpath)
user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
@@ -736,9 +736,9 @@
endef
# create-base-per-role-tmpl modulenames,outputfile
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.3.0/policy/flask/access_vectors
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.3.1/policy/flask/access_vectors
--- nsaserefpolicy/policy/flask/access_vectors 2008-02-15 09:52:54.000000000 -0500
-+++ serefpolicy-3.3.0/policy/flask/access_vectors 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/policy/flask/access_vectors 2008-02-26 08:24:17.000000000 -0500
@@ -407,141 +407,159 @@
#
# SE-X Windows stuff
@@ -971,9 +971,9 @@
}
#
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/security_classes serefpolicy-3.3.0/policy/flask/security_classes
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/security_classes serefpolicy-3.3.1/policy/flask/security_classes
--- nsaserefpolicy/policy/flask/security_classes 2008-02-15 09:52:54.000000000 -0500
-+++ serefpolicy-3.3.0/policy/flask/security_classes 2008-02-21 16:00:22.000000000 -0500
++++ serefpolicy-3.3.1/policy/flask/security_classes 2008-02-26 08:24:17.000000000 -0500
[...6933 lines suppressed...]
-+++ serefpolicy-3.3.0/policy/modules/users/logadm.te 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/logadm.te 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1,11 @@
+policy_module(logadm,1.0.0)
+
@@ -31607,24 +31804,24 @@
+allow logadm_t self:capability { dac_override dac_read_search kill sys_ptrace sys_nice };
+
+logging_admin(logadm_t, logadm_r, { logadm_devpts_t logadm_tty_device_t })
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.3.0/policy/modules/users/metadata.xml
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.3.1/policy/modules/users/metadata.xml
--- nsaserefpolicy/policy/modules/users/metadata.xml 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/metadata.xml 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/metadata.xml 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1 @@
+<summary>Policy modules for users</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.fc serefpolicy-3.3.0/policy/modules/users/secadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.fc serefpolicy-3.3.1/policy/modules/users/secadm.fc
--- nsaserefpolicy/policy/modules/users/secadm.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/secadm.fc 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/secadm.fc 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1 @@
+# No secadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.if serefpolicy-3.3.0/policy/modules/users/secadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.if serefpolicy-3.3.1/policy/modules/users/secadm.if
--- nsaserefpolicy/policy/modules/users/secadm.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/secadm.if 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/secadm.if 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1 @@
+## <summary>Policy for secadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.te serefpolicy-3.3.0/policy/modules/users/secadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/secadm.te serefpolicy-3.3.1/policy/modules/users/secadm.te
--- nsaserefpolicy/policy/modules/users/secadm.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/secadm.te 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/secadm.te 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1,39 @@
+policy_module(secadm,1.0.1)
+gen_require(`
@@ -31665,19 +31862,19 @@
+optional_policy(`
+ dmesg_exec(secadm_t)
+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.fc serefpolicy-3.3.0/policy/modules/users/staff.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.fc serefpolicy-3.3.1/policy/modules/users/staff.fc
--- nsaserefpolicy/policy/modules/users/staff.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/staff.fc 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/staff.fc 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1 @@
+# No staff file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.if serefpolicy-3.3.0/policy/modules/users/staff.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.if serefpolicy-3.3.1/policy/modules/users/staff.if
--- nsaserefpolicy/policy/modules/users/staff.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/staff.if 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/staff.if 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1 @@
+## <summary>Policy for staff user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.te serefpolicy-3.3.0/policy/modules/users/staff.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/staff.te serefpolicy-3.3.1/policy/modules/users/staff.te
--- nsaserefpolicy/policy/modules/users/staff.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/staff.te 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/staff.te 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1,11 @@
+policy_module(staff,1.0.1)
+userdom_admin_login_user_template(staff)
@@ -31690,37 +31887,37 @@
+ xserver_domtrans_xdm_xserver(staff_t)
+')
+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.fc serefpolicy-3.3.0/policy/modules/users/user.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.fc serefpolicy-3.3.1/policy/modules/users/user.fc
--- nsaserefpolicy/policy/modules/users/user.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/user.fc 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/user.fc 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1 @@
+# No user file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.if serefpolicy-3.3.0/policy/modules/users/user.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.if serefpolicy-3.3.1/policy/modules/users/user.if
--- nsaserefpolicy/policy/modules/users/user.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/user.if 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/user.if 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1 @@
+## <summary>Policy for user user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.te serefpolicy-3.3.0/policy/modules/users/user.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/user.te serefpolicy-3.3.1/policy/modules/users/user.te
--- nsaserefpolicy/policy/modules/users/user.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/user.te 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/user.te 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1,4 @@
+policy_module(user,1.0.1)
+userdom_unpriv_user_template(user)
+
+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.3.0/policy/modules/users/webadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.3.1/policy/modules/users/webadm.fc
--- nsaserefpolicy/policy/modules/users/webadm.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/webadm.fc 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/webadm.fc 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1 @@
+# No webadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.3.0/policy/modules/users/webadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.3.1/policy/modules/users/webadm.if
--- nsaserefpolicy/policy/modules/users/webadm.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/webadm.if 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/webadm.if 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1 @@
+## <summary>Policy for webadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.3.0/policy/modules/users/webadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.3.1/policy/modules/users/webadm.te
--- nsaserefpolicy/policy/modules/users/webadm.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/webadm.te 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/webadm.te 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1,42 @@
+policy_module(webadm,1.0.0)
+
@@ -31764,19 +31961,19 @@
+')
+allow staff_t webadm_t:process transition;
+allow webadm_t staff_t:dir getattr;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.fc serefpolicy-3.3.0/policy/modules/users/xguest.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.fc serefpolicy-3.3.1/policy/modules/users/xguest.fc
--- nsaserefpolicy/policy/modules/users/xguest.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/xguest.fc 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/xguest.fc 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1 @@
+# No xguest file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.if serefpolicy-3.3.0/policy/modules/users/xguest.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.if serefpolicy-3.3.1/policy/modules/users/xguest.if
--- nsaserefpolicy/policy/modules/users/xguest.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/xguest.if 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/xguest.if 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1 @@
+## <summary>Policy for xguest user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.te serefpolicy-3.3.0/policy/modules/users/xguest.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/xguest.te serefpolicy-3.3.1/policy/modules/users/xguest.te
--- nsaserefpolicy/policy/modules/users/xguest.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.3.0/policy/modules/users/xguest.te 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/modules/users/xguest.te 2008-02-26 08:24:18.000000000 -0500
@@ -0,0 +1,66 @@
+policy_module(xguest,1.0.1)
+
@@ -31844,9 +32041,9 @@
+ ')
+')
+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.3.0/policy/support/file_patterns.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.3.1/policy/support/file_patterns.spt
--- nsaserefpolicy/policy/support/file_patterns.spt 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.0/policy/support/file_patterns.spt 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/support/file_patterns.spt 2008-02-26 08:24:18.000000000 -0500
@@ -537,3 +537,23 @@
allow $1 $2:dir rw_dir_perms;
type_transition $1 $2:$4 $3;
@@ -31871,9 +32068,9 @@
+ relabelfrom_fifo_files_pattern($1,$2,$2)
+ relabelfrom_sock_files_pattern($1,$2,$2)
+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.3.0/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.3.1/policy/support/obj_perm_sets.spt
--- nsaserefpolicy/policy/support/obj_perm_sets.spt 2008-02-06 10:33:22.000000000 -0500
-+++ serefpolicy-3.3.0/policy/support/obj_perm_sets.spt 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/support/obj_perm_sets.spt 2008-02-26 08:24:18.000000000 -0500
@@ -315,3 +315,13 @@
#
define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }')
@@ -31888,9 +32085,9 @@
+define(`all_association_perms', `{ sendto recvfrom setcontext polmatch } ')
+
+define(`manage_key_perms', `{ create link read search setattr view write } ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.3.0/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.3.1/policy/users
--- nsaserefpolicy/policy/users 2007-10-12 08:56:09.000000000 -0400
-+++ serefpolicy-3.3.0/policy/users 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/policy/users 2008-02-26 08:24:18.000000000 -0500
@@ -16,7 +16,7 @@
# and a user process should never be assigned the system user
# identity.
@@ -31925,9 +32122,9 @@
- gen_user(root, sysadm, sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r'), s0, s0 - mls_systemhigh, mcs_allcats)
-')
+gen_user(root, unconfined, unconfined_r sysadm_r staff_r ifdef(`enable_mls',`secadm_r auditadm_r') system_r, s0, s0 - mls_systemhigh, mcs_allcats)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.0/Rules.modular
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.3.1/Rules.modular
--- nsaserefpolicy/Rules.modular 2007-12-19 05:32:18.000000000 -0500
-+++ serefpolicy-3.3.0/Rules.modular 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/Rules.modular 2008-02-26 08:24:18.000000000 -0500
@@ -73,8 +73,8 @@
$(tmpdir)/%.mod: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf %.te
@echo "Compliling $(NAME) $(@F) module"
@@ -31957,9 +32154,9 @@
$(tmpdir)/all_te_files.conf: M4PARAM += -D self_contained_policy
$(tmpdir)/all_te_files.conf: $(m4support) $(tmpdir)/generated_definitions.conf $(tmpdir)/all_interfaces.conf $(base_te_files) $(tmpdir)/rolemap.conf
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.monolithic serefpolicy-3.3.0/Rules.monolithic
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.monolithic serefpolicy-3.3.1/Rules.monolithic
--- nsaserefpolicy/Rules.monolithic 2007-11-20 06:55:20.000000000 -0500
-+++ serefpolicy-3.3.0/Rules.monolithic 2008-02-21 16:00:23.000000000 -0500
++++ serefpolicy-3.3.1/Rules.monolithic 2008-02-26 08:24:18.000000000 -0500
@@ -96,7 +96,7 @@
#
# Load the binary policy
Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -r1.614 -r1.615
--- selinux-policy.spec 22 Feb 2008 20:15:14 -0000 1.614
+++ selinux-policy.spec 26 Feb 2008 13:33:00 -0000 1.615
@@ -16,7 +16,7 @@
%define CHECKPOLICYVER 2.0.3-1
Summary: SELinux policy configuration
Name: selinux-policy
-Version: 3.3.0
+Version: 3.3.1
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
@@ -388,6 +388,12 @@
%endif
%changelog
+* Tue Feb 26 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-1
+- Update to upstream fixes
+
+* Fri Feb 22 2008 Dan Walsh <dwalsh at redhat.com> 3.3.0-2
+- Allow staff to mounton user_home_t
+
* Fri Feb 22 2008 Dan Walsh <dwalsh at redhat.com> 3.3.0-1
- Add xace support
More information about the fedora-extras-commits
mailing list