rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.480, 1.481 policycoreutils.spec, 1.695, 1.696

Daniel J Walsh dwalsh at fedoraproject.org
Tue Jul 13 17:32:52 UTC 2010


Author: dwalsh

Update of /cvs/pkgs/rpms/policycoreutils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10268

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Jun 15 2010 Dan Walsh <dwalsh at redhat.com> 2.0.83-3
- Change python scripts to use -s flag
- Update po


policycoreutils-rhat.patch:
 Makefile                                              |    2 
 VERSION                                               |    2 
 audit2allow/audit2allow                               |   55 --
 audit2allow/audit2allow.1                             |    3 
 audit2allow/sepolgen-ifgen                            |   46 +
 newrole/newrole.c                                     |    3 
 restorecond/Makefile                                  |   24 
 restorecond/org.selinux.Restorecond.service           |    3 
 restorecond/restorecond.8                             |   15 
 restorecond/restorecond.c                             |  427 +++-------------
 restorecond/restorecond.conf                          |    5 
 restorecond/restorecond.desktop                       |    7 
 restorecond/restorecond.h                             |   19 
 restorecond/restorecond.init                          |    7 
 restorecond/restorecond_user.conf                     |    2 
 restorecond/user.c                                    |  239 +++++++++
 restorecond/watch.c                                   |  260 ++++++++++
 sandbox/Makefile                                      |    9 
 sandbox/deliverables/README                           |   32 +
 sandbox/deliverables/basicwrapper                     |    4 
 sandbox/deliverables/run-in-sandbox.py                |   49 +
 sandbox/sandbox                                       |   48 +
 sandbox/sandbox.8                                     |   16 
 sandbox/sandbox.conf                                  |    7 
 sandbox/sandbox.conf.5                                |   40 +
 sandbox/sandbox.config                                |    2 
 sandbox/seunshare.8                                   |   34 +
 sandbox/seunshare.c                                   |  259 +++++++++-
 scripts/Makefile                                      |    1 
 scripts/chcat                                         |    2 
 scripts/fixfiles                                      |   46 -
 scripts/genhomedircon.8                               |   37 +
 semanage/default_encoding/Makefile                    |    8 
 semanage/default_encoding/default_encoding.c          |   59 ++
 semanage/default_encoding/policycoreutils/__init__.py |   17 
 semanage/default_encoding/setup.py                    |   38 +
 semanage/semanage                                     |  164 +++++-
 semanage/semanage.8                                   |  128 +++--
 semanage/seobject.py                                  |  458 ++++++++++++++----
 sepolgen-ifgen/Makefile                               |   25 
 sepolgen-ifgen/sepolgen-ifgen-attr-helper.c           |  230 +++++++++
 setfiles/restore.c                                    |  109 +++-
 setfiles/restore.h                                    |    4 
 setfiles/restorecon.8                                 |    7 
 setfiles/setfiles.8                                   |    3 
 setfiles/setfiles.c                                   |   78 ---
 46 files changed, 2310 insertions(+), 723 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -p -r1.480 -r1.481
--- policycoreutils-rhat.patch	13 Jul 2010 17:13:19 -0000	1.480
+++ policycoreutils-rhat.patch	13 Jul 2010 17:32:51 -0000	1.481
@@ -134,7 +134,13 @@ diff --exclude-from=exclude --exclude=se
  .I <outputfile>
 diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/sepolgen-ifgen policycoreutils-2.0.83/audit2allow/sepolgen-ifgen
 --- nsapolicycoreutils/audit2allow/sepolgen-ifgen	2010-05-19 14:45:51.000000000 -0400
-+++ policycoreutils-2.0.83/audit2allow/sepolgen-ifgen	2010-06-16 08:22:37.000000000 -0400
++++ policycoreutils-2.0.83/audit2allow/sepolgen-ifgen	2010-07-13 13:31:01.000000000 -0400
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python -E
++#! /usr/bin/python -Es
+ #
+ # Authors: Karl MacMillan <kmacmillan at mentalrootkit.com>
+ #
 @@ -28,6 +28,10 @@
  
  import sys
@@ -1570,9 +1576,10 @@ diff --exclude-from=exclude --exclude=se
  	@python test_sandbox.py -v
 diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.83/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	2010-06-16 08:03:38.000000000 -0400
-+++ policycoreutils-2.0.83/sandbox/sandbox	2010-06-16 08:22:37.000000000 -0400
++++ policycoreutils-2.0.83/sandbox/sandbox	2010-07-13 13:31:35.000000000 -0400
 @@ -1,5 +1,6 @@
- #! /usr/bin/python -E
+-#! /usr/bin/python -E
++#! /usr/bin/python -Es
  # Authors: Dan Walsh <dwalsh at redhat.com>
 +# Authors: Thomas Liu <tliu at fedoraproject.org>
  # Authors: Josh Cogliati
@@ -2173,6 +2180,15 @@ diff --exclude-from=exclude --exclude=se
  		perror("execv");
  		exit(-1);
  	} else {
+diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.83/scripts/chcat
+--- nsapolicycoreutils/scripts/chcat	2010-05-19 14:45:51.000000000 -0400
++++ policycoreutils-2.0.83/scripts/chcat	2010-07-13 13:31:23.000000000 -0400
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python -E
++#! /usr/bin/python -Es
+ # Copyright (C) 2005 Red Hat 
+ # see file 'COPYING' for use and warranty information
+ #
 diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.83/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2010-05-19 14:45:51.000000000 -0400
 +++ policycoreutils-2.0.83/scripts/fixfiles	2010-06-16 08:22:37.000000000 -0400
@@ -2462,7 +2478,7 @@ diff --exclude-from=exclude --exclude=se
 +++ policycoreutils-2.0.83/semanage/semanage	2010-07-13 13:09:01.000000000 -0400
 @@ -1,4 +1,4 @@
 -#! /usr/bin/python -E
-+#! /usr/bin/python -E -s
++#! /usr/bin/python -Es
  # Copyright (C) 2005, 2006, 2007 Red Hat 
  # see file 'COPYING' for use and warranty information
  #


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.695
retrieving revision 1.696
diff -u -p -r1.695 -r1.696
--- policycoreutils.spec	13 Jul 2010 17:13:21 -0000	1.695
+++ policycoreutils.spec	13 Jul 2010 17:32:52 -0000	1.696
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.83
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:  http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -314,7 +314,7 @@ fi
 exit 0
 
 %changelog
-* Tue Jun 15 2010 Dan Walsh <dwalsh at redhat.com> 2.0.83-2
+* Tue Jun 15 2010 Dan Walsh <dwalsh at redhat.com> 2.0.83-3
 - Change python scripts to use -s flag
 - Update po
 



More information about the scm-commits mailing list