Merge ~gunnarhj/ubuntu/+source/glibc:ubuntu/devel into ~ubuntu-core-dev/ubuntu/+source/glibc:ubuntu/devel

[Gunnar Hjalmarsson]

[Gunnar Hjalmarsson (gunnarhj)]

A merge request was previously submitted to Debian:

https://salsa.debian.org/glibc-team/glibc/-/merge_requests/1

a34dcfc... by Gunnar Hjalmarsson on 2021-10-15

Tweak validation of args to update-locale()

LP: #1892825

[Gunnar Hjalmarsson (gunnarhj)]

Right, '\w+' is better than '.+'. Just changed the MR, but didn't rebase or anything, since the target branch is apparently not the right one any longer, and I don't know which repo/branch is used for development nowadays.

[Michael Hudson-Doyle (mwhudson)]

Thanks, this change makes sense (I do also think this is a pam bug that it causes such carnage though). I currently don't have a clearly defined approach to using git for glibc, it probably makes sense to start using this repo again.

[Michael Hudson-Doyle (mwhudson)]

OK I've staged this change for the next updates to devel, impish, focal and even bionic (although I don't know of any plans to SRU glibc to bionic currently).

diff --git a/debian/local/usr_sbin/update-locale b/debian/local/usr_sbin/update-locale
index 3951cdd..38036c2 100755
--- a/debian/local/usr_sbin/update-locale
+++ b/debian/local/usr_sbin/update-locale
@@ -64,7 +64,7 @@ else
 }
 for (@ARGV)
 {
-	if (m/(.*?)=(.*)/)
+	if (m/(\w+)=(.*)/)
 	{
 		$arg{$1} = $2;
 	}