[policycoreutils] Fix English in templates for sepolgen

Daniel J Walsh dwalsh at fedoraproject.org
Mon Jan 9 21:30:28 UTC 2012


commit db51c1ef98a781e99f65969c3b7f16dfb2e4db0e
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Mon Jan 9 16:30:19 2012 -0500

    Fix English in templates for sepolgen

 policycoreutils-rhat.patch |    6 +++---
 policycoreutils.spec       |    5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 19ffd0b..266a520 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -81,7 +81,7 @@ index 9db766c..92034be 100644
  	 * Do not execvp the command directly from run_init; since it would run
  	 * under with a pty under sysadm_devpts_t. Instead, we call open_init_tty,
 diff --git a/policycoreutils/sandbox/seunshare.c b/policycoreutils/sandbox/seunshare.c
-index c493e98..902792e 100644
+index c493e98..a084e0e 100644
 --- a/policycoreutils/sandbox/seunshare.c
 +++ b/policycoreutils/sandbox/seunshare.c
 @@ -43,8 +43,8 @@
@@ -140,8 +140,8 @@ index c493e98..902792e 100644
  
 +		/* Remount / as SLAVE so that nothing mounted in the namespace 
 +		   shows up in the parent */
-+		if (mount("/", "/", NULL, MS_SLAVE | MS_REC , NULL) < 0) {
-+			fprintf(stderr, _("Failed to make / a SLAVE mountpoint\n"));
++		if (mount("none", "/", NULL, MS_SLAVE | MS_REC , NULL) < 0) {
++			perror(_("Failed to make / a SLAVE mountpoint\n"));
 +			goto childerr;
 +		}
 +
diff --git a/policycoreutils.spec b/policycoreutils.spec
index a89dbf8..22648f4 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.1.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -356,6 +356,9 @@ fi
 /bin/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
 
 %changelog
+* Mon Jan 9 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.10-5
+- Fix English in templates for sepolgen
+
 * Fri Dec 23 2011 Dan Walsh <dwalsh at redhat.com> - 2.1.10-4
 - Fix the handling of namespaces in seunshare/sandbox.
 - Currently mounting of directories within sandbox is propogating to the 


More information about the scm-commits mailing list