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: 1828 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.

Currently we always overwrite LANG on login, even if it was already set by the desktop or user which causes issues with GDM.

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

You can see what Fedora does here:
https://gist.github.com/oreo639/3b83b852ce0db21e21eed102a57c5148
(taken from the setup package)

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: 1881 bytes --]

From 04104c319c94f6e92256fba47d4fcf42152f0ed2 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

Correct spelling of LC_IDENTIFICATION.
---
 srcpkgs/base-files/files/locale.sh | 22 ++++++++++++++++++++--
 srcpkgs/base-files/template        |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/base-files/files/locale.sh b/srcpkgs/base-files/files/locale.sh
index 8486367bfabf90..c027b4549f22be 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.
 #
+_parse_lc_conf() {
+	lineno=
+	while read -r line || [ "$line" ]; do
+		line="${line%%#*}"
+		lc=$(expr "$line" : '^\([[:upper:]_]\+=\([[:alnum:][:digit:]\._-]\+\|"[[:print:][:digit:]\._-]"\)\)')
+		lineno="$(($lineno+1))"
+		if [ "$line" = "$lc" ]; then
+			eval ": \${$line}"
+		elif [ "$line" ]; then
+			echo "$1: invalid assignment on line $lineno"
+		fi
+	done < "$1"
+	unset lineno line lc
+}
+
 if [ -s /etc/locale.conf ]; then
-	. /etc/locale.conf
+	_parse_lc_conf /etc/locale.conf
 fi
 
+# 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
+export LC_IDENTIFICATION
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 64e756be34dee2..1877a88e14324e 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.144
-revision=1
+revision=2
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"