Date
1 - 1 of 1
[meta-selinux][PATCH 16/17] selinux-sandbox: upgrade 3.4 -> 3.5
Yi Zhao
License-Update: Rename COPYING to LICENSE. No content changes.
* Drop backport patch. Signed-off-by: Yi Zhao <yi.zhao@...> --- ...andle-unsupported-languages-properly.patch | 49 ------------------- ...-sandbox_3.4.bb => selinux-sandbox_3.5.bb} | 3 +- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 recipes-security/selinux/selinux-sandbox/0001-gettext-handle-unsupported-languages-properly.patch rename recipes-security/selinux/{selinux-sandbox_3.4.bb => selinux-sandbox_3.5.bb} (84%) diff --git a/recipes-security/selinux/selinux-sandbox/0001-gettext-handle-unsupported-languages-properly.patch b/recipes-security/selinux/selinux-sandbox/0001-gettext-handle-unsupported-languages-properly.patch deleted file mode 100644 index f1d8235..0000000 --- a/recipes-security/selinux/selinux-sandbox/0001-gettext-handle-unsupported-languages-properly.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 70602601ac1cfc4399430ef8609b96fc224d1e25 Mon Sep 17 00:00:00 2001 -From: Vit Mojzis <vmojzis@...> -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@...> -Reviewed-by: Daniel Burgener <dburgener@...> -Acked-by: Petr Lautrbach <plautrba@...> - -Upstream-Status: Backport -[https://github.com/SELinuxProject/selinux/commit/344463076b2a91e1d2c7f5cc3835dc1a53a05e88] - -Signed-off-by: Yi Zhao <yi.zhao@...> ---- - 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 - diff --git a/recipes-security/selinux/selinux-sandbox_3.4.bb b/recipes-security/selinux/selinux-sandbox_3.5.bb similarity index 84% rename from recipes-security/selinux/selinux-sandbox_3.4.bb rename to recipes-security/selinux/selinux-sandbox_3.5.bb index a5a8e13..2cb55d6 100644 --- a/recipes-security/selinux/selinux-sandbox_3.4.bb +++ b/recipes-security/selinux/selinux-sandbox_3.5.bb @@ -5,12 +5,11 @@ sandbox domain only allows applications the ability to read and write \ stdin, stdout and any other file descriptors handed to it." SECTION = "base" LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=393a5ca445f6965873eca0259a17f833" require selinux_common.inc SRC_URI += "file://sandbox-de-bashify.patch \ - file://0001-gettext-handle-unsupported-languages-properly.patch \ " S = "${WORKDIR}/git/sandbox" -- 2.25.1 |
|