rpms/policycoreutils/devel policycoreutils-gui.patch, 1.96, 1.97 policycoreutils.spec, 1.653, 1.654
Daniel J Walsh
dwalsh at fedoraproject.org
Mon Oct 19 19:05:29 UTC 2009
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13603
Modified Files:
policycoreutils-gui.patch policycoreutils.spec
Log Message:
* Mon Oct 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-12
- Add generation of the users context file to polgengui
policycoreutils-gui.patch:
Makefile | 40
booleansPage.py | 247 +++
domainsPage.py | 154 ++
fcontextPage.py | 223 ++
html_util.py | 164 ++
lockdown.glade | 771 ++++++++++
lockdown.gladep | 7
lockdown.py | 382 ++++
loginsPage.py | 185 ++
mappingsPage.py | 56
modulesPage.py | 190 ++
polgen.glade | 3305 +++++++++++++++++++++++++++++++++++++++++++
polgen.gladep | 7
polgen.py | 1195 +++++++++++++++
polgengui.py | 627 ++++++++
portsPage.py | 259 +++
selinux.tbl | 234 +++
semanagePage.py | 168 ++
statusPage.py | 190 ++
system-config-selinux.glade | 3024 +++++++++++++++++++++++++++++++++++++++
system-config-selinux.gladep | 7
system-config-selinux.py | 187 ++
templates/__init__.py | 18
templates/boolean.py | 40
templates/etc_rw.py | 129 +
templates/executable.py | 359 ++++
templates/network.py | 80 +
templates/rw.py | 127 +
templates/script.py | 126 +
templates/semodule.py | 41
templates/tmp.py | 97 +
templates/user.py | 182 ++
templates/var_lib.py | 158 ++
templates/var_log.py | 110 +
templates/var_run.py | 118 +
templates/var_spool.py | 129 +
usersPage.py | 150 +
37 files changed, 13486 insertions(+)
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- policycoreutils-gui.patch 16 Oct 2009 14:46:45 -0000 1.96
+++ policycoreutils-gui.patch 19 Oct 2009 19:05:28 -0000 1.97
@@ -6414,8 +6414,8 @@ diff --exclude-from=exclude -N -u -r nsa
+ app.stand_alone()
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.74/gui/polgen.py
--- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/polgen.py 2009-10-15 10:37:42.000000000 -0400
-@@ -0,0 +1,1188 @@
++++ policycoreutils-2.0.74/gui/polgen.py 2009-10-19 15:04:09.000000000 -0400
+@@ -0,0 +1,1195 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2007, 2008, 2009 Red Hat
@@ -7339,6 +7339,13 @@ diff --exclude-from=exclude -N -u -r nsa
+ for u in self.transition_users:
+ tmp = re.sub("TEMPLATETYPE", self.name, script.admin_trans)
+ newsh += re.sub("USER", u, tmp)
++
++ if self.type == LUSER:
++ newsh += re.sub("TEMPLATETYPE", self.name, script.min_login_user_default_context)
++ else:
++ newsh += re.sub("TEMPLATETYPE", self.name, script.x_login_user_default_context)
++
++
+ return newsh
+
+ def generate_sh(self):
@@ -12480,8 +12487,8 @@ diff --exclude-from=exclude -N -u -r nsa
+"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.74/gui/templates/script.py
--- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.74/gui/templates/script.py 2009-10-15 10:37:42.000000000 -0400
-@@ -0,0 +1,99 @@
++++ policycoreutils-2.0.74/gui/templates/script.py 2009-10-19 15:03:15.000000000 -0400
+@@ -0,0 +1,126 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
+#
@@ -12581,6 +12588,33 @@ diff --exclude-from=exclude -N -u -r nsa
+# Adding roles to SELinux user USER
+/usr/sbin/semanage user -m -R +TEMPLATETYPE_r USER
+"""
++
++min_login_user_default_context="""\
++if [ ! -f /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u ]; then
++cat > /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u << _EOF
++TEMPLATETYPE_r:TEMPLATETYPE_t:s0 TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:crond_t TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:initrc_su_t TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:local_login_t TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:remote_login_t TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:sshd_t TEMPLATETYPE_r:TEMPLATETYPE_t
++_EOF
++fi
++"""
++
++x_login_user_default_context="""\
++if [ ! -f /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u ]; then
++cat > /etc/selinux/targeted/contexts/users/TEMPLATETYPE_u << _EOF
++TEMPLATETYPE_r:TEMPLATETYPE_t TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:crond_t TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:initrc_su_t TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:local_login_t TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:remote_login_t TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:sshd_t TEMPLATETYPE_r:TEMPLATETYPE_t
++system_r:xdm_t TEMPLATETYPE_r:TEMPLATETYPE_t
++_EOF
++fi
++"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.74/gui/templates/semodule.py
--- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.74/gui/templates/semodule.py 2009-10-15 10:37:42.000000000 -0400
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -p -r1.653 -r1.654
--- policycoreutils.spec 16 Oct 2009 14:46:45 -0000 1.653
+++ policycoreutils.spec 19 Oct 2009 19:05:29 -0000 1.654
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.74
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -296,6 +296,9 @@ fi
exit 0
%changelog
+* Mon Oct 19 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-12
+- Add generation of the users context file to polgengui
+
* Fri Oct 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-11
- Remove tabs from system-config-selinux glade file
More information about the fedora-extras-commits
mailing list