rpms/selinux-policy/devel .cvsignore, 1.119, 1.120 policy-20070703.patch, 1.19, 1.20 selinux-policy.spec, 1.481, 1.482 sources, 1.130, 1.131

Daniel J Walsh (dwalsh) fedora-extras-commits at redhat.com
Thu Jul 26 17:54:56 UTC 2007


Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14502

Modified Files:
	.cvsignore policy-20070703.patch selinux-policy.spec sources 
Log Message:
* Tue Jul 23 2007 Dan Walsh <dwalsh at redhat.com> 3.0.4-1
- Update with latest changes from upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- .cvsignore	19 Jul 2007 14:45:16 -0000	1.119
+++ .cvsignore	26 Jul 2007 17:54:24 -0000	1.120
@@ -121,3 +121,4 @@
 serefpolicy-3.0.1.tgz
 serefpolicy-3.0.2.tgz
 serefpolicy-3.0.3.tgz
+serefpolicy-3.0.4.tgz

policy-20070703.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.19 -r 1.20 policy-20070703.patch
Index: policy-20070703.patch
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/policy-20070703.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- policy-20070703.patch	24 Jul 2007 20:47:24 -0000	1.19
+++ policy-20070703.patch	26 Jul 2007 17:54:24 -0000	1.20
@@ -1,14 +1,14 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/guest_u_default_contexts serefpolicy-3.0.3/config/appconfig-strict-mls/guest_u_default_contexts
+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.3/config/appconfig-strict-mls/guest_u_default_contexts	2007-07-17 15:46:25.000000000 -0400
++++ 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.3/config/appconfig-strict-mls/staff_u_default_contexts
+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.3/config/appconfig-strict-mls/staff_u_default_contexts	2007-07-17 15:46:25.000000000 -0400
++++ 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
@@ -19,9 +19,9 @@
 +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.3/config/appconfig-strict-mls/user_u_default_contexts
+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.3/config/appconfig-strict-mls/user_u_default_contexts	2007-07-17 15:46:25.000000000 -0400
++++ 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
@@ -30,31 +30,31 @@
 +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.3/config/appconfig-targeted-mcs/default_type
+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.3/config/appconfig-targeted-mcs/default_type	2007-07-17 15:46:25.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.3/config/appconfig-targeted-mcs/guest_u_default_contexts
+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.3/config/appconfig-targeted-mcs/guest_u_default_contexts	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/config/appconfig-targeted-mcs/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-targeted-mcs/initrc_context serefpolicy-3.0.3/config/appconfig-targeted-mcs/initrc_context
+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.3/config/appconfig-targeted-mcs/initrc_context	2007-07-17 15:46:25.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.3/config/appconfig-targeted-mcs/root_default_contexts
+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.3/config/appconfig-targeted-mcs/root_default_contexts	2007-07-17 15:46:25.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
@@ -68,16 +68,16 @@
 +#
 +#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.3/config/appconfig-targeted-mcs/seusers
+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.3/config/appconfig-targeted-mcs/seusers	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/config/appconfig-targeted-mcs/seusers	2007-07-25 13:27:51.000000000 -0400
 @@ -1,2 +1,2 @@
  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.3/config/appconfig-targeted-mcs/staff_u_default_contexts
+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.3/config/appconfig-targeted-mcs/staff_u_default_contexts	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/config/appconfig-targeted-mcs/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
@@ -88,9 +88,9 @@
 +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.3/config/appconfig-targeted-mcs/user_u_default_contexts
+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.3/config/appconfig-targeted-mcs/user_u_default_contexts	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/config/appconfig-targeted-mcs/user_u_default_contexts	2007-07-25 13:27:51.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,9 +99,9 @@
 +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.3/Makefile
---- nsaserefpolicy/Makefile	2007-05-29 13:53:56.000000000 -0400
-+++ serefpolicy-3.0.3/Makefile	2007-07-17 15:46:25.000000000 -0400
+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)
@@ -131,9 +131,9 @@
  	M4PARAM += -D enable_mcs
  	CHECKPOLICY += -M
  	CHECKMODULE += -M
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.0.3/man/man8/ftpd_selinux.8
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-3.0.4/man/man8/ftpd_selinux.8
 --- nsaserefpolicy/man/man8/ftpd_selinux.8	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.3/man/man8/ftpd_selinux.8	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/man/man8/ftpd_selinux.8	2007-07-25 13:27:51.000000000 -0400
 @@ -12,7 +12,7 @@
  .TP
  chcon -R -t public_content_t /var/ftp
@@ -143,19 +143,10 @@
  .TP
  chcon -t public_content_rw_t /var/ftp/incoming
  .TP
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.0.3/policy/flask/access_vectors
---- nsaserefpolicy/policy/flask/access_vectors	2007-06-19 16:23:34.000000000 -0400
-+++ serefpolicy-3.0.3/policy/flask/access_vectors	2007-07-17 15:46:25.000000000 -0400
-@@ -598,6 +598,8 @@
- 	shmempwd
- 	shmemgrp
- 	shmemhost
-+	getserv
-+	shmemserv
- }
- 
- # Define the access vector interpretation for controlling
-@@ -623,6 +625,8 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-3.0.4/policy/flask/access_vectors
+--- nsaserefpolicy/policy/flask/access_vectors	2007-07-25 10:37:36.000000000 -0400
++++ serefpolicy-3.0.4/policy/flask/access_vectors	2007-07-25 13:27:51.000000000 -0400
+@@ -625,6 +625,8 @@
  	send
  	recv
  	relabelto
@@ -164,9 +155,9 @@
  }
  
  class key
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.0.3/policy/global_tunables
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-3.0.4/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.3/policy/global_tunables	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/global_tunables	2007-07-25 13:27:51.000000000 -0400
 @@ -133,3 +133,10 @@
  ## </desc>
  gen_tunable(write_untrusted_content,false)
@@ -178,9 +169,9 @@
 +## </desc>
 +gen_tunable(allow_console_login,false)
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.0.3/policy/mls
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-3.0.4/policy/mls
 --- nsaserefpolicy/policy/mls	2007-07-03 07:06:36.000000000 -0400
-+++ serefpolicy-3.0.3/policy/mls	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/mls	2007-07-25 13:27:51.000000000 -0400
 @@ -89,12 +89,14 @@
  mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
  	(( l1 eq l2 ) or
@@ -263,9 +254,9 @@
  	 ( t2 == unlabeled_t ));
  
  mlsconstrain association { polmatch }
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-3.0.3/policy/modules/admin/acct.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-3.0.4/policy/modules/admin/acct.te
 --- nsaserefpolicy/policy/modules/admin/acct.te	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.3/policy/modules/admin/acct.te	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/admin/acct.te	2007-07-25 13:27:51.000000000 -0400
 @@ -9,6 +9,7 @@
  type acct_t;
  type acct_exec_t;
@@ -274,9 +265,9 @@
  
  type acct_data_t;
[...3981 lines suppressed...]
@@ -10487,9 +10441,9 @@
  ')
 +
 +corecmd_exec_all_executables(unconfined_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.3/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-3.0.4/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.3/policy/modules/system/userdomain.if	2007-07-24 15:42:37.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/system/userdomain.if	2007-07-26 10:11:38.000000000 -0400
 @@ -62,6 +62,10 @@
  
  	allow $1_t $1_tty_device_t:chr_file { setattr rw_chr_file_perms };
@@ -10741,7 +10695,7 @@
  	auth_search_pam_console_data($1_t)
  	auth_run_pam($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })
  	auth_run_utempter($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })
-+	auth_run_upd_passwd($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })
++	auth_run_upd_passwd_chk($1_t,$1_r,{ $1_tty_device_t $1_devpts_t })
 +	auth_read_key($1_t)
  
  	init_read_utmp($1_t)
@@ -11510,9 +11464,9 @@
 +	')
 +	typeattribute $1 user_home_type;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.3/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.3/policy/modules/system/userdomain.te	2007-07-17 15:46:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-3.0.4/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2007-07-25 10:37:42.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/system/userdomain.te	2007-07-25 13:27:51.000000000 -0400
 @@ -74,6 +74,9 @@
  # users home directory contents
  attribute home_type;
@@ -11610,9 +11564,9 @@
 +tunable_policy(`allow_console_login', `
 +	term_use_console(userdomain)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.0.3/policy/modules/system/xen.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-3.0.4/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.3/policy/modules/system/xen.if	2007-07-19 08:59:44.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/system/xen.if	2007-07-25 13:27:51.000000000 -0400
 @@ -191,3 +191,24 @@
  
  	domtrans_pattern($1,xm_exec_t,xm_t)
@@ -11638,9 +11592,18 @@
 +	allow $1 xend_var_lib_t:dir search_dir_perms;
 +	rw_files_pattern($1,xen_image_t,xen_image_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.3/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2007-07-03 07:06:32.000000000 -0400
-+++ serefpolicy-3.0.3/policy/modules/system/xen.te	2007-07-18 16:21:11.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-3.0.4/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2007-07-25 10:37:42.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/system/xen.te	2007-07-25 13:27:51.000000000 -0400
+@@ -70,7 +70,7 @@
+ type xm_t;
+ type xm_exec_t;
+ domain_type(xm_t)
+-init_system_domain(xm_t, xm_exec_t)
++init_daemon_domain(xm_t, xm_exec_t)
+ 
+ ########################################
+ #
 @@ -176,6 +176,7 @@
  files_manage_etc_runtime_files(xend_t)
  files_etc_filetrans_etc_runtime(xend_t,file)
@@ -11680,38 +11643,38 @@
 +fs_write_nfs_files(xend_t)
 +fs_read_nfs_files(xend_t)
 +fs_read_nfs_symlinks(xend_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.3/policy/modules/users/guest.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.fc serefpolicy-3.0.4/policy/modules/users/guest.fc
 --- nsaserefpolicy/policy/modules/users/guest.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.3/policy/modules/users/guest.fc	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/users/guest.fc	2007-07-25 13:27:51.000000000 -0400
 @@ -0,0 +1 @@
 +# No guest file contexts.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.3/policy/modules/users/guest.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.if serefpolicy-3.0.4/policy/modules/users/guest.if
 --- nsaserefpolicy/policy/modules/users/guest.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.3/policy/modules/users/guest.if	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/users/guest.if	2007-07-25 13:27:51.000000000 -0400
 @@ -0,0 +1 @@
 +## <summary>Policy for guest user</summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.3/policy/modules/users/guest.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/guest.te serefpolicy-3.0.4/policy/modules/users/guest.te
 --- nsaserefpolicy/policy/modules/users/guest.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.3/policy/modules/users/guest.te	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/users/guest.te	2007-07-25 13:27:51.000000000 -0400
 @@ -0,0 +1,5 @@
 +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.3/policy/modules/users/logadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.fc serefpolicy-3.0.4/policy/modules/users/logadm.fc
 --- nsaserefpolicy/policy/modules/users/logadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.3/policy/modules/users/logadm.fc	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/users/logadm.fc	2007-07-25 13:27:51.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.3/policy/modules/users/logadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.if serefpolicy-3.0.4/policy/modules/users/logadm.if
 --- nsaserefpolicy/policy/modules/users/logadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.3/policy/modules/users/logadm.if	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/users/logadm.if	2007-07-25 13:27:51.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.3/policy/modules/users/logadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/logadm.te serefpolicy-3.0.4/policy/modules/users/logadm.te
 --- nsaserefpolicy/policy/modules/users/logadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.3/policy/modules/users/logadm.te	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/users/logadm.te	2007-07-25 13:27:51.000000000 -0400
 @@ -0,0 +1,33 @@
 +policy_module(logadm,1.0.0)
 +
@@ -11746,24 +11709,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.3/policy/modules/users/metadata.xml
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/metadata.xml serefpolicy-3.0.4/policy/modules/users/metadata.xml
 --- nsaserefpolicy/policy/modules/users/metadata.xml	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.3/policy/modules/users/metadata.xml	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/users/metadata.xml	2007-07-25 13:27:51.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.3/policy/modules/users/webadm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.fc serefpolicy-3.0.4/policy/modules/users/webadm.fc
 --- nsaserefpolicy/policy/modules/users/webadm.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.3/policy/modules/users/webadm.fc	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/users/webadm.fc	2007-07-25 13:27:51.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.3/policy/modules/users/webadm.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.if serefpolicy-3.0.4/policy/modules/users/webadm.if
 --- nsaserefpolicy/policy/modules/users/webadm.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.3/policy/modules/users/webadm.if	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/users/webadm.if	2007-07-25 13:27:51.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.3/policy/modules/users/webadm.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/users/webadm.te serefpolicy-3.0.4/policy/modules/users/webadm.te
 --- nsaserefpolicy/policy/modules/users/webadm.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-3.0.3/policy/modules/users/webadm.te	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/modules/users/webadm.te	2007-07-25 13:27:51.000000000 -0400
 @@ -0,0 +1,70 @@
 +policy_module(webadm,1.0.0)
 +
@@ -11835,9 +11798,9 @@
 +allow webadm_t gadmin_t:dir getattr;
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.3/policy/support/obj_perm_sets.spt
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-3.0.4/policy/support/obj_perm_sets.spt
 --- nsaserefpolicy/policy/support/obj_perm_sets.spt	2007-05-29 14:10:59.000000000 -0400
-+++ serefpolicy-3.0.3/policy/support/obj_perm_sets.spt	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/support/obj_perm_sets.spt	2007-07-25 13:27:51.000000000 -0400
 @@ -201,7 +201,7 @@
  define(`search_dir_perms',`{ getattr search }')
  define(`list_dir_perms',`{ getattr search read lock ioctl }')
@@ -11870,9 +11833,9 @@
 +define(`all_association', `{ sendto recvfrom setcontext polmatch } ')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.3/policy/users
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-3.0.4/policy/users
 --- nsaserefpolicy/policy/users	2007-07-17 14:52:27.000000000 -0400
-+++ serefpolicy-3.0.3/policy/users	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/policy/users	2007-07-25 13:27:51.000000000 -0400
 @@ -16,7 +16,7 @@
  # and a user process should never be assigned the system user
  # identity.
@@ -11907,9 +11870,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.3/Rules.modular
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-3.0.4/Rules.modular
 --- nsaserefpolicy/Rules.modular	2007-05-25 09:09:10.000000000 -0400
-+++ serefpolicy-3.0.3/Rules.modular	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/Rules.modular	2007-07-25 13:27:51.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
@@ -11936,9 +11899,9 @@
  # Clean the sources
  #
  clean:
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-3.0.3/support/Makefile.devel
+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.3/support/Makefile.devel	2007-07-17 15:46:25.000000000 -0400
++++ serefpolicy-3.0.4/support/Makefile.devel	2007-07-25 13:27:51.000000000 -0400
 @@ -24,7 +24,7 @@
  XMLLINT := $(BINDIR)/xmllint
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -r1.481 -r1.482
--- selinux-policy.spec	24 Jul 2007 20:47:24 -0000	1.481
+++ selinux-policy.spec	26 Jul 2007 17:54:24 -0000	1.482
@@ -16,8 +16,8 @@
 %define CHECKPOLICYVER 2.0.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.0.3
-Release: 6%{?dist}
+Version: 3.0.4
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -293,7 +293,7 @@
 %relabel targeted
 exit 0
 
-%triggerpostun targeted -- selinux-policy-targeted <= 3.0.3-5
+%triggerpostun targeted -- selinux-policy-targeted < 3.0.4-1
 setsebool -P use_nfs_home_dirs=1
 restorecon -R /root /etc/selinux/targeted 2> /dev/null
 semanage login -m -s "system_u" __default__ 2> /dev/null
@@ -359,6 +359,9 @@
 %endif
 
 %changelog
+* Tue Jul 23 2007 Dan Walsh <dwalsh at redhat.com> 3.0.4-1
+- Update with latest changes from upstream
+
 * Tue Jul 23 2007 Dan Walsh <dwalsh at redhat.com> 3.0.3-6
 - Fix prelink to handle execmod
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- sources	19 Jul 2007 14:45:16 -0000	1.130
+++ sources	26 Jul 2007 17:54:24 -0000	1.131
@@ -1 +1 @@
-af54ae49007f995f1cb9e5d6f5baf8bf  serefpolicy-3.0.3.tgz
+a19850a065ff7c17da5eff9259b86d9c  serefpolicy-3.0.4.tgz




More information about the scm-commits mailing list