main/busybox: remove preconfigured GECOS full name field from adduser

Upstream: https://lists.busybox.net/pipermail/busybox/2024-November/091029.html

I got no response by upstream after the first wave of feedback
for over a month now, so I think patching this downstream is the next
reasonable step.
This commit is contained in:
fossdd 2025-01-04 01:21:37 +01:00 committed by Sören Tempel
parent 87f9e9ae5f
commit 8ebd12e954
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,40 @@
Patch-Source: https://lists.busybox.net/pipermail/busybox/2024-November/091029.html
---
From 77e364c66bf1208269a257bf23bcdb07ac50b5cd Mon Sep 17 00:00:00 2001
From: fossdd <fossdd@pwned.life>
Date: Sat, 16 Nov 2024 22:21:12 +0100
Subject: [PATCH] adduser: remove preconfigured GECOS full name field
Pre-configuring "Linux User" as Full Name is confusing a lot of users
downstream.[1] For example, in geary e-mails were sent out as "Linux
User"[2] and I also saw a couple of git commits with this name. This name
does not bring any more improvements than just leaving this field
empty, and let applications most likely fallback to the username.
Alternative would be to set the field to `&` (Capitalized username,
according to passwd(5)) or that we just set the GECOS field downstream.
[1] https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues/2214
[2] https://gitlab.gnome.org/GNOME/geary/-/issues/1486
Signed-off-by: fossdd <fossdd@pwned.life>
---
loginutils/adduser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index d3c795afa..bfab05203 100644
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -196,7 +196,7 @@ int adduser_main(int argc UNUSED_PARAM, char **argv)
bb_simple_error_msg_and_die(bb_msg_perm_denied_are_you_root);
}
- pw.pw_gecos = (char *)"Linux User,,,";
+ pw.pw_gecos = (char *)"";
/* We assume that newly created users "inherit" root's shell setting */
pw.pw_shell = xstrdup(get_shell_name()); /* might come from getpwnam(), need to make a copy */
pw.pw_dir = NULL;
--
2.47.1

View File

@ -4,7 +4,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=busybox
pkgver=1.37.0
pkgrel=10
pkgrel=11
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@ -79,6 +79,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0031-syslogd-fix-wrong-OPT_locallog-flag-detection.patch
0032-lineedit-fix-some-tab-completions-written-to-stdout.patch
0033-lineedit-use-stdout-for-shell-history-builtin.patch
0034-adduser-remove-preconfigured-GECOS-full-name-field.patch
0001-hexdump-fix-regression-with-n4-e-u.patch
0001-awk-fix-handling-of-literal-backslashes-in-replaceme.patch
@ -395,6 +396,7 @@ d9625580bdfe7036e0a3e01c33ddffcc8c70737dfa031c9f97a5a45635910dbd5cf3ebb8d28256a1
4c2b7d7c623b318087f20b0bef9140cfa3f83111bfc922bba50ddd16edb8844c848c8b93c5d31303b7f253673fbff8ccf3d4ab4b9dad52fde3e04744b0782170 0031-syslogd-fix-wrong-OPT_locallog-flag-detection.patch
ac56a170a31f4329d00155a2a7d3950c4fe365e69e2e6b773a28fe3faa214a1330f0dd910bf0712453f033abc9e8465f9cec80f4e3e820a5d6ffafbf36e503e7 0032-lineedit-fix-some-tab-completions-written-to-stdout.patch
82c328921c4034b561f31fe5da77fd1a03033911bb6f50383b59885b184e010bbf66065ce0d90e0bc138a7608a4a5b51cab5d3598f974ee600d06eb161d5b0c3 0033-lineedit-use-stdout-for-shell-history-builtin.patch
04ed80099092bf6cafa293d13039184307197d5b71e2052a7b5650eed4364845cca3910e701e01c67a23dff7c9552506b682d553d6bdd7dfcbc7724e98595c4d 0034-adduser-remove-preconfigured-GECOS-full-name-field.patch
ac026f8b289d1431c46d51a8c512eb0184aa81de1c41971a87c99bcdc5c63c2d9abed412cad20d3032b480d87a52ee2602411149eb5f271fa9d051165a7b8188 0001-hexdump-fix-regression-with-n4-e-u.patch
7165661f3972f1800faf8d263126e3f238bb26bb7891230dbaad2d085e49e2ababc555294ecefed9d8ff00d93c8c3963e786db796cf3d03d68bf9e0492305d0c 0001-awk-fix-handling-of-literal-backslashes-in-replaceme.patch
aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate