rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.451, 1.452 policycoreutils.spec, 1.655, 1.656

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4887

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-15
- Fix typo in seobject.py


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                        |  470 +++++++++++++-------
 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(+), 1171 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -p -r1.451 -r1.452
--- policycoreutils-rhat.patch	30 Oct 2009 21:01:42 -0000	1.451
+++ policycoreutils-rhat.patch	2 Nov 2009 16:40:00 -0000	1.452
@@ -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-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.74/semanage/seobject.py	2009-10-30 16:31:59.000000000 -0400
++++ policycoreutils-2.0.74/semanage/seobject.py	2009-11-02 11:39:02.000000000 -0500
 @@ -37,40 +37,6 @@
  
  import syslog
@@ -3142,15 +3142,6 @@ diff --exclude-from=exclude --exclude=se
  
                 (rc, node) = semanage_node_create(self.sh)
                 if rc < 0:
-@@ -1097,7 +1147,7 @@
-                if rc < 0:
-                        raise ValueError(_("Could not set role in addr context for %s") % addr)
- 
--               rc = semanage_context_set_type(self.sh, con, ctype)
-+So                rc = semanage_context_set_type(self.sh, con, ctype)
-                if rc < 0:
-                        raise ValueError(_("Could not set type in addr context for %s") % addr)
- 
 @@ -1120,7 +1170,7 @@
  
         def add(self, addr, mask, proto, serange, ctype):


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -p -r1.655 -r1.656
--- policycoreutils.spec	30 Oct 2009 21:01:44 -0000	1.655
+++ policycoreutils.spec	2 Nov 2009 16:40:03 -0000	1.656
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.74
-Release: 14%{?dist}
+Release: 15%{?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
+* Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-15
+- Fix typo in seobject.py
+
 * Fri Oct 30 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-14
 - Allow semanage -i and semanage -o to generate customization files.
 - semanage -o will generate a customization file that semanage -i can read and set a machines to the same selinux configuration