rpms/selinux-policy/devel policy-20070703.patch, 1.26, 1.27 selinux-policy.spec, 1.488, 1.489
Daniel J Walsh (dwalsh)
fedora-extras-commits at redhat.com
Fri Aug 3 19:26:36 UTC 2007
Author: dwalsh
Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5473
Modified Files:
policy-20070703.patch selinux-policy.spec
Log Message:
* Thu Aug 2 2007 Dan Walsh <dwalsh at redhat.com> 3.0.5-1
- Update from upstream
policy-20070703.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.26 -r 1.27 policy-20070703.patch
Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- policy-20070703.patch 1 Aug 2007 17:13:35 -0000 1.26
+++ policy-20070703.patch 3 Aug 2007 19:26:03 -0000 1.27
@@ -1,83 +1,87 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/guest_u_default_contexts serefpolicy-3.0.4/config/appconfig-strict-mls/guest_u_default_contexts
---- nsaserefpolicy/config/appconfig-strict-mls/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/config/appconfig-strict-mls/guest_u_default_contexts 2007-07-25 13:27:51.000000000 -0400
-@@ -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-strict-mls/staff_u_default_contexts serefpolicy-3.0.4/config/appconfig-strict-mls/staff_u_default_contexts
---- nsaserefpolicy/config/appconfig-strict-mls/staff_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/config/appconfig-strict-mls/staff_u_default_contexts 2007-07-25 13:27:51.000000000 -0400
-@@ -0,0 +1,9 @@
-+system_r:local_login_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
-+system_r:remote_login_t:s0 staff_r:staff_t:s0
-+system_r:sshd_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
-+system_r:crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 mailman_r:user_crond_t:s0
-+system_r:xdm_t:s0 staff_r:staff_t:s0
-+staff_r:staff_su_t:s0 staff_r:staff_t:s0
-+staff_r:staff_sudo_t:s0 staff_r:staff_t:s0
-+sysadm_r:sysadm_su_t:s0 sysadm_r:sysadm_t:s0
-+sysadm_r:sysadm_sudo_t:s0 sysadm_r:sysadm_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/user_u_default_contexts serefpolicy-3.0.4/config/appconfig-strict-mls/user_u_default_contexts
---- nsaserefpolicy/config/appconfig-strict-mls/user_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/config/appconfig-strict-mls/user_u_default_contexts 2007-07-25 13:27:51.000000000 -0400
-@@ -0,0 +1,7 @@
-+system_r:local_login_t:s0 user_r:user_t:s0
-+system_r:remote_login_t:s0 user_r:user_t:s0
-+system_r:sshd_t:s0 user_r:user_t:s0
-+system_r:crond_t:s0 user_r:user_crond_t:s0
-+system_r:xdm_t:s0 user_r:user_t:s0
-+user_r:user_su_t:s0 user_r:user_t:s0
-+user_r:user_sudo_t:s0 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/default_type serefpolicy-3.0.4/config/appconfig-targeted-mcs/default_type
---- nsaserefpolicy/config/appconfig-targeted-mcs/default_type 2007-05-25 09:09:09.000000000 -0400
-+++ serefpolicy-3.0.4/config/appconfig-targeted-mcs/default_type 2007-07-25 13:27:51.000000000 -0400
-@@ -1 +1,4 @@
- system_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-targeted-mcs/guest_u_default_contexts serefpolicy-3.0.4/config/appconfig-targeted-mcs/guest_u_default_contexts
---- nsaserefpolicy/config/appconfig-targeted-mcs/guest_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/config/appconfig-targeted-mcs/guest_u_default_contexts 2007-07-25 13:27:51.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_contexts serefpolicy-3.0.5/config/appconfig-mcs/default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/default_contexts 2007-08-02 08:17:32.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/default_contexts 2007-08-03 14:06:26.000000000 -0400
+@@ -1,15 +1,9 @@
+-system_r:crond_t:s0 user_r:user_crond_t:s0 staff_r:staff_crond_t:s0 sysadm_r:sysadm_crond_t:s0 system_r:system_crond_t:s0 unconfined_r:unconfined_crond_t:s0
+-system_r:local_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
+-system_r:remote_login_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 unconfined_r:unconfined_t:s0
+-system_r:sshd_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
+-system_r:sulogin_t:s0 sysadm_r:sysadm_t:s0
+-system_r:xdm_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0 unconfined_r:unconfined_t:s0
+-
+-staff_r:staff_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+-staff_r:staff_sudo_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0
+-
+-sysadm_r:sysadm_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+-sysadm_r:sysadm_sudo_t:s0 sysadm_r:sysadm_t:s0
+-
+-user_r:user_su_t:s0 user_r:user_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+-user_r:user_sudo_t:s0 sysadm_r:sysadm_t:s0 user_r:user_t:s0
++system_r:crond_t:s0 system_r:unconfined_t:s0
++system_r:initrc_t:s0 system_r:unconfined_t:s0
++system_r:local_login_t:s0 system_r:unconfined_t:s0
++system_r:remote_login_t:s0 system_r:unconfined_t:s0
++system_r:rshd_t:s0 system_r:unconfined_t:s0
++system_r:sshd_t:s0 system_r:unconfined_t:s0
++system_r:sysadm_su_t:s0 system_r:unconfined_t:s0
++system_r:unconfined_t:s0 system_r:unconfined_t:s0
++system_r:xdm_t:s0 system_r:unconfined_t:s0
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/default_type serefpolicy-3.0.5/config/appconfig-mcs/default_type
+--- nsaserefpolicy/config/appconfig-mcs/default_type 2007-08-02 08:17:32.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/default_type 2007-08-03 14:06:26.000000000 -0400
+@@ -1,4 +1,4 @@
++system_r:unconfined_t
+ sysadm_r:sysadm_t
+ staff_r:staff_t
+-unconfined_r:unconfined_t
+ user_r:user_t
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/failsafe_context serefpolicy-3.0.5/config/appconfig-mcs/failsafe_context
+--- nsaserefpolicy/config/appconfig-mcs/failsafe_context 2007-08-02 08:17:32.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/failsafe_context 2007-08-03 14:06:26.000000000 -0400
+@@ -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.0.5/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.0.5/config/appconfig-mcs/guest_u_default_contexts 2007-08-03 14:06:26.000000000 -0400
@@ -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-targeted-mcs/initrc_context serefpolicy-3.0.4/config/appconfig-targeted-mcs/initrc_context
---- nsaserefpolicy/config/appconfig-targeted-mcs/initrc_context 2007-05-25 09:09:09.000000000 -0400
-+++ serefpolicy-3.0.4/config/appconfig-targeted-mcs/initrc_context 2007-07-25 13:27:51.000000000 -0400
-@@ -1 +1 @@
--user_u:system_r:initrc_t:s0
-+system_u:system_r:initrc_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/root_default_contexts serefpolicy-3.0.4/config/appconfig-targeted-mcs/root_default_contexts
---- nsaserefpolicy/config/appconfig-targeted-mcs/root_default_contexts 2007-05-25 09:09:09.000000000 -0400
-+++ serefpolicy-3.0.4/config/appconfig-targeted-mcs/root_default_contexts 2007-07-25 13:27:51.000000000 -0400
-@@ -1,2 +1,10 @@
--system_r:unconfined_t:s0 system_r:unconfined_t:s0
--system_r:initrc_t:s0 system_r:unconfined_t:s0
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/root_default_contexts serefpolicy-3.0.5/config/appconfig-mcs/root_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/root_default_contexts 2007-08-02 08:17:32.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/root_default_contexts 2007-08-03 14:06:26.000000000 -0400
+@@ -1,11 +1,10 @@
+-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
+-
+-staff_r:staff_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+-sysadm_r:sysadm_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+-user_r:user_su_t:s0 unconfined_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+-
+system_r:local_login_t:s0 system_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+system_r:crond_t:s0 system_r:unconfined_t:s0 sysadm_r:sysadm_crond_t:s0 staff_r:staff_crond_t:s0 user_r:user_crond_t:s0
+staff_r:staff_su_t:s0 system_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+sysadm_r:sysadm_su_t:s0 system_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
+user_r:user_su_t:s0 system_r:unconfined_t:s0 sysadm_r:sysadm_t:s0 staff_r:staff_t:s0 user_r:user_t:s0
-+#
-+# Uncomment if you want to automatically login as sysadm_r
-+#
+ #
+ # Uncomment if you want to automatically login as sysadm_r
+ #
+-#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 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-targeted-mcs/seusers serefpolicy-3.0.4/config/appconfig-targeted-mcs/seusers
---- nsaserefpolicy/config/appconfig-targeted-mcs/seusers 2007-05-31 15:35:39.000000000 -0400
-+++ serefpolicy-3.0.4/config/appconfig-targeted-mcs/seusers 2007-07-25 13:27:51.000000000 -0400
-@@ -1,2 +1,2 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/seusers serefpolicy-3.0.5/config/appconfig-mcs/seusers
+--- nsaserefpolicy/config/appconfig-mcs/seusers 2007-08-02 08:17:32.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/seusers 2007-08-03 14:06:26.000000000 -0400
+@@ -1,3 +1,2 @@
+-system_u:system_u:s0-mcs_systemhigh
root:root:s0-mcs_systemhigh
-__default__:user_u:s0
+__default__:system_u:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/staff_u_default_contexts serefpolicy-3.0.4/config/appconfig-targeted-mcs/staff_u_default_contexts
---- nsaserefpolicy/config/appconfig-targeted-mcs/staff_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/config/appconfig-targeted-mcs/staff_u_default_contexts 2007-07-25 13:27:51.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts serefpolicy-3.0.5/config/appconfig-mcs/staff_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/staff_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.0.5/config/appconfig-mcs/staff_u_default_contexts 2007-08-03 14:06:26.000000000 -0400
@@ -0,0 +1,9 @@
+system_r:local_login_t:s0 staff_r:staff_t:s0 sysadm_r:sysadm_t:s0
+system_r:remote_login_t:s0 staff_r:staff_t:s0
@@ -88,9 +92,15 @@
+staff_r:staff_sudo_t:s0 staff_r:staff_t:s0
+sysadm_r:sysadm_su_t:s0 sysadm_r:sysadm_t:s0
+sysadm_r:sysadm_sudo_t:s0 sysadm_r:sysadm_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/user_u_default_contexts serefpolicy-3.0.4/config/appconfig-targeted-mcs/user_u_default_contexts
---- nsaserefpolicy/config/appconfig-targeted-mcs/user_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/config/appconfig-targeted-mcs/user_u_default_contexts 2007-07-25 13:27:51.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-mcs/userhelper_context serefpolicy-3.0.5/config/appconfig-mcs/userhelper_context
+--- nsaserefpolicy/config/appconfig-mcs/userhelper_context 2007-08-02 08:17:32.000000000 -0400
++++ serefpolicy-3.0.5/config/appconfig-mcs/userhelper_context 2007-08-03 14:06:26.000000000 -0400
+@@ -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/user_u_default_contexts serefpolicy-3.0.5/config/appconfig-mcs/user_u_default_contexts
+--- nsaserefpolicy/config/appconfig-mcs/user_u_default_contexts 1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-3.0.5/config/appconfig-mcs/user_u_default_contexts 2007-08-03 14:06:26.000000000 -0400
@@ -0,0 +1,7 @@
+system_r:local_login_t:s0 system_r:unconfined_t:s0 user_r:user_t:s0
+system_r:remote_login_t:s0 system_r:unconfined_t:s0 user_r:user_t:s0
@@ -99,41 +109,154 @@
+system_r:xdm_t:s0 system_r:unconfined_t:s0 user_r:user_t:s0
+user_r:user_su_t:s0 system_r:unconfined_t:s0 user_r:user_t:s0
+user_r:user_sudo_t:s0 system_r:unconfined_t:s0 user_r:user_t:s0
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-3.0.4/Makefile
---- nsaserefpolicy/Makefile 2007-07-25 10:37:43.000000000 -0400
-+++ serefpolicy-3.0.4/Makefile 2007-07-25 13:27:51.000000000 -0400
-@@ -158,8 +158,18 @@
- headerdir = $(modpkgdir)/include
- docsdir = $(prefix)/share/doc/$(PKGNAME)
-
-+# compile strict policy if requested.
-+ifneq ($(findstring strict,$(TYPE)),)
-+ M4PARAM += -D strict_policy
-+endif
-+
-+# compile targeted policy if requested.
-+ifneq ($(findstring targeted,$(TYPE)),)
-+ M4PARAM += -D targeted_policy
-+endif
[...4028 lines suppressed...]
+policy_module(guest,1.0.0)
+userdom_unpriv_login_user(guest)
+userdom_unpriv_login_user(gadmin)
+userdom_unpriv_xwindows_login_user(xguest)
+mozilla_per_role_template(xguest, xguest_t, xguest_r)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.4/policy/modules/users/logadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.5/policy/modules/users/logadm.fc
--- nsaserefpolicy/policy/modules/users/logadm.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/policy/modules/users/logadm.fc 2007-07-25 13:27:51.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/logadm.fc 2007-08-03 14:06:26.000000000 -0400
@@ -0,0 +1 @@
+# No logadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.4/policy/modules/users/logadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.5/policy/modules/users/logadm.if
--- nsaserefpolicy/policy/modules/users/logadm.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/policy/modules/users/logadm.if 2007-07-25 13:27:51.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/logadm.if 2007-08-03 14:06:26.000000000 -0400
@@ -0,0 +1 @@
+## <summary>Policy for logadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.4/policy/modules/users/logadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.5/policy/modules/users/logadm.te
--- nsaserefpolicy/policy/modules/users/logadm.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/policy/modules/users/logadm.te 2007-07-25 13:27:51.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/logadm.te 2007-08-03 14:06:26.000000000 -0400
@@ -0,0 +1,33 @@
+policy_module(logadm,1.0.0)
+
@@ -12109,24 +12275,24 @@
+
+files_dontaudit_search_all_dirs(logadm_t)
+files_dontaudit_getattr_all_files(logadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.4/policy/modules/users/metadata.xml
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.5/policy/modules/users/metadata.xml
--- nsaserefpolicy/policy/modules/users/metadata.xml 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/policy/modules/users/metadata.xml 2007-07-25 13:27:51.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/metadata.xml 2007-08-03 14:06:26.000000000 -0400
@@ -0,0 +1 @@
+<summary>Policy modules for users</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.4/policy/modules/users/webadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.5/policy/modules/users/webadm.fc
--- nsaserefpolicy/policy/modules/users/webadm.fc 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/policy/modules/users/webadm.fc 2007-07-25 13:27:51.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/webadm.fc 2007-08-03 14:06:26.000000000 -0400
@@ -0,0 +1 @@
+# No webadm file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.4/policy/modules/users/webadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.5/policy/modules/users/webadm.if
--- nsaserefpolicy/policy/modules/users/webadm.if 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/policy/modules/users/webadm.if 2007-07-25 13:27:51.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/webadm.if 2007-08-03 14:06:26.000000000 -0400
@@ -0,0 +1 @@
+## <summary>Policy for webadm user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.4/policy/modules/users/webadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.5/policy/modules/users/webadm.te
--- nsaserefpolicy/policy/modules/users/webadm.te 1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.4/policy/modules/users/webadm.te 2007-07-27 14:44:20.000000000 -0400
++++ serefpolicy-3.0.5/policy/modules/users/webadm.te 2007-08-03 14:06:26.000000000 -0400
@@ -0,0 +1,70 @@
+policy_module(webadm,1.0.0)
+
@@ -12198,9 +12364,69 @@
+allow webadm_t gadmin_t:dir getattr;
+
+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.4/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-3.0.5/policy/support/file_patterns.spt
+--- nsaserefpolicy/policy/support/file_patterns.spt 2007-05-29 14:10:59.000000000 -0400
++++ serefpolicy-3.0.5/policy/support/file_patterns.spt 2007-08-03 14:06:26.000000000 -0400
+@@ -310,47 +310,47 @@
+ #
+ define(`getattr_sock_files_pattern',`
+ allow $1 $2:dir search_dir_perms;
+- allow $1 $3:sock_file getattr_fifo_file_perms;
++ allow $1 $3:sock_file getattr_sock_file_perms;
+ ')
+
+ define(`setattr_sock_files_pattern',`
+ allow $1 $2:dir search_dir_perms;
+- allow $1 $3:sock_file setattr_fifo_file_perms;
++ allow $1 $3:sock_file setattr_sock_file_perms;
+ ')
+
+ define(`read_sock_files_pattern',`
+ allow $1 $2:dir search_dir_perms;
+- allow $1 $3:sock_file read_fifo_file_perms;
++ allow $1 $3:sock_file read_sock_file_perms;
+ ')
+
+ define(`write_sock_files_pattern',`
+ allow $1 $2:dir search_dir_perms;
+- allow $1 $3:sock_file write_fifo_file_perms;
++ allow $1 $3:sock_file write_sock_file_perms;
+ ')
+
+ define(`rw_sock_files_pattern',`
+ allow $1 $2:dir search_dir_perms;
+- allow $1 $3:sock_file rw_fifo_file_perms;
++ allow $1 $3:sock_file rw_sock_file_perms;
+ ')
+
+ define(`create_sock_files_pattern',`
+ allow $1 $2:dir add_entry_dir_perms;
+- allow $1 $3:sock_file create_fifo_file_perms;
++ allow $1 $3:sock_file create_sock_file_perms;
+ ')
+
+ define(`delete_sock_files_pattern',`
+ allow $1 $2:dir del_entry_dir_perms;
+- allow $1 $3:sock_file delete_fifo_file_perms;
++ allow $1 $3:sock_file delete_sock_file_perms;
+ ')
+
+ define(`rename_sock_files_pattern',`
+ allow $1 $2:dir rw_dir_perms;
+- allow $1 $3:sock_file rename_fifo_file_perms;
++ allow $1 $3:sock_file rename_sock_file_perms;
+ ')
+
+ define(`manage_sock_files_pattern',`
+ allow $1 $2:dir rw_dir_perms;
+- allow $1 $3:sock_file manage_fifo_file_perms;
++ allow $1 $3:sock_file manage_sock_file_perms;
+ ')
+
+ define(`relabelfrom_sock_files_pattern',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.5/policy/support/obj_perm_sets.spt
--- nsaserefpolicy/policy/support/obj_perm_sets.spt 2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.4/policy/support/obj_perm_sets.spt 2007-07-25 13:27:51.000000000 -0400
++++ serefpolicy-3.0.5/policy/support/obj_perm_sets.spt 2007-08-03 14:06:26.000000000 -0400
@@ -201,7 +201,7 @@
define(`search_dir_perms',`{ getattr search }')
define(`list_dir_perms',`{ getattr search read lock ioctl }')
@@ -12233,9 +12459,9 @@
+define(`all_association', `{ sendto recvfrom setcontext polmatch } ')
+
+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.4/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.5/policy/users
--- nsaserefpolicy/policy/users 2007-07-17 14:52:27.000000000 -0400
-+++ serefpolicy-3.0.4/policy/users 2007-07-25 13:27:51.000000000 -0400
++++ serefpolicy-3.0.5/policy/users 2007-08-03 14:06:26.000000000 -0400
@@ -16,7 +16,7 @@
# and a user process should never be assigned the system user
# identity.
@@ -12270,9 +12496,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, sysadm, 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.0.4/Rules.modular
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.5/Rules.modular
--- nsaserefpolicy/Rules.modular 2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.4/Rules.modular 2007-07-25 13:27:51.000000000 -0400
++++ serefpolicy-3.0.5/Rules.modular 2007-08-03 14:06:26.000000000 -0400
@@ -167,7 +167,7 @@
# these have to run individually because order matters:
$(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true
@@ -12299,43 +12525,3 @@
# Clean the sources
#
clean:
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.0.4/support/Makefile.devel
---- nsaserefpolicy/support/Makefile.devel 2007-05-29 13:53:56.000000000 -0400
-+++ serefpolicy-3.0.4/support/Makefile.devel 2007-07-25 13:27:51.000000000 -0400
-@@ -24,7 +24,7 @@
- XMLLINT := $(BINDIR)/xmllint
-
- # set default build options if missing
--TYPE ?= standard
-+TYPE ?= strict
- DIRECT_INITRC ?= n
- POLY ?= n
- QUIET ?= y
-@@ -39,15 +39,25 @@
- globaltun = $(HEADERDIR)/global_tunables.xml
- globalbool = $(HEADERDIR)/global_booleans.xml
-
-+# compile strict policy if requested.
-+ifneq ($(findstring strict,$(TYPE)),)
-+ M4PARAM += -D strict_policy
-+endif
-+
-+# compile targeted policy if requested.
-+ifneq ($(findstring targeted,$(TYPE)),)
-+ M4PARAM += -D targeted_policy
-+endif
-+
- # enable MLS if requested.
--ifeq "$(TYPE)" "mls"
-+ifneq ($(findstring -mls,$(TYPE)),)
- M4PARAM += -D enable_mls
- CHECKPOLICY += -M
- CHECKMODULE += -M
- endif
-
- # enable MLS if MCS requested.
--ifeq "$(TYPE)" "mcs"
-+ifneq ($(findstring -mcs,$(TYPE)),)
- M4PARAM += -D enable_mcs
- CHECKPOLICY += -M
- CHECKMODULE += -M
Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- selinux-policy.spec 1 Aug 2007 17:13:35 -0000 1.488
+++ selinux-policy.spec 3 Aug 2007 19:26:04 -0000 1.489
@@ -16,8 +16,8 @@
%define CHECKPOLICYVER 2.0.3-1
Summary: SELinux policy configuration
Name: selinux-policy
-Version: 3.0.4
-Release: 5%{?dist}
+Version: 3.0.5
+Release: 1%{?dist}
License: GPL
Group: System Environment/Base
Source: serefpolicy-%{version}.tgz
@@ -142,6 +142,7 @@
%dir %{_sysconfdir}/selinux/%1/contexts/users \
%config(noreplace) %{_sysconfdir}/selinux/%1/contexts/users/root \
%config(noreplace) %{_sysconfdir}/selinux/%1/contexts/users/guest_u \
+%config(noreplace) %{_sysconfdir}/selinux/%1/contexts/users/xguest_u \
%config(noreplace) %{_sysconfdir}/selinux/%1/contexts/users/user_u \
%config(noreplace) %{_sysconfdir}/selinux/%1/contexts/users/staff_u
@@ -196,21 +197,21 @@
%if %{BUILD_TARGETED}
# Build targeted policy
# Commented out because only targeted ref policy currently builds
-%setupCmds targeted targeted-mcs n y
-%installCmds targeted targeted-mcs n y
+%setupCmds targeted mcs n y
+%installCmds targeted mcs n y
%endif
%if %{BUILD_MLS}
# Build mls policy
-%setupCmds mls strict-mls n y
-%installCmds mls strict-mls n y
+%setupCmds mls mls n y
+%installCmds mls mls n y
%endif
%if %{BUILD_OLPC}
# Build targeted policy
# Commented out because only targeted ref policy currently builds
-%setupCmds olpc targeted-mcs n y
-%installCmds olpc targeted-mcs n y
+%setupCmds olpc mcs n y
+%installCmds olpc mcs n y
%endif
make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=y MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
@@ -359,6 +360,12 @@
%endif
%changelog
+* Thu Aug 2 2007 Dan Walsh <dwalsh at redhat.com> 3.0.5-1
+- Update from upstream
+
+* Wed Aug 1 2007 Dan Walsh <dwalsh at redhat.com> 3.0.4-6
+- Add nasd support
+
* Wed Aug 1 2007 Dan Walsh <dwalsh at redhat.com> 3.0.4-5
- Fix new usb devices and dmfm
More information about the fedora-extras-commits
mailing list