rpms/policycoreutils/F-12 policycoreutils-rhat.patch, 1.453, 1.454 policycoreutils.spec, 1.656, 1.657

Daniel J Walsh dwalsh at fedoraproject.org
Mon Nov 16 21:55:55 UTC 2009


Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23510

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Nov 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-18
- Raise exception if user tries to add file context with an embedded space


policycoreutils-rhat.patch:
 Makefile                                    |    2 
 audit2allow/audit2allow                     |   14 
 load_policy/Makefile                        |    5 
 restorecond/Makefile                        |   24 -
 restorecond/org.selinux.Restorecond.service |    3 
 restorecond/restorecond.8                   |   15 
 restorecond/restorecond.c                   |  426 +++---------------
 restorecond/restorecond.conf                |    5 
 restorecond/restorecond.desktop             |    7 
 restorecond/restorecond.h                   |   18 
 restorecond/restorecond.init                |    5 
 restorecond/restorecond_user.conf           |    2 
 restorecond/user.c                          |  237 ++++++++++
 restorecond/watch.c                         |  253 ++++++++++
 sandbox/Makefile                            |   31 +
 sandbox/deliverables/README                 |   32 +
 sandbox/deliverables/basicwrapper           |    4 
 sandbox/deliverables/run-in-sandbox.py      |   49 ++
 sandbox/deliverables/sandbox                |  216 +++++++++
 sandbox/sandbox                             |  242 ++++++++++
 sandbox/sandbox.8                           |   26 +
 sandbox/sandboxX.sh                         |   16 
 sandbox/seunshare.c                         |  265 +++++++++++
 scripts/Makefile                            |    2 
 scripts/chcat                               |    2 
 scripts/fixfiles                            |   28 -
 scripts/fixfiles.8                          |   17 
 semanage/semanage                           |  136 ++++-
 semanage/seobject.py                        |  469 +++++++++++++-------
 semodule/semodule.8                         |    6 
 semodule/semodule.c                         |   53 +-
 setfiles/Makefile                           |    2 
 setfiles/restore.c                          |  519 ++++++++++++++++++++++
 setfiles/restore.h                          |   49 ++
 setfiles/restorecon.8                       |    7 
 setfiles/setfiles.8                         |    3 
 setfiles/setfiles.c                         |  647 +++-------------------------
 37 files changed, 2667 insertions(+), 1170 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -p -r1.453 -r1.454
--- policycoreutils-rhat.patch	11 Nov 2009 21:56:10 -0000	1.453
+++ policycoreutils-rhat.patch	16 Nov 2009 21:55:53 -0000	1.454
@@ -2667,7 +2667,7 @@ diff --exclude-from=exclude --exclude=se
                 else:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.74/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2009-09-17 08:59:51.000000000 -0400
-+++ policycoreutils-2.0.74/semanage/seobject.py	2009-11-09 16:07:13.000000000 -0500
++++ policycoreutils-2.0.74/semanage/seobject.py	2009-11-16 16:55:14.000000000 -0500
 @@ -37,40 +37,6 @@
  
  import syslog
@@ -3309,7 +3309,16 @@ diff --exclude-from=exclude --exclude=se
  
          def createcon(self, target, seuser = "system_u"):
                  (rc, con) = semanage_context_create(self.sh)
-@@ -1470,7 +1591,8 @@
+@@ -1446,6 +1567,8 @@
+         def validate(self, target):
+                if target == "" or target.find("\n") >= 0:
+                       raise ValueError(_("Invalid file specification"))
++               if target.find(" ") != -1:
++                      raise ValueError(_("File specification can not include spaces"))
+                       
+ 	def __add(self, target, type, ftype = "", serange = "", seuser = "system_u"):
+                 self.validate(target)
+@@ -1470,7 +1593,8 @@
                                raise ValueError(_("Could not check if file context for %s is defined") % target)
  
                  if exists:
@@ -3319,7 +3328,7 @@ diff --exclude-from=exclude --exclude=se
  
  		(rc, fcontext) = semanage_fcontext_create(self.sh)
  		if rc < 0:
-@@ -1586,9 +1708,16 @@
+@@ -1586,9 +1710,16 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
  	
@@ -3336,7 +3345,7 @@ diff --exclude-from=exclude --exclude=se
  		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
  		if rc < 0:
  			raise ValueError(_("Could not create a key for %s") % target)
-@@ -1643,12 +1772,22 @@
+@@ -1643,12 +1774,22 @@
  
  		return ddict
  			
@@ -3361,7 +3370,7 @@ diff --exclude-from=exclude --exclude=se
  		for k in keys:
  			if fcon_dict[k]:
  				if is_mls_enabled:
-@@ -1794,6 +1933,16 @@
+@@ -1794,6 +1935,16 @@
                 else:
                        return _("unknown")
  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -p -r1.656 -r1.657
--- policycoreutils.spec	11 Nov 2009 21:56:11 -0000	1.656
+++ policycoreutils.spec	16 Nov 2009 21:55:54 -0000	1.657
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 17%{?dist}
+Release: 18%{?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 Nov 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-18
+- Raise exception if user tries to add file context with an embedded space
+
 * Wed Nov 11 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-17
 - Fix sandbox to setsid so it can run under mozilla without crashing the session
 




More information about the scm-commits mailing list