Re: [PR PATCH] [Updated] base-files: don't overwrite existing locale and define default LANG

[oreo639 <oreo639@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 2158 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages files
https://github.com/void-linux/void-packages/pull/39264

base-files: don't overwrite existing locale and define default LANG
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Fixes overwriting user/desktop specified locale.

According to the locale.conf specification:

> The locale settings configured in /etc/locale.conf are
> system-wide and are inherited by every service or user, unless
> overridden or unset by individual programs or users.

https://man7.org/linux/man-pages/man5/locale.conf.5.html

Currently we always overwrite LANG on login, even if it was already set by the desktop or user which afaict goes against what is stated above.

You can see what Arch does here:
https://bugs.archlinux.org/task/42162
https://github.com/archlinux/svntogit-packages/blob/master/filesystem/trunk/locale.sh

Fedora does something way way more complicated using include guards and having bashrc and profile load each other and is definitely not what we want to do.

Closes: https://github.com/void-linux/void-packages/issues/15292

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/39264.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-files-39264.patch --]
[-- Type: text/x-diff, Size: 1846 bytes --]

From 7960f3ff73e0c21241b76b33cc36b1913f800758 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 13 Sep 2022 10:22:19 -0700
Subject: [PATCH] base-files: don't overwrite existing locale and define
 default LANG

---
 srcpkgs/base-files/files/locale.sh | 18 ++++++++++++++++++
 srcpkgs/base-files/template        |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/base-files/files/locale.sh b/srcpkgs/base-files/files/locale.sh
index 8486367bfabf..6218dbae4b3e 100644
--- a/srcpkgs/base-files/files/locale.sh
+++ b/srcpkgs/base-files/files/locale.sh
@@ -1,9 +1,27 @@
 # Sets up locale system settings from /etc/locale.conf.
 #
+
+for a in LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
+ LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \
+ LC_INDENTIFICATION; do
+	eval '_backup_'${a}'="${'${a}'}"'
+done
+
 if [ -s /etc/locale.conf ]; then
 	. /etc/locale.conf
 fi
 
+for a in LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
+ LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \
+ LC_INDENTIFICATION; do
+	eval 'if [ -n ${_backup_'${a}'} ]; then
+		'${a}'="${_backup_'${a}'}"
+	fi'
+done
+
+# define default LANG to C.UTF-8 if not already defined
+LANG="${LANG:-C.UTF-8}"
+
 export LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY
 export LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
 export LC_INDENTIFICATION
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index b96d09351a08..3f2696ba6954 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.143
-revision=2
+revision=3
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"