busybox: added patches and runit services fixes

7 files changed, 84 insertions, 6 deletions

diff --git a/repos/core/busybox/.checksum b/repos/core/busybox/.checksum
index 2344f1b0..995faacb 100644
--- a/repos/core/busybox/.checksum
+++ b/repos/core/busybox/.checksum
@@ -1,10 +1,12 @@
 6499c4a3d5379e4e34e30a84f7ef9ae513b696694a07d1f4fbd9de9a998d0da1  0001-awk-fix-handling-of-literal-backslashes-in-replaceme.patch
 8c364768319aa2f68f480fe1fb4679af38cd692c5e7c66c8e0c2e0e0c7464e4c  0016-ping-make-ping-work-without-root-privileges.patch
+a7c6c992ca7bed0881b4be27af3d45e10b8f9560a3ee3db6a4e0ceda65f05e30  0031-syslogd-fix-wrong-OPT_locallog-flag-detection.patch
+7c40dc84a65c34364ef9de29247cb76f2c2db799ef091b4d980576dd11d7e16d  0034-adduser-remove-preconfigured-GECOS-full-name-field.patch
 d7fef12ae5c778a12294be5da8ff8ffcc4a3ff3e0a5dca5885964626a47c2a0f  acpid.run
 f62969ee1426bea40ffd603cb01aa4f6e264930ce29a0266b776f5d08253772a  adduser-no-setgid.patch
 179c4567a112635be6cb442fd8e3ff95dd0e718facd0666f2426d94322110a8f  busybox-1.37.0.tar.bz2
 c8e25401863bfdecb4f3a5d4b68ef0507bac74dd69782ce3abdd7e49fecc4a80  busybox-suidwrapper.c
-48b8a6cc6f4aa539de48f5c4d405a4400239215fe3dc7f30df370951e51743ca  crond.run
+239685f1d7b222d8cb4c73db36dfe76b2127c2baeff5eb4198dd32420d9a5c2d  crond.run
 2fc84cd00bba1a27bb692fb61f7b06307bd2a618161c1f019efd5a8432b0f3c5  fsck-resolve-uuid.patch
 91df6065aec94c67f59f0d10e7beb1cd05286d8739bf57f478382a98d2ef90a5  httpd.run
 1e7ca4ffd2de2182a591c0c9eb8f1f2d792342db96a44762a4ef022253aaaa5c  inetd.run
@@ -13,11 +15,11 @@ e8fa37d2abb51c4d75d473b0b495b245afee37e48e80b8a4fd5b3539bc06ad68  klogd.run
 a8be467d592f549df6405baa7e6228fd4363c759200161222a4b23e72ebd65f2  mdev.conf
 12e52732c806aaebd01f6ca9a88594d3be568eb157e44208dde64237b5cfd8af  mdev.run
 0e7127f64ee6760d433ceff02e3c6300c5cbf35ac0172037c68725538babd32c  modprobe-kernel-version.patch
-8901b39de476372c4701ba88df0872818252b638e74922a22a483db41b487016  ntpd.run
+1994ec5cf74e86f662f169eb46bfabc1e401a36cf70d5b500d657c079d54595d  ntpd.run
 71446b4690cd21f8e5fddd85f6fbf70c4bfbe1998988764e572021ee674d6790  pause.1
 8a3b2dc28757685ce69dd472483127d47703f4f7995395f1980745f3b1bf88b0  pause.c
 fd866b53f9d1ca305c15b93bc2699caaf1c930f093326bb737cc33fa2455787e  print-unicode.patch
-0c3c5db99153d1017813c8b119bc317969a945360cfb83b41d13de4e2d0d47b3  syslogd.run
+2972c7b9fcd0c5582460e056f05b8475cbad9c0ba0e2c5f3ed06ca9409ca0e44  syslogd.run
 f220e64f2c99e5fae0bf764a750dcab6b91568f8afbee791949b43bc189cc8c0  tty1.run
 885c30ed1f30e988f33336318e60b8b340a0772243860103a14274a388c63590  tty2.run
 6d4d3465dcd4f82114eefdb4cc20703bc1cb53b36a494e558e4f749fd2d7e0a7  tty3.run
diff --git a/repos/core/busybox/0031-syslogd-fix-wrong-OPT_locallog-flag-detection.patch b/repos/core/busybox/0031-syslogd-fix-wrong-OPT_locallog-flag-detection.patch
new file mode 100644
index 00000000..efb1410b
--- /dev/null
+++ b/repos/core/busybox/0031-syslogd-fix-wrong-OPT_locallog-flag-detection.patch
@@ -0,0 +1,33 @@
+From 3db0791a409be9b4c2f08cf3081d2d5141c3314c Mon Sep 17 00:00:00 2001
+From: Andrej Valek <andrej.v@skyrain.eu>
+Date: Wed, 16 Oct 2024 10:15:08 +0200
+Subject: [PATCH] syslogd: fix wrong OPT_locallog flag detection
+
+The OPT_locallog was set on "option_mask32" but checked on local
+"opts" variable. While this flag it's used on multiple places can't be
+has to be used with "option_mask32". Without this change syslogd
+is more-less unusable while no messages are logged locally.
+
+See:
+
+* https://lists.busybox.net/pipermail/busybox/2024-October/090969.html
+* https://lists.busybox.net/pipermail/busybox/2023-September/090499.html
+
+Signed-off-by: Andrej Valek <andrej.v@skyrain.eu>
+---
+ sysklogd/syslogd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
+index 7558051f0..fa03aa280 100644
+--- a/sysklogd/syslogd.c
++++ b/sysklogd/syslogd.c
+@@ -1179,7 +1179,7 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv)
+ 			}
+ 		}
+ #endif
+-		if (!ENABLE_FEATURE_REMOTE_LOG || (opts & OPT_locallog)) {
++		if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) {
+ 			recvbuf[sz] = '\0'; /* ensure it *is* NUL terminated */
+ 			split_escape_and_log(recvbuf, sz);
+ 		}
diff --git a/repos/core/busybox/0034-adduser-remove-preconfigured-GECOS-full-name-field.patch b/repos/core/busybox/0034-adduser-remove-preconfigured-GECOS-full-name-field.patch
new file mode 100644
index 00000000..aeb47b83
--- /dev/null
+++ b/repos/core/busybox/0034-adduser-remove-preconfigured-GECOS-full-name-field.patch
@@ -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
+
diff --git a/repos/core/busybox/abuild b/repos/core/busybox/abuild
index b1b92271..ac9c1b56 100644
--- a/repos/core/busybox/abuild
+++ b/repos/core/busybox/abuild
@@ -1,9 +1,11 @@
 name=busybox
 version=1.37.0
-release=1
+release=2
 source="https://${name}.net/downloads/${name}-${version}.tar.bz2
 	0001-awk-fix-handling-of-literal-backslashes-in-replaceme.patch
 	0016-ping-make-ping-work-without-root-privileges.patch
+	0031-syslogd-fix-wrong-OPT_locallog-flag-detection.patch
+	0034-adduser-remove-preconfigured-GECOS-full-name-field.patch
 	kernel-6.8-tca.patch
 	fsck-resolve-uuid.patch
 	adduser-no-setgid.patch
diff --git a/repos/core/busybox/crond.run b/repos/core/busybox/crond.run
index aac79c16..dda94538 100755
--- a/repos/core/busybox/crond.run
+++ b/repos/core/busybox/crond.run
@@ -1,2 +1,3 @@
 #!/bin/sh
+mkdir -p /var/spool/cron/crontabs/
 exec crond -f -d8  2>&1
diff --git a/repos/core/busybox/ntpd.run b/repos/core/busybox/ntpd.run
index 34d2ab20..feee70b1 100755
--- a/repos/core/busybox/ntpd.run
+++ b/repos/core/busybox/ntpd.run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec ntpd -n 2>&1
+exec busybox ntpd -n -N -p pool.ntp.org 2>&1
diff --git a/repos/core/busybox/syslogd.run b/repos/core/busybox/syslogd.run
index 65a7b972..d482dc71 100755
--- a/repos/core/busybox/syslogd.run
+++ b/repos/core/busybox/syslogd.run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec syslogd -s -m0 2>&1
+exec syslogd -L -n -O /var/log/messages 2>&1