[policycoreutils/f16] Inlcude the patch this time to fix sandbox.init
Daniel J Walsh
dwalsh at fedoraproject.org
Wed Oct 26 12:35:34 UTC 2011
commit 0ce6ffe6e06a2a46ad5038a77e83016121744fc4
Author: Dan Walsh <dwalsh at redhat.com>
Date: Wed Oct 26 08:35:28 2011 -0400
Inlcude the patch this time to fix sandbox.init
policycoreutils-f17.patch | 65 +++++++++++++++++++++++----------------------
policycoreutils.spec | 5 +++-
2 files changed, 37 insertions(+), 33 deletions(-)
---
diff --git a/policycoreutils-f17.patch b/policycoreutils-f17.patch
index 4e384e1..c87ee1a 100644
--- a/policycoreutils-f17.patch
+++ b/policycoreutils-f17.patch
@@ -1,6 +1,6 @@
diff -up policycoreutils-2.1.4/audit2allow/audit2allow.f17 policycoreutils-2.1.4/audit2allow/audit2allow
---- policycoreutils-2.1.4/audit2allow/audit2allow.f17 2011-10-04 08:49:30.068139401 -0400
-+++ policycoreutils-2.1.4/audit2allow/audit2allow 2011-10-04 08:51:05.442086558 -0400
+--- policycoreutils-2.1.4/audit2allow/audit2allow.f17 2011-10-24 14:35:34.443676401 -0400
++++ policycoreutils-2.1.4/audit2allow/audit2allow 2011-10-24 14:35:34.950676443 -0400
@@ -104,7 +104,7 @@ class AuditToPolicy:
if name:
options.requires = True
@@ -12,7 +12,7 @@ diff -up policycoreutils-2.1.4/audit2allow/audit2allow.f17 policycoreutils-2.1.4
# Make -M and -o conflict
diff -up policycoreutils-2.1.4/.gitignore.f17 policycoreutils-2.1.4/.gitignore
--- policycoreutils-2.1.4/.gitignore.f17 2011-08-18 06:52:31.000000000 -0400
-+++ policycoreutils-2.1.4/.gitignore 2011-10-04 08:51:05.443086559 -0400
++++ policycoreutils-2.1.4/.gitignore 2011-10-24 14:35:34.951676443 -0400
@@ -9,6 +9,7 @@ semodule_deps/semodule_deps
semodule_expand/semodule_expand
semodule_link/semodule_link
@@ -23,7 +23,7 @@ diff -up policycoreutils-2.1.4/.gitignore.f17 policycoreutils-2.1.4/.gitignore
setfiles/setfiles
diff -up policycoreutils-2.1.4/mcstrans/man/Makefile.f17 policycoreutils-2.1.4/mcstrans/man/Makefile
--- policycoreutils-2.1.4/mcstrans/man/Makefile.f17 2011-08-18 06:52:31.000000000 -0400
-+++ policycoreutils-2.1.4/mcstrans/man/Makefile 2011-10-04 08:51:05.444086563 -0400
++++ policycoreutils-2.1.4/mcstrans/man/Makefile 2011-10-24 14:35:34.952676443 -0400
@@ -1,7 +1,9 @@
# Installation directories.
MAN8DIR ?= $(DESTDIR)/usr/share/man/man8
@@ -36,8 +36,8 @@ diff -up policycoreutils-2.1.4/mcstrans/man/Makefile.f17 policycoreutils-2.1.4/m
install -m 644 man8/*.8 $(MAN8DIR)
diff -up policycoreutils-2.1.4/newrole/newrole.c.f17 policycoreutils-2.1.4/newrole/newrole.c
---- policycoreutils-2.1.4/newrole/newrole.c.f17 2011-10-04 08:49:30.070139399 -0400
-+++ policycoreutils-2.1.4/newrole/newrole.c 2011-10-04 08:51:05.445086567 -0400
+--- policycoreutils-2.1.4/newrole/newrole.c.f17 2011-10-24 14:35:34.446676401 -0400
++++ policycoreutils-2.1.4/newrole/newrole.c 2011-10-24 14:35:34.953676443 -0400
@@ -543,13 +543,13 @@ static int restore_environment(int prese
#if defined(AUDIT_LOG_PRIV) && !defined(NAMESPACE_PRIV)
static int drop_capabilities(int full)
@@ -56,8 +56,8 @@ diff -up policycoreutils-2.1.4/newrole/newrole.c.f17 policycoreutils-2.1.4/newro
if (setresuid(uid, uid, uid)) {
fprintf(stderr, _("Error changing uid, aborting.\n"));
diff -up policycoreutils-2.1.4/sandbox/sandbox.f17 policycoreutils-2.1.4/sandbox/sandbox
---- policycoreutils-2.1.4/sandbox/sandbox.f17 2011-10-04 08:49:30.077139396 -0400
-+++ policycoreutils-2.1.4/sandbox/sandbox 2011-10-04 08:51:05.447086566 -0400
+--- policycoreutils-2.1.4/sandbox/sandbox.f17 2011-10-24 14:35:34.455676402 -0400
++++ policycoreutils-2.1.4/sandbox/sandbox 2011-10-24 14:35:34.955676443 -0400
@@ -263,7 +263,6 @@ sandbox [-h] [-c] [-l level ] [-[X|M] [-
%s
""") % types
@@ -67,9 +67,9 @@ diff -up policycoreutils-2.1.4/sandbox/sandbox.f17 policycoreutils-2.1.4/sandbox
parser.disable_interspersed_args()
parser.add_option("-i", "--include",
diff -up policycoreutils-2.1.4/sandbox/sandbox.init.f17 policycoreutils-2.1.4/sandbox/sandbox.init
---- policycoreutils-2.1.4/sandbox/sandbox.init.f17 2011-10-04 08:49:30.080139393 -0400
-+++ policycoreutils-2.1.4/sandbox/sandbox.init 2011-10-04 08:51:05.447086566 -0400
-@@ -13,17 +13,12 @@
+--- policycoreutils-2.1.4/sandbox/sandbox.init.f17 2011-10-24 14:35:34.457676402 -0400
++++ policycoreutils-2.1.4/sandbox/sandbox.init 2011-10-24 14:36:36.383681482 -0400
+@@ -13,7 +13,7 @@
# description: sandbox, xguest and other apps that want to use pam_namespace \
# require this script be run at boot. This service script does \
# not actually run any service but sets up: \
@@ -78,19 +78,20 @@ diff -up policycoreutils-2.1.4/sandbox/sandbox.init.f17 policycoreutils-2.1.4/sa
# If you do not use sandbox, xguest or pam_namespace you can turn \
# this service off.\
#
-
+@@ -21,10 +21,6 @@
# Source function library.
--. /etc/init.d/functions
--
+ . /etc/init.d/functions
+
-HOMEDIRS="/home"
-
-. /etc/sysconfig/sandbox
-
+-
LOCKFILE=/var/lock/subsys/sandbox
+ base=${0##*/}
diff -up policycoreutils-2.1.4/sandbox/seunshare.c.f17 policycoreutils-2.1.4/sandbox/seunshare.c
---- policycoreutils-2.1.4/sandbox/seunshare.c.f17 2011-10-04 08:49:30.082139392 -0400
-+++ policycoreutils-2.1.4/sandbox/seunshare.c 2011-10-04 08:51:05.449086562 -0400
+--- policycoreutils-2.1.4/sandbox/seunshare.c.f17 2011-10-24 14:35:34.461676403 -0400
++++ policycoreutils-2.1.4/sandbox/seunshare.c 2011-10-24 14:35:34.956676443 -0400
@@ -5,8 +5,9 @@
#define _GNU_SOURCE
@@ -161,7 +162,7 @@ diff -up policycoreutils-2.1.4/sandbox/seunshare.c.f17 policycoreutils-2.1.4/san
diff -up policycoreutils-2.1.4/semanage/semanage.8.f17 policycoreutils-2.1.4/semanage/semanage.8
--- policycoreutils-2.1.4/semanage/semanage.8.f17 2011-08-18 06:52:31.000000000 -0400
-+++ policycoreutils-2.1.4/semanage/semanage.8 2011-10-04 08:51:05.450086559 -0400
++++ policycoreutils-2.1.4/semanage/semanage.8 2011-10-24 14:35:34.957676443 -0400
@@ -163,6 +163,9 @@ SELinux Type for the object
.I \-i, \-\-input
Take a set of commands from a specified file and load them in a single
@@ -173,8 +174,8 @@ diff -up policycoreutils-2.1.4/semanage/semanage.8.f17 policycoreutils-2.1.4/sem
.SH EXAMPLE
.nf
diff -up policycoreutils-2.1.4/semanage/semanage.f17 policycoreutils-2.1.4/semanage/semanage
---- policycoreutils-2.1.4/semanage/semanage.f17 2011-10-04 08:49:30.086139391 -0400
-+++ policycoreutils-2.1.4/semanage/semanage 2011-10-04 08:51:05.449086562 -0400
+--- policycoreutils-2.1.4/semanage/semanage.f17 2011-10-24 14:35:34.465676403 -0400
++++ policycoreutils-2.1.4/semanage/semanage 2011-10-24 14:35:34.958676443 -0400
@@ -575,3 +575,5 @@ Object-specific Options (see above):
errorExit(error.args[1])
except OSError, error:
@@ -182,8 +183,8 @@ diff -up policycoreutils-2.1.4/semanage/semanage.f17 policycoreutils-2.1.4/seman
+ except RuntimeError, error:
+ errorExit(error.args[0])
diff -up policycoreutils-2.1.4/semanage/seobject.py.f17 policycoreutils-2.1.4/semanage/seobject.py
---- policycoreutils-2.1.4/semanage/seobject.py.f17 2011-10-04 08:49:30.087139390 -0400
-+++ policycoreutils-2.1.4/semanage/seobject.py 2011-10-04 08:51:05.451086557 -0400
+--- policycoreutils-2.1.4/semanage/seobject.py.f17 2011-10-24 14:35:34.467676403 -0400
++++ policycoreutils-2.1.4/semanage/seobject.py 2011-10-24 14:35:34.960676443 -0400
@@ -1,5 +1,5 @@
#! /usr/bin/python -E
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Red Hat
@@ -331,8 +332,8 @@ diff -up policycoreutils-2.1.4/semanage/seobject.py.f17 policycoreutils-2.1.4/se
-
+ print "%-30s (%-5s,%5s) %s" % (k, on_off[selinux.security_get_boolean_active(k)], on_off[ddict[k][2]], self.get_desc(k))
diff -up policycoreutils-2.1.4/semodule_package/Makefile.f17 policycoreutils-2.1.4/semodule_package/Makefile
---- policycoreutils-2.1.4/semodule_package/Makefile.f17 2011-10-04 08:49:30.088139389 -0400
-+++ policycoreutils-2.1.4/semodule_package/Makefile 2011-10-04 08:51:05.452086558 -0400
+--- policycoreutils-2.1.4/semodule_package/Makefile.f17 2011-10-24 14:35:34.468676403 -0400
++++ policycoreutils-2.1.4/semodule_package/Makefile 2011-10-24 14:35:34.960676443 -0400
@@ -24,7 +24,7 @@ install: all
relabel:
@@ -343,8 +344,8 @@ diff -up policycoreutils-2.1.4/semodule_package/Makefile.f17 policycoreutils-2.1
indent:
../../scripts/Lindent $(wildcard *.[ch])
diff -up policycoreutils-2.1.4/setfiles/restore.c.f17 policycoreutils-2.1.4/setfiles/restore.c
---- policycoreutils-2.1.4/setfiles/restore.c.f17 2011-10-04 08:49:30.091139387 -0400
-+++ policycoreutils-2.1.4/setfiles/restore.c 2011-10-04 08:51:05.453086559 -0400
+--- policycoreutils-2.1.4/setfiles/restore.c.f17 2011-10-24 14:35:34.472676403 -0400
++++ policycoreutils-2.1.4/setfiles/restore.c 2011-10-24 14:35:34.961676444 -0400
@@ -1,5 +1,6 @@
#include "restore.h"
#include <glob.h>
@@ -563,7 +564,7 @@ diff -up policycoreutils-2.1.4/setfiles/restore.c.f17 policycoreutils-2.1.4/setf
*/
diff -up policycoreutils-2.1.4/setfiles/restorecon.8.f17 policycoreutils-2.1.4/setfiles/restorecon.8
--- policycoreutils-2.1.4/setfiles/restorecon.8.f17 2011-08-18 06:52:32.000000000 -0400
-+++ policycoreutils-2.1.4/setfiles/restorecon.8 2011-10-04 08:51:05.453086559 -0400
++++ policycoreutils-2.1.4/setfiles/restorecon.8 2011-10-24 14:35:34.962676444 -0400
@@ -4,22 +4,27 @@ restorecon \- restore file(s) default SE
.SH "SYNOPSIS"
@@ -622,8 +623,8 @@ diff -up policycoreutils-2.1.4/setfiles/restorecon.8.f17 policycoreutils-2.1.4/s
.SH "ARGUMENTS"
.B pathname...
diff -up policycoreutils-2.1.4/setfiles/restore.h.f17 policycoreutils-2.1.4/setfiles/restore.h
---- policycoreutils-2.1.4/setfiles/restore.h.f17 2011-10-04 08:49:30.092139387 -0400
-+++ policycoreutils-2.1.4/setfiles/restore.h 2011-10-04 08:51:05.454086560 -0400
+--- policycoreutils-2.1.4/setfiles/restore.h.f17 2011-10-24 14:35:34.472676403 -0400
++++ policycoreutils-2.1.4/setfiles/restore.h 2011-10-24 14:35:34.962676444 -0400
@@ -40,6 +40,7 @@ struct restore_opts {
int fts_flags; /* Flags to fts, e.g. follow links, follow mounts */
const char *selabel_opt_validate;
@@ -634,7 +635,7 @@ diff -up policycoreutils-2.1.4/setfiles/restore.h.f17 policycoreutils-2.1.4/setf
void restore_init(struct restore_opts *opts);
diff -up policycoreutils-2.1.4/setfiles/setfiles.8.f17 policycoreutils-2.1.4/setfiles/setfiles.8
--- policycoreutils-2.1.4/setfiles/setfiles.8.f17 2011-08-18 06:52:32.000000000 -0400
-+++ policycoreutils-2.1.4/setfiles/setfiles.8 2011-10-04 08:51:05.454086560 -0400
++++ policycoreutils-2.1.4/setfiles/setfiles.8 2011-10-24 14:35:34.963676444 -0400
@@ -4,7 +4,7 @@ setfiles \- set file SELinux security co
.SH "SYNOPSIS"
@@ -681,8 +682,8 @@ diff -up policycoreutils-2.1.4/setfiles/setfiles.8.f17 policycoreutils-2.1.4/set
.B \-W
display warnings about entries that had no matching files.
diff -up policycoreutils-2.1.4/setfiles/setfiles.c.f17 policycoreutils-2.1.4/setfiles/setfiles.c
---- policycoreutils-2.1.4/setfiles/setfiles.c.f17 2011-10-04 08:49:30.092139387 -0400
-+++ policycoreutils-2.1.4/setfiles/setfiles.c 2011-10-04 08:51:05.455086560 -0400
+--- policycoreutils-2.1.4/setfiles/setfiles.c.f17 2011-10-24 14:35:34.473676404 -0400
++++ policycoreutils-2.1.4/setfiles/setfiles.c 2011-10-24 14:35:34.964676444 -0400
@@ -39,7 +39,7 @@ void usage(const char *const name)
{
if (iamrestorecon) {
diff --git a/policycoreutils.spec b/policycoreutils.spec
index efdd569..e0c8547 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
Group: System Environment/Base
# Based on git repository with tag 20101221
@@ -354,6 +354,9 @@ fi
/bin/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
%changelog
+* Mon Oct 24 2011 Dan Walsh <dwalsh at redhat.com> - 2.1.4-6
+- Inlcude the patch this time to fix sandbox.init
+
* Mon Oct 24 2011 Dan Walsh <dwalsh at redhat.com> - 2.1.4-5
- Fix sandbox.init script
More information about the scm-commits
mailing list