mirror of
git://git.yoctoproject.org/meta-selinux
synced 2026-01-01 13:58:04 +00:00
selinux-sandbox: upgrade 3.3 -> 3.4
* Backport a patch to fix chcat runtime error. * Refresh patch. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe@deserted.net>
This commit is contained in:
parent
cf3c9d14de
commit
e37231db76
|
|
@ -0,0 +1,49 @@
|
|||
From 70602601ac1cfc4399430ef8609b96fc224d1e25 Mon Sep 17 00:00:00 2001
|
||||
From: Vit Mojzis <vmojzis@redhat.com>
|
||||
Date: Fri, 24 Jun 2022 16:24:25 +0200
|
||||
Subject: [PATCH] gettext: handle unsupported languages properly
|
||||
|
||||
With "fallback=True" gettext.translation behaves the same as
|
||||
gettext.install and uses NullTranslations in case the
|
||||
translation file for given language was not found (as opposed to
|
||||
throwing an exception).
|
||||
|
||||
Fixes:
|
||||
# LANG is set to any "unsupported" language, e.g. en_US.UTF-8
|
||||
$ chcat --help
|
||||
Traceback (most recent call last):
|
||||
File "/usr/bin/chcat", line 39, in <module>
|
||||
t = gettext.translation(PROGNAME,
|
||||
File "/usr/lib64/python3.9/gettext.py", line 592, in translation
|
||||
raise FileNotFoundError(ENOENT,
|
||||
FileNotFoundError: [Errno 2] No translation file found for domain: 'selinux-python'
|
||||
|
||||
Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
|
||||
Reviewed-by: Daniel Burgener <dburgener@linux.microsoft.com>
|
||||
Acked-by: Petr Lautrbach <plautrba@redhat.com>
|
||||
|
||||
Upstream-Status: Backport
|
||||
[https://github.com/SELinuxProject/selinux/commit/344463076b2a91e1d2c7f5cc3835dc1a53a05e88]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
sandbox | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sandbox b/sandbox
|
||||
index cd5709f..789621e 100644
|
||||
--- a/sandbox
|
||||
+++ b/sandbox
|
||||
@@ -45,7 +45,8 @@ try:
|
||||
kwargs['unicode'] = True
|
||||
t = gettext.translation(PROGNAME,
|
||||
localedir="/usr/share/locale",
|
||||
- **kwargs)
|
||||
+ **kwargs,
|
||||
+ fallback=True)
|
||||
_ = t.gettext
|
||||
except:
|
||||
try:
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From b92c39f0be5552c19923f75aef4487348a08b7dc Mon Sep 17 00:00:00 2001
|
||||
From d592d59eb4e7dbf8ce6dc84b3f4c0026fd7cc60c Mon Sep 17 00:00:00 2001
|
||||
From: Joe MacDonald <joe_macdonald@mentor.com>
|
||||
Date: Fri, 20 Feb 2015 21:07:47 -0500
|
||||
Subject: [PATCH] sandbox: de-bashify
|
||||
|
|
@ -6,7 +6,7 @@ Subject: [PATCH] sandbox: de-bashify
|
|||
There's no bashisms apparent in either the sandbox initscript nor the
|
||||
sandboxX script, so point them at /bin/sh instead.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
|
||||
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
|
|
@ -37,5 +37,5 @@ index eaa500d..8755d75 100644
|
|||
context=`id -Z | secon -t -l -P`
|
||||
export TITLE="Sandbox $context -- `grep ^#TITLE: ~/.sandboxrc | /usr/bin/cut -b8-80`"
|
||||
--
|
||||
2.7.4
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,15 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
|
|||
|
||||
require selinux_common.inc
|
||||
|
||||
SRC_URI += "file://sandbox-de-bashify.patch"
|
||||
SRC_URI += "file://sandbox-de-bashify.patch \
|
||||
file://0001-gettext-handle-unsupported-languages-properly.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git/sandbox"
|
||||
|
||||
DEPENDS += "libcap-ng libselinux"
|
||||
DEPENDS = "libselinux libcap-ng gettext-native"
|
||||
|
||||
RDEPENDS:${PN} += "\
|
||||
RDEPENDS:${PN} = "\
|
||||
python3-core \
|
||||
python3-math \
|
||||
python3-shell \
|
||||
Loading…
Reference in New Issue
Block a user