rpms/selinux-policy/devel modules-mls.conf, 1.32, 1.33 modules-targeted.conf, 1.86, 1.87 selinux-policy.spec, 1.661, 1.662 sources, 1.150, 1.151

[Daniel J Walsh (dwalsh)]

Author: dwalsh

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

Modified Files:
	modules-mls.conf modules-targeted.conf selinux-policy.spec 
	sources 
Log Message:
Update for rawhide


Index: modules-mls.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- modules-mls.conf	14 Apr 2008 20:01:48 -0000	1.32
+++ modules-mls.conf	19 May 2008 13:01:59 -0000	1.33
@@ -1060,20 +1060,6 @@
 # 
 amtu = module
 
-# Layer: users
-# Module: staff
-#
-# Fully Privledged user. with su/sudo/newrole
-# 
-staff = base
-
-# Layer: users
-# Module: user
-#
-# Fully Privledged user. without su/sudo/newrole
-# 
-user = base
-
 # Layer: services
 # Module: prelude
 #
@@ -1081,16 +1067,52 @@
 # 
 prelude = module
 
-# Layer: users
+# Layer: role
 # Module: secadm
 #
 # Root role used to manage selinux 
 # 
 secadm = module
 
-# Layer: users
+# Layer: role
 # Module: auditadm
 #
 # Root role used to manage audit system
 # 
 auditadm = module
+
+# Layer:role
+# Module: staff
+#
+# admin account 
+# 
+staff = base
+
+# Layer:role
+# Module: sysadm
+#
+# System Administrator
+# 
+sysadm = base
+
+# Layer: role
+# Module: unprivuser
+#
+# user account 
+# 
+unprivuser = base
+
+# Layer: role
+# Module: guest
+#
+# Minimally privs guest account on tty logins
+# 
+guest = module
+
+# Layer: role
+# Module: xguest
+#
+# Minimally privs guest account on X Windows logins
+# 
+xguest = module
+


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- modules-targeted.conf	6 May 2008 17:01:42 -0000	1.86
+++ modules-targeted.conf	19 May 2008 13:01:59 -0000	1.87
@@ -1548,28 +1548,14 @@
 # 
 vmware = module
 
-# Layer: users
-# Module: guest
-#
-# Minimally privs guest account on tty logins
-# 
-guest = module
-
-# Layer: users
-# Module: xguest
-#
-# Minimally privs guest account on X Windows logins
-# 
-xguest = module
-
-# Layer: users
+# Layer: role
 # Module: logadm
 #
 # Minimally prived root role for managing logging system
 # 
 logadm = module
 
-# Layer: users
+# Layer: role
 # Module: webadm
 #
 # Minimally prived root role for managing apache
@@ -1613,19 +1599,26 @@
 # 
 soundserver = module
 
-# Layer: users
+# Layer:role
 # Module: staff
 #
-# Minimally privs guest account on tty logins
+# admin account 
 # 
 staff = base
 
-# Layer: users
-# Module: user
+# Layer:role
+# Module: sysadm
+#
+# System Administrator
+# 
+sysadm = base
+
+# Layer: role
+# Module: unprivuser
 #
 # Minimally privs guest account on tty logins
 # 
-user = base
+unprivuser = base
 
 # Layer: services
 # Module: prelude
@@ -1655,3 +1648,17 @@
 # 
 podsleuth = module
 
+# Layer: role
+# Module: guest
+#
+# Minimally privs guest account on tty logins
+# 
+guest = module
+
+# Layer: role
+# Module: xguest
+#
+# Minimally privs guest account on X Windows logins
+# 
+xguest = module
+


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.661
retrieving revision 1.662
diff -u -r1.661 -r1.662
--- selinux-policy.spec	7 May 2008 19:10:59 -0000	1.661
+++ selinux-policy.spec	19 May 2008 13:01:59 -0000	1.662
@@ -16,12 +16,12 @@
 %define CHECKPOLICYVER 2.0.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.3.1
-Release: 48%{?dist}
+Version: 3.4.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20071130.patch
+patch: policy-20080509.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -171,7 +171,7 @@
 
 %description
 SELinux Reference Policy - modular.
-Based off of reference policy: Checked out revision 2624.
+Based off of reference policy: Checked out revision 2682.
 
 %build
 
@@ -385,6 +385,9 @@
 %endif
 
 %changelog
+* Fri May 9 2008 Dan Walsh <dwalsh at redhat.com> 3.4.1-1
+- Merge Upstream
+
 * Wed May 7 2008 Dan Walsh <dwalsh at redhat.com> 3.3.1-48
 - Allow amanada to create data files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/sources,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- sources	26 Feb 2008 13:45:23 -0000	1.150
+++ sources	19 May 2008 13:01:59 -0000	1.151
@@ -1 +0,0 @@
-24debc0cd80a0427779f917fcefd4f57  serefpolicy-3.3.1.tgz