commit: 3d9b5fe42743e6d935840204f97191369cd476fc Author: Kerin Millar <kfm <AT> plushkava <DOT> net> AuthorDate: Sun Jan 4 05:20:34 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 4 05:35:24 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d9b5fe4
sys-apps/locale-gen: add 3.9-r2 for SELinux fix This contains a hotfix for bug #968318. The reason for not yet issuing a new release is that some additional work is required. As such, I did not want to delay the resolution of the bug in question. [sam: Tweak commit summary slightly to match our formatting.] Closes: https://bugs.gentoo.org/968318 Signed-off-by: Kerin Millar <kfm <AT> plushkava.net> Signed-off-by: Sam James <sam <AT> gentoo.org> .../3.9-avoid-chcon-execution-if-missing.patch | 43 ++++++++++++++++++++++ ...-gen-3.9-r1.ebuild => locale-gen-3.9-r2.ebuild} | 1 + 2 files changed, 44 insertions(+) diff --git a/sys-apps/locale-gen/files/3.9-avoid-chcon-execution-if-missing.patch b/sys-apps/locale-gen/files/3.9-avoid-chcon-execution-if-missing.patch new file mode 100644 index 000000000000..10426db8a28b --- /dev/null +++ b/sys-apps/locale-gen/files/3.9-avoid-chcon-execution-if-missing.patch @@ -0,0 +1,43 @@ +From ae0a37058a89a9ce9a99562931777f0636108c50 Mon Sep 17 00:00:00 2001 +From: Kerin Millar <[email protected]> +Date: Sun, 4 Jan 2026 04:49:31 +0000 +Subject: [PATCH] Refrain from trying to execute chcon(1), if missing + +As of coreutils 9.9, the --with-selinux option is required for the +chcon(1) utility to be installed. Consider a scenario in which a Gentoo +Linux installation is being performed from an SELinux-enabled operating +environment. In that case, locale-gen(8) will detect that security +labels are supported and attempt to execute the chcon(1) utility. Given +that there is no longer any guarantee of the utility being available, +locale-gen(8) may raise the following error. + +sh: line 1: chcon: command not found +locale-gen: Aborting because the execution of 'chcon' was unsuccessful + +Address this issue by requiring for "chcon" to exist as an executable in +PATH as an additional condition for its execution, as is already the +case for "restorecon". + +Closes: https://bugs.gentoo.org/968318 +Link: https://cgit.git.savannah.gnu.org/cgit/coreutils.git/commit/?id=8ba47d09a33f0740e071a8394f3504e0fb57948e +Signed-off-by: Kerin Millar <[email protected]> +--- + locale-gen | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/locale-gen b/locale-gen +index a65b99a..d39519f 100644 +--- a/locale-gen ++++ b/locale-gen +@@ -573,7 +573,7 @@ sub install_archive ($src_path, $dst_path, $may_reset_labels) { + run('mv', '--', $src_path, $interim_path); + + # If a prior archive exists, attempt to preserve its SELinux label. +- if ($has_seclabels && $has_archive) { ++ if ($has_seclabels && $has_archive && can_run('chcon')) { + copy_security_context($dst_path, $interim_path); + } + +-- +2.52.0 + diff --git a/sys-apps/locale-gen/locale-gen-3.9-r1.ebuild b/sys-apps/locale-gen/locale-gen-3.9-r2.ebuild similarity index 96% rename from sys-apps/locale-gen/locale-gen-3.9-r1.ebuild rename to sys-apps/locale-gen/locale-gen-3.9-r2.ebuild index 10e42892fd9c..d6c8e50f4c24 100644 --- a/sys-apps/locale-gen/locale-gen-3.9-r1.ebuild +++ b/sys-apps/locale-gen/locale-gen-3.9-r2.ebuild @@ -32,6 +32,7 @@ src_prepare() { local -x MY_EPREFIX=${EPREFIX} eapply "${FILESDIR}/${PV}-suppress-bash-setlocale-warnings.patch" + eapply "${FILESDIR}/${PV}-avoid-chcon-execution-if-missing.patch" eapply_user perl -pi -e '$f //= ($. == 1 && s/^#!\h*\K/$ENV{MY_EPREFIX}/); END { exit !$f }' "${PN}" \
