Update to Linux 6.1 and Alpine 3.18

- Update base-layout to 3.4.3 - Update busybox to 1.36.1 - Update iptables to 1.8.9 - Update linux-lts to 6.1.53 - Update to openrc to 0.48 - Update rtl8821ce to snapshot of 20230915 - Replace rtwB88 with a third-party driver - Update rtw89 to snapshot of 20230913 - Import wpa_supplicant fixes from Arch Linux
author: PÁLI Gábor János <pali.gabor@gmail.com> 2023-08-03 10:10:44 +0200
committer: PÁLI Gábor János <pali.gabor@gmail.com> 2023-09-16 17:58:03 +0200
commit: 89279d87c5d3e0ea330be1f927e3f3bc59dbc2a7 (patch)
tree: 353bc9a026d0140151e760efbc4f6a6a6b24a020
parent: 084335e136581edc28137b152cc559778224570e (diff)
download: freebsd-wifibox-alpine-89279d87c5d3e0ea330be1f927e3f3bc59dbc2a7.zip
74 files changed, 1730 insertions, 1734 deletions
diff --git a/aports/base-layout/locale.sh b/aports/base-layout/20locale.sh
index bf75c08..bf75c08 100644
--- a/aports/base-layout/locale.sh
+++ b/aports/base-layout/20locale.sh
diff --git a/aports/base-layout/APKBUILD b/aports/base-layout/APKBUILD
index 9b46b78..cfc90b9 100644
--- a/aports/base-layout/APKBUILD
+++ b/aports/base-layout/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Gabor Pali <pali.gabor@gmail.com>
 
-pkgname=baselayout
-pkgver=3.4.0
-pkgrel=0 # base: 0
-pkgdesc="Base dir structure and init scripts (Alpine Linux)"
+pkgname=baselayout # base: alpine-baselayout, alpine-baselayout-data
+pkgver=3.4.3
+pkgrel=0 # base: 1
+pkgdesc="Base dir structure and init scripts"
 url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
 arch="noarch"
 license="GPL-2.0-only"
@@ -12,7 +12,7 @@ options="!fhs !check"
 install=
 _nbver=6.4
 source="crontab
-	locale.sh
+	20locale.sh
 
 	group
 	inittab
@@ -100,7 +100,7 @@ package() {
 
 	install -m600 "$srcdir"/crontab "$pkgdir"/etc/crontabs/root
 	install -m644 \
-		"$srcdir"/locale.sh \
+		"$srcdir"/20locale.sh \
 		"$pkgdir"/etc/profile.d/
 
 	cat > "$pkgdir"/etc/hosts <<-EOF
@@ -191,11 +191,11 @@ package() {
 
 sha512sums="
 6e169c0975a1ad1ad871a863e8ee83f053de9ad0b58d94952efa4c28a8c221445d9e9732ad8b52832a50919c2f39aa965a929b3d5b3f9e62f169e2b2e0813d82  crontab
-b2fc9b72846a43a45ba9a8749e581cef34d1915836833b51b7919dfbf4e275b7d55fec4dea7b23df3796380910971a41331e53e8cf0d304834e3da02cc135e5a  locale.sh
+b2fc9b72846a43a45ba9a8749e581cef34d1915836833b51b7919dfbf4e275b7d55fec4dea7b23df3796380910971a41331e53e8cf0d304834e3da02cc135e5a  20locale.sh
 806b8f23f823a9471846d12fa6b55690b95eedb4c613b82aefaba7ffef23f83e17552befd891a487864f72ef24e395d8611738933f684a85eb4c336cb20994f8  group
 7cc3c23062c730ec7a1d7850423d9901047005520da5b347b7b24e5f33a9c9a9129b430557f7f41e565f143624b7f3c47e3f6e4a6a446e75f0ea245c03d70880  inittab
 06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290  passwd
-a15252a5eb90983775f63e54d37242f4c76c5c358ad6d8c1622c7da35f1b8a722249e7375a07e9f08fbb25318bd1eb033d3927aed82c3f5e9b854ad550dad2ce  profile
+4eb857ed59c2edb257636d2bf196989e514a273e9701e9f076c9ae8c1589b4898269180569960acf072c0981ec7ea54014fd230f014401d6bb92314285d1e6aa  profile
 3a00083bcdf5a9e884c9d07877d52311e3d99e79cbee656e236ba06e08ba0dddb7ba76494fdc9dd1a826c48e197a790a69e6bb458e9df64832d6b5e904e9fd15  protocols-6.4
 47b0f3ee73af2d259bd206a026204be0ea25531a895a0b035a904b38fe5407bc3dd2beab7f8fcb3d760587e6159702ebdb9cbc4f508942befdf7f10c10c87888  services-6.4
 "
diff --git a/aports/base-layout/profile b/aports/base-layout/profile
index e62587b..fbc3ba0 100644
--- a/aports/base-layout/profile
+++ b/aports/base-layout/profile
@@ -1,24 +1,5 @@
-# Append "$1" to $PATH when not already in.
-# Copied from Arch Linux, see #12803 for details.
-append_path () {
-	case ":$PATH:" in
-		*:"$1":*)
-			;;
-		*)
-			PATH="${PATH:+$PATH:}$1"
-			;;
-	esac
-}
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
-append_path "/usr/local/sbin"
-append_path "/usr/local/bin"
-append_path "/usr/sbin"
-append_path "/usr/bin"
-append_path "/sbin"
-append_path "/bin"
-unset -f append_path
-
-export PATH
 export PAGER=less
 umask 022
 
diff --git a/aports/broadcom-wl/APKBUILD b/aports/broadcom-wl/APKBUILD
index 1d10afb..b1c3fd5 100644
--- a/aports/broadcom-wl/APKBUILD
+++ b/aports/broadcom-wl/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=broadcom-wl
 pkgver=6.30.223.271
-pkgrel=11
+pkgrel=12
 pkgdesc='Broadcom 802.11 Linux STA wireless driver'
 arch="x86_64"
 url='https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure'
@@ -33,7 +33,7 @@ source="broadcom-wl.conf
         https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz
 	"
 
-_kernver=$(cd /usr/src/ && find . -mindepth 1 -maxdepth 1 -type d | sed 's!./linux-headers-!!')
+_kernver=$(cd /usr/src/ && find . -mindepth 1 -maxdepth 1 -type d -name '*-lts' | sed 's!./linux-headers-!!')
 _kbase="/lib/modules/${_kernver}"
 
 prepare() {
diff --git a/aports/busybox/0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch b/aports/busybox/0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
deleted file mode 100644
index a9b0b8f..0000000
--- a/aports/busybox/0001-cpio-add-support-for-ignore-devno-like-GNU-cpio.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 808d176a4da607ed3187d58605d089b373694ba2 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Mon, 28 Jun 2021 07:09:25 -0600
-Subject: [PATCH 1/2] cpio: add support for --ignore-devno like GNU cpio
-
-The --ignore-devno option is used to set device numbers to (0, 0).
-This can be useful in verifying whether a CPIO archive is reproducible.
-
-function                                             old     new   delta
-cpio_o                                               922     961     +39
-.rodata                                            78407   78422     +15
-bbconfig_config_bz2                                 6161    6167      +6
-packed_usage                                       25770   25764      -6
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 3/1 up/down: 60/-6)              Total: 54 bytes
-
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
----
- archival/cpio.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/archival/cpio.c b/archival/cpio.c
-index d84f6937d..4d386d38d 100644
---- a/archival/cpio.c
-+++ b/archival/cpio.c
-@@ -38,6 +38,13 @@
- //config:	depends on FEATURE_CPIO_O
- //config:	help
- //config:	Passthrough mode. Rarely used.
-+//config:
-+//config:config FEATURE_CPIO_IGNORE_DEVNO
-+//config:	bool "Support --ignore-devno like GNU cpio"
-+//config:	default y
-+//config:	depends on FEATURE_CPIO_O && LONG_OPTS
-+//config:	help
-+//config:	Optionally ignore device numbers when creating archives.
- 
- //applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
- 
-@@ -75,6 +82,9 @@
- //usage:     "\n	-R USER[:GRP]	Set owner of created files"
- //usage:     "\n	-L	Dereference symlinks"
- //usage:     "\n	-0	Input is separated by NULs"
-+//usage:	IF_FEATURE_CPIO_IGNORE_DEVNO(
-+//usage:     "\n	--ignore-devno"
-+//usage:	)
- 
- /* GNU cpio 2.9 --help (abridged):
- 
-@@ -162,11 +172,13 @@ enum {
- 	IF_FEATURE_CPIO_P(OPTBIT_PASSTHROUGH,)
- 	IF_LONG_OPTS(     OPTBIT_QUIET      ,)
- 	IF_LONG_OPTS(     OPTBIT_2STDOUT    ,)
-+	IF_FEATURE_CPIO_IGNORE_DEVNO(OPTBIT_IGNORE_DEVNO,)
- 	OPT_CREATE             = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE     )) + 0,
- 	OPT_FORMAT             = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT     )) + 0,
- 	OPT_PASSTHROUGH        = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
- 	OPT_QUIET              = IF_LONG_OPTS(     (1 << OPTBIT_QUIET      )) + 0,
- 	OPT_2STDOUT            = IF_LONG_OPTS(     (1 << OPTBIT_2STDOUT    )) + 0,
-+	OPT_IGNORE_DEVNO       = IF_FEATURE_CPIO_IGNORE_DEVNO((1 << OPTBIT_IGNORE_DEVNO)) + 0,
- };
- 
- #define OPTION_STR "it0uvdmLF:R:"
-@@ -304,6 +316,11 @@ static NOINLINE int cpio_o(void)
- 			}
- 		}
- 
-+#if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
-+		if (option_mask32 & OPT_IGNORE_DEVNO)
-+			st.st_dev = st.st_rdev = 0;
-+#endif
-+
- 		bytes += printf("070701"
- 				"%08X%08X%08X%08X%08X%08X%08X"
- 				"%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */
-@@ -379,6 +396,9 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
- 		"null\0"         No_argument       "0"
- 		"quiet\0"        No_argument       "\xff"
- 		"to-stdout\0"    No_argument       "\xfe"
-+#if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
-+		"ignore-devno\0" No_argument	   "\xfd"
-+#endif
- 		;
- #endif
- 
--- 
-2.32.0
-
diff --git a/aports/busybox/0001-modutils-check-ELF-header-before-calling-finit_module.patch b/aports/busybox/0001-modutils-check-ELF-header-before-calling-finit_modul.patch
index 813010e..dd83a76 100644
--- a/aports/busybox/0001-modutils-check-ELF-header-before-calling-finit_module.patch
+++ b/aports/busybox/0001-modutils-check-ELF-header-before-calling-finit_modul.patch
@@ -1,14 +1,10 @@
-Patch-Source: http://lists.busybox.net/pipermail/busybox/2021-January/088398.html
-Patch-Source: http://lists.busybox.net/pipermail/busybox/2021-January/088399.html
-See-Also: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13427
-
-The purpose of this patch is to remove confusing error messages
-"Module has invalid ELF structures" produced by kernel when loading gzip
-compressed kernel modules using busybox modprobe.
---
+From e1a02faa656420a3c32fc8733e0566c2e430e6d6 Mon Sep 17 00:00:00 2001
 From: Qu Wenruo <wqu@suse.com>
-Date: Sun, 03 Jan 2021 04:10:52 +0000
-Subject: [PATCH v2] modutils: check ELF header before calling finit_module()
+Date: Sun, 3 Jan 2021 16:00:14 +0000
+Subject: [PATCH] modutils: check ELF header before calling finit_module()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 finit_module() and init_module() system calls have clear specification
 to only accept valid ELF image.
@@ -21,22 +17,26 @@ Treat the kernel better by just doing a very basic ELF header check
 before calling finit_module().
 
 Signed-off-by: Qu Wenruo <wqu at suse.com>
+---
+ modutils/modprobe-small.c | 33 ++++++++++++++++++++++++++++++++-
+ modutils/modutils.c       | 37 ++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 68 insertions(+), 2 deletions(-)
 
-diff --git a/modutils/modutils.c b/modutils/modutils.c
-index f7ad5e8058fe..037d609e42df 100644
---- a/modutils/modutils.c
-+++ b/modutils/modutils.c
-@@ -7,6 +7,7 @@
-  */
- #include "modutils.h"
- 
-+#include <elf.h>
- #include <sys/syscall.h>
+diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
+index b61651621..4763e0811 100644
+--- a/modutils/modprobe-small.c
++++ b/modutils/modprobe-small.c
+@@ -24,6 +24,7 @@
+ //kbuild:lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o
  
- #define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
-@@ -186,6 +187,33 @@ void* FAST_FUNC try_to_mmap_module(const char *filename, size_t *image_size_p)
+ #include "libbb.h"
++#include <elf.h> /* for ELF header magic */
+ /* After libbb.h, since it needs sys/types.h on some systems */
+ #include <sys/utsname.h> /* uname() */
+ #include <fnmatch.h>
+@@ -249,6 +250,33 @@ static const char *moderror(int err)
+ 	}
  }
- #endif
  
 +#ifdef __NR_finit_module
 +/*
@@ -65,46 +65,36 @@ index f7ad5e8058fe..037d609e42df 100644
 +}
 +#endif
 +
- /* Return:
-  * 0 on success,
-  * -errno on open/read error,
-@@ -212,12 +240,19 @@ int FAST_FUNC bb_init_module(const char *filename, const char *options)
- 	 * to only allow loading of modules off of secure storage (like a read-
- 	 * only rootfs) which needs the finit_module call.  If it fails, we fall
- 	 * back to normal module loading to support compressed modules.
-+	 *
-+	 * Note that finit_module()/init_module() only accept ELF image, do
-+	 * basic check before calling finit_module() to avoid kernel
-+	 * complaining.
- 	 */
- # ifdef __NR_finit_module
+ static int load_module(const char *fname, const char *options)
+ {
+ #if 1
+@@ -272,7 +300,10 @@ static int load_module(const char *fname, const char *options)
  	{
- 		int fd = open(filename, O_RDONLY | O_CLOEXEC);
+ 		int fd = open(fname, O_RDONLY | O_CLOEXEC);
  		if (fd >= 0) {
--			rc = finit_module(fd, options, 0) != 0;
+-			r = finit_module(fd, options, 0) != 0;
 +			if (!check_elf_header(fd))
-+				rc = finit_module(fd, options, 0) != 0;
++				r = finit_module(fd, options, 0) != 0;
 +			else
-+				rc = 1;
++				r = 1;
  			close(fd);
- 			if (rc == 0)
- 				return rc;
-
-diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
-index db44a2ed0ab5..d2cd6a64c1d0 100644
---- a/modutils/modprobe-small.c
-+++ b/modutils/modprobe-small.c
-@@ -24,6 +24,7 @@
- //kbuild:lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o
- 
- #include "libbb.h"
-+#include <elf.h> /* for ELF header magic */
- /* After libbb.h, since it needs sys/types.h on some systems */
- #include <sys/utsname.h> /* uname() */
- #include <fnmatch.h>
-@@ -249,6 +250,33 @@ static const char *moderror(int err)
+ 		}
  	}
+diff --git a/modutils/modutils.c b/modutils/modutils.c
+index f7ad5e805..037d609e4 100644
+--- a/modutils/modutils.c
++++ b/modutils/modutils.c
+@@ -7,6 +7,7 @@
+  */
+ #include "modutils.h"
+ 
++#include <elf.h>
+ #include <sys/syscall.h>
+ 
+ #define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
+@@ -186,6 +187,33 @@ void* FAST_FUNC try_to_mmap_module(const char *filename, size_t *image_size_p)
  }
+ #endif
  
 +#ifdef __NR_finit_module
 +/*
@@ -133,20 +123,27 @@ index db44a2ed0ab5..d2cd6a64c1d0 100644
 +}
 +#endif
 +
- static int load_module(const char *fname, const char *options)
- {
- #if 1
-@@ -272,7 +300,10 @@ static int load_module(const char *fname, const char *options)
+ /* Return:
+  * 0 on success,
+  * -errno on open/read error,
+@@ -212,12 +240,19 @@ int FAST_FUNC bb_init_module(const char *filename, const char *options)
+ 	 * to only allow loading of modules off of secure storage (like a read-
+ 	 * only rootfs) which needs the finit_module call.  If it fails, we fall
+ 	 * back to normal module loading to support compressed modules.
++	 *
++	 * Note that finit_module()/init_module() only accept ELF image, do
++	 * basic check before calling finit_module() to avoid kernel
++	 * complaining.
+ 	 */
+ # ifdef __NR_finit_module
  	{
- 		int fd = open(fname, O_RDONLY | O_CLOEXEC);
+ 		int fd = open(filename, O_RDONLY | O_CLOEXEC);
  		if (fd >= 0) {
--			r = finit_module(fd, options, 0) != 0;
+-			rc = finit_module(fd, options, 0) != 0;
 +			if (!check_elf_header(fd))
-+				r = finit_module(fd, options, 0) != 0;
++				rc = finit_module(fd, options, 0) != 0;
 +			else
-+				r = 1;
++				rc = 1;
  			close(fd);
- 		}
- 	}
--- 
-2.29.2
+ 			if (rc == 0)
+ 				return rc;
diff --git a/aports/busybox/0001-rev-correct-output-for-long-input-lines.patch b/aports/busybox/0001-rev-correct-output-for-long-input-lines.patch
deleted file mode 100644
index ba40a2f..0000000
--- a/aports/busybox/0001-rev-correct-output-for-long-input-lines.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 4357569fdc7bc482dea0ef0bff57a70e7f06523c Mon Sep 17 00:00:00 2001
-From: Ron Yorston <rmy@pobox.com>
-Date: Sat, 21 Aug 2021 09:36:27 +0100
-Subject: rev: correct output for long input lines
-
-The input buffer is initialised to a reasonable size and extended
-if necessary.  When this happened the offset into the buffer wasn't
-reset to zero so subsequent lines were appended to the long line.
-
-Fix this and add some tests.
-
-function                                             old     new   delta
-rev_main                                             377     368      -9
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-9)               Total: -9 bytes
-
-Signed-off-by: Ron Yorston <rmy@pobox.com>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- testsuite/rev.tests | 46 ++++++++++++++++++++++++++++++++++++++++++++++
- util-linux/rev.c    |  1 +
- 2 files changed, 47 insertions(+)
- create mode 100755 testsuite/rev.tests
-
-diff --git a/testsuite/rev.tests b/testsuite/rev.tests
-new file mode 100755
-index 000000000..dd65dcd3b
---- /dev/null
-+++ b/testsuite/rev.tests
-@@ -0,0 +1,46 @@
-+#!/bin/sh
-+# Copyright 2021 by Ron Yorston
-+# Licensed under GPLv2, see file LICENSE in this source tree.
-+
-+. ./testing.sh
-+
-+# testing "test name" "commands" "expected result" "file input" "stdin"
-+
-+testing "rev works" \
-+	"rev input" \
-+"\
-+1 enil
-+
-+3 enil
-+" \
-+	"line 1\n\nline 3\n" \
-+	""
-+
-+testing "rev file with missing newline" \
-+	"rev input" \
-+"\
-+1 enil
-+
-+3 enil" \
-+	"line 1\n\nline 3" \
-+	""
-+
-+testing "rev file with NUL character" \
-+	"rev input" \
-+"\
-+nil
-+3 enil
-+" \
-+	"lin\000e 1\n\nline 3\n" \
-+	""
-+
-+testing "rev file with long line" \
-+	"rev input" \
-+"\
-++--------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------
-+cba
-+" \
-+	"---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+--------------+\nabc\n" \
-+	""
-+
-+exit $FAILCOUNT
-diff --git a/util-linux/rev.c b/util-linux/rev.c
-index d439b4da8..63b005c67 100644
---- a/util-linux/rev.c
-+++ b/util-linux/rev.c
-@@ -109,6 +109,7 @@ int rev_main(int argc UNUSED_PARAM, char **argv)
- 			strrev(buf, strlen(buf));
- #endif
- 			fputs_stdout(buf);
-+			pos = 0;
- 		}
- 		fclose(fp);
- 	} while (*argv);
--- 
-cgit v1.2.3
-
diff --git a/aports/busybox/0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch b/aports/busybox/0002-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
index 47f9f9a..040db3b 100644
--- a/aports/busybox/0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
+++ b/aports/busybox/0002-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
@@ -1,15 +1,18 @@
-From eceebc4fbf064ca04d0f0a639c8a7c600190170f Mon Sep 17 00:00:00 2001
+From b99ef11a68832b2141926c229dd25ea600107ed1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sun, 13 Jan 2019 19:07:16 +0100
 Subject: [PATCH] adduser: default to /sbin/nologin as shell for system
  accounts
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 ---
  loginutils/adduser.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/loginutils/adduser.c b/loginutils/adduser.c
-index b2b5be5b3..9326a9795 100644
+index d3c795afa..7ce29fa04 100644
 --- a/loginutils/adduser.c
 +++ b/loginutils/adduser.c
 @@ -235,7 +235,7 @@ int adduser_main(int argc UNUSED_PARAM, char **argv)
diff --git a/aports/busybox/0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch b/aports/busybox/0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch
deleted file mode 100644
index 9febb66..0000000
--- a/aports/busybox/0002-cpio-add-support-for-renumber-inodes-like-GNU-cpio.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 67240ede641cdda29ef74a373bc9f5aa8a18f4e8 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Mon, 28 Jun 2021 08:23:09 -0600
-Subject: [PATCH 2/2] cpio: add support for --renumber-inodes like GNU cpio
-
-The --renumber-inodes option renumbers the inodes starting from 1,
-so that the sequence of inodes is always stable.  This helps with
-reproducibility.
-
-function                                             old     new   delta
-cpio_o                                               961    1045     +84
-.rodata                                            78422   78440     +18
-bbconfig_config_bz2                                 6168    6164      -4
-packed_usage                                       25764   25756      -8
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 2/2 up/down: 102/-12)            Total: 90 bytes
-
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
----
- archival/cpio.c | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/archival/cpio.c b/archival/cpio.c
-index 4d386d38d..14f0b5b84 100644
---- a/archival/cpio.c
-+++ b/archival/cpio.c
-@@ -45,6 +45,13 @@
- //config:	depends on FEATURE_CPIO_O && LONG_OPTS
- //config:	help
- //config:	Optionally ignore device numbers when creating archives.
-+//config:
-+//config:config FEATURE_CPIO_RENUMBER_INODES
-+//config:	bool "Support --renumber-inodes like GNU cpio"
-+//config:	default y
-+//config:	depends on FEATURE_CPIO_O && LONG_OPTS
-+//config:	help
-+//config:	Optionally renumber inodes when creating archives.
- 
- //applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
- 
-@@ -85,6 +92,9 @@
- //usage:	IF_FEATURE_CPIO_IGNORE_DEVNO(
- //usage:     "\n	--ignore-devno"
- //usage:	)
-+//usage:	IF_FEATURE_CPIO_RENUMBER_INODES(
-+//usage:     "\n	--renumber-inodes"
-+//usage:	)
- 
- /* GNU cpio 2.9 --help (abridged):
- 
-@@ -173,18 +183,21 @@ enum {
- 	IF_LONG_OPTS(     OPTBIT_QUIET      ,)
- 	IF_LONG_OPTS(     OPTBIT_2STDOUT    ,)
- 	IF_FEATURE_CPIO_IGNORE_DEVNO(OPTBIT_IGNORE_DEVNO,)
-+	IF_FEATURE_CPIO_RENUMBER_INODES(OPTBIT_RENUMBER_INODES,)
- 	OPT_CREATE             = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE     )) + 0,
- 	OPT_FORMAT             = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT     )) + 0,
- 	OPT_PASSTHROUGH        = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
- 	OPT_QUIET              = IF_LONG_OPTS(     (1 << OPTBIT_QUIET      )) + 0,
- 	OPT_2STDOUT            = IF_LONG_OPTS(     (1 << OPTBIT_2STDOUT    )) + 0,
- 	OPT_IGNORE_DEVNO       = IF_FEATURE_CPIO_IGNORE_DEVNO((1 << OPTBIT_IGNORE_DEVNO)) + 0,
-+	OPT_RENUMBER_INODES    = IF_FEATURE_CPIO_RENUMBER_INODES((1 << OPTBIT_RENUMBER_INODES)) + 0,
- };
- 
- #define OPTION_STR "it0uvdmLF:R:"
- 
- struct globals {
- 	struct bb_uidgid_t owner_ugid;
-+	ino_t next_inode;
- } FIX_ALIASING;
- #define G (*(struct globals*)bb_common_bufsiz1)
- void BUG_cpio_globals_too_big(void);
-@@ -218,6 +231,9 @@ static NOINLINE int cpio_o(void)
- 		struct inodes_s *next;
- 		struct name_s *names;
- 		struct stat st;
-+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
-+		ino_t mapped_inode;
-+#endif
- 	};
- 
- 	struct inodes_s *links = NULL;
-@@ -272,6 +288,10 @@ static NOINLINE int cpio_o(void)
- 						l = xzalloc(sizeof(*l));
- 						l->st = st;
- 						l->next = links;
-+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
-+						if (option_mask32 & OPT_RENUMBER_INODES)
-+							l->mapped_inode = ++G.next_inode;
-+#endif
- 						links = l;
- 						break;
- 					}
-@@ -290,6 +310,11 @@ static NOINLINE int cpio_o(void)
- 				free(line);
- 				continue;
- 			}
-+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
-+			else if (option_mask32 & OPT_RENUMBER_INODES) {
-+				st.st_ino = ++G.next_inode;
-+			}
-+#endif
- 		} else { /* line == NULL: EOF */
-  next_link:
- 			if (links) {
-@@ -297,6 +322,10 @@ static NOINLINE int cpio_o(void)
- 				st = links->st;
- 				name = links->names->name;
- 				links->names = links->names->next;
-+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
-+				if (links->mapped_inode)
-+					st.st_ino = links->mapped_inode;
-+#endif
- 				/* GNU cpio is reported to emit file data
- 				 * only for the last instance. Mimic that. */
- 				if (links->names == NULL)
-@@ -398,6 +427,9 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
- 		"to-stdout\0"    No_argument       "\xfe"
- #if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
- 		"ignore-devno\0" No_argument	   "\xfd"
-+#endif
-+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
-+		"renumber-inodes\0" No_argument    "\xfc"
- #endif
- 		;
- #endif
--- 
-2.32.0
-
diff --git a/aports/busybox/0001-ash-add-built-in-BB_ASH_VERSION-variable.patch b/aports/busybox/0003-ash-add-built-in-BB_ASH_VERSION-variable.patch
index d8f5ea0..1803194 100644
--- a/aports/busybox/0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
+++ b/aports/busybox/0003-ash-add-built-in-BB_ASH_VERSION-variable.patch
@@ -1,7 +1,10 @@
-From df5fffa062ebc46bd13d65c84a4abca6ae1c614d Mon Sep 17 00:00:00 2001
+From 53b13dbc8312dfa4326751f063437894c5e5a43d Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Wed, 10 Mar 2021 23:38:57 -0700
 Subject: [PATCH] ash: add built-in $BB_ASH_VERSION variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 This is helpful for detecting if the shell is busybox ash or not,
 which is necessary for enabling ash-specific features in /etc/profile
@@ -23,10 +26,10 @@ Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
  1 file changed, 20 insertions(+), 8 deletions(-)
 
 diff --git a/shell/ash.c b/shell/ash.c
-index 827643808..5f8f41ee9 100644
+index 18ccc1329..cb38582fc 100644
 --- a/shell/ash.c
 +++ b/shell/ash.c
-@@ -153,6 +153,14 @@
+@@ -158,6 +158,14 @@
  //config:	you to run the specified command or builtin,
  //config:	even when there is a function with the same name.
  //config:
@@ -41,7 +44,7 @@ index 827643808..5f8f41ee9 100644
  //config:endif # ash options
  
  //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
-@@ -2138,6 +2146,9 @@ static const struct {
+@@ -2142,6 +2150,9 @@ static const struct {
  	{ VSTRFIXED|VTEXTFIXED       , "PS1=$ "    , NULL            },
  	{ VSTRFIXED|VTEXTFIXED       , "PS2=> "    , NULL            },
  	{ VSTRFIXED|VTEXTFIXED       , "PS4=+ "    , NULL            },
@@ -51,7 +54,7 @@ index 827643808..5f8f41ee9 100644
  #if ENABLE_ASH_GETOPTS
  	{ VSTRFIXED|VTEXTFIXED       , defoptindvar, getoptsreset    },
  #endif
-@@ -2197,19 +2208,20 @@ extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var;
+@@ -2201,19 +2212,20 @@ extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var;
  #define vps1      varinit[VAR_OFFSET1 + 2]
  #define vps2      varinit[VAR_OFFSET1 + 3]
  #define vps4      varinit[VAR_OFFSET1 + 4]
diff --git a/aports/busybox/0001-avoid-redefined-warnings-when-building-with-utmps.patch b/aports/busybox/0004-Avoid-redefined-warnings-when-buiding-with-utmps.patch
index 1ce06f8..b0f2b45 100644
--- a/aports/busybox/0001-avoid-redefined-warnings-when-building-with-utmps.patch
+++ b/aports/busybox/0004-Avoid-redefined-warnings-when-buiding-with-utmps.patch
@@ -1,19 +1,23 @@
-From 711de34e8fa42bd9ec704cc922db937edada84d8 Mon Sep 17 00:00:00 2001
+From a7f1a174c2f5fd4ee7e130e08dfc79abc65e8a5e Mon Sep 17 00:00:00 2001
 From: Laurent Bercot <ska-devel@skarnet.org>
-Date: Fri, 22 Jul 2022 01:35:14 +0200
+Date: Fri, 22 Jul 2022 08:34:50 +0200
 Subject: [PATCH] Avoid redefined warnings when buiding with utmps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Do not use _PATH_UTMP or _PATH_WTMP, and do not touch
 the files directly.
+
 ---
- include/libbb.h         | 8 +++-----
- libbb/messages.c        | 4 ++--
- libbb/utmp.c            | 8 ++++----
- util-linux/last_fancy.c | 2 +-
- 4 files changed, 10 insertions(+), 12 deletions(-)
+ include/libbb.h         |  8 +++-----
+ libbb/messages.c        |  4 ++--
+ libbb/utmp.c            | 10 ++++++----
+ util-linux/last_fancy.c |  2 +-
+ 4 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/include/libbb.h b/include/libbb.h
-index abbc9ac59..405108b17 100644
+index cca33a177..2b72e7ac4 100644
 --- a/include/libbb.h
 +++ b/include/libbb.h
 @@ -107,14 +107,12 @@
@@ -50,10 +54,24 @@ index 6914d5701..689dd0c6d 100644
  	WTMP_FILE;
  # else
 diff --git a/libbb/utmp.c b/libbb/utmp.c
-index bd07670db..463ee1317 100644
+index bd07670db..0a2ef2c8e 100644
 --- a/libbb/utmp.c
 +++ b/libbb/utmp.c
-@@ -45,8 +45,8 @@ void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, con
+@@ -8,11 +8,13 @@
+  */
+ #include "libbb.h"
+ 
++#if 0
+ static void touch(const char *filename)
+ {
+ 	if (access(filename, R_OK | W_OK) == -1)
+ 		close(open(filename, O_WRONLY | O_CREAT, 0664));
+ }
++#endif
+ 
+ void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, const char *username, const char *hostname)
+ {
+@@ -45,8 +47,8 @@ void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, con
  		tty_name += 3;
  	strncpy(id, tty_name, width);
  
@@ -64,7 +82,7 @@ index bd07670db..463ee1317 100644
  	setutxent();
  	/* Append new one (hopefully, unless we collide on ut_id) */
  	pututxline(&utent);
-@@ -67,8 +67,8 @@ void FAST_FUNC update_utmp(pid_t pid, int new_type, const char *tty_name, const
+@@ -67,8 +69,8 @@ void FAST_FUNC update_utmp(pid_t pid, int new_type, const char *tty_name, const
  	struct utmpx utent;
  	struct utmpx *utp;
  
@@ -88,6 +106,3 @@ index 648236229..aa7a62bbe 100644
  	llist_t *zlist;
  	off_t pos;
  	time_t start_time;
--- 
-2.37.1
-
diff --git a/aports/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/aports/busybox/0005-libbb-sockaddr2str-ensure-only-printable-characters-.patch
index 1d1716e..95616c7 100644
--- a/aports/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch
+++ b/aports/busybox/0005-libbb-sockaddr2str-ensure-only-printable-characters-.patch
@@ -1,8 +1,11 @@
-From 0c8da1bead8ffaf270b4b723ead2c517371405d7 Mon Sep 17 00:00:00 2001
+From 6a678ab440ec8c0d21843569182eeb452c289a58 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Sun, 3 Apr 2022 12:14:33 +0000
-Subject: [PATCH 1/2] libbb: sockaddr2str: ensure only printable characters are
+Date: Sun, 3 Apr 2022 18:13:37 +0000
+Subject: [PATCH] libbb: sockaddr2str: ensure only printable characters are
  returned for the hostname part
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 CVE: Pending
 Upstream-Status: Pending
@@ -35,6 +38,3 @@ index 0e0b247b8..02c061e67 100644
  	/*return xstrdup(host);*/
  }
  
--- 
-2.35.1
-
diff --git a/aports/busybox/0001-modinfo-add-k-option-for-kernel-version.patch b/aports/busybox/0006-modinfo-add-k-option-for-kernel-version.patch
index f1bf02f..51144d4 100644
--- a/aports/busybox/0001-modinfo-add-k-option-for-kernel-version.patch
+++ b/aports/busybox/0006-modinfo-add-k-option-for-kernel-version.patch
@@ -1,7 +1,10 @@
-From 8fed81a74070cb42e1dff1a8c2382bd123385e22 Mon Sep 17 00:00:00 2001
+From 592cc544acebfb1179bf91083870a235f72f2f64 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 28 Apr 2022 16:03:16 +0200
+Date: Thu, 28 Apr 2022 23:04:01 +0200
 Subject: [PATCH] modinfo: add -k option for kernel version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 It is useful to be able to specify kernel version when generating
 initramfs and similar for a kernel version that might not be the running
@@ -135,6 +138,3 @@ index 0a86c3296..53bc02880 100644
  		}
  	}
  
--- 
-2.36.0
-
diff --git a/aports/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch b/aports/busybox/0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
index 0cc4db9..5fbcacc 100644
--- a/aports/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
+++ b/aports/busybox/0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
@@ -1,19 +1,23 @@
-From fa5c4b2e60a98944863097b448960d0744916b1f Mon Sep 17 00:00:00 2001
+From 9d796b508575b2e1673512d4103e6049af189bc6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 13 Feb 2019 22:32:44 +0100
+Date: Wed, 13 Feb 2019 18:41:43 +0100
 Subject: [PATCH] nologin: Install applet to /sbin instead of /usr/sbin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 This is required to retain compatibility with our old custom nologin
 applet written in C which was also installed to /sbin.
 
 Compatibility with the old path is required because login shell paths
 are hardcoded in /etc/passwd.
+
 ---
  util-linux/nologin.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/util-linux/nologin.c b/util-linux/nologin.c
-index 5e5e42305..b03470ac6 100644
+index 5a8b047a5..d3b6fe77e 100644
 --- a/util-linux/nologin.c
 +++ b/util-linux/nologin.c
 @@ -19,7 +19,7 @@
diff --git a/aports/busybox/0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch b/aports/busybox/0008-pgrep-add-support-for-matching-against-UID-and-RUID.patch
index 7abfb09..1655042 100644
--- a/aports/busybox/0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch
+++ b/aports/busybox/0008-pgrep-add-support-for-matching-against-UID-and-RUID.patch
@@ -1,7 +1,10 @@
-From 648255c510f9a3f668651842b58798f07ad4c64a Mon Sep 17 00:00:00 2001
+From 513d186f420176c3a1be8843fee6a42cbd57cb35 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Mon, 22 Nov 2021 18:33:02 -0600
+Date: Mon, 22 Nov 2021 11:06:05 -0600
 Subject: [PATCH] pgrep: add support for matching against UID and RUID
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 This is standard functionality on every other pgrep implementation I
 found, namely the ones in Illumos, FreeBSD, Linux procps, and macOS.
@@ -22,7 +25,7 @@ Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
  1 file changed, 33 insertions(+), 4 deletions(-)
 
 diff --git a/procps/pgrep.c b/procps/pgrep.c
-index 6d25c247e..6a12ac23b 100644
+index 82e00322f..c1f7208f5 100644
 --- a/procps/pgrep.c
 +++ b/procps/pgrep.c
 @@ -42,6 +42,8 @@
@@ -33,36 +36,36 @@ index 6d25c247e..6a12ac23b 100644
 +//usage:     "\n	-U UID  Match against UID"
  //usage:
  //usage:#define pkill_trivial_usage
- //usage:       "[-l|-SIGNAL] [-xfvno] [-s SID|-P PPID|PATTERN]"
-@@ -55,6 +57,8 @@
- //usage:     "\n	-v	Negate the match"
+ //usage:       "[-l|-SIGNAL] [-xfvnoe] [-s SID|-P PPID|PATTERN]"
+@@ -56,6 +58,8 @@
  //usage:     "\n	-n	Signal the newest process only"
  //usage:     "\n	-o	Signal the oldest process only"
+ //usage:     "\n	-e	Display name and PID of the process being killed"
 +//usage:     "\n	-u EUID Match against effective UID"
 +//usage:     "\n	-U UID  Match against UID"
  
  #include "libbb.h"
  #include "xregex.h"
-@@ -64,7 +68,7 @@
+@@ -65,7 +69,7 @@
  #define pkill (ENABLE_PKILL && (!ENABLE_PGREP || applet_name[1] == 'k'))
  
  enum {
--	/* "vlafxons:+P:+" */
-+	/* "vlafxonu:U:s:+P:+" */
+-	/* "vlafxones:+P:+" */
++	/* "vlafxoneu:U:s:+P:+" */
  	OPTBIT_V = 0, /* must be first, we need OPT_INVERT = 0/1 */
  	OPTBIT_L,
  	OPTBIT_A,
-@@ -72,6 +76,8 @@ enum {
- 	OPTBIT_X,
+@@ -74,6 +78,8 @@ enum {
  	OPTBIT_O,
  	OPTBIT_N,
+ 	OPTBIT_E, /* should be pkill-only, do we care? */
 +	OPTBIT_U,
 +	OPTBIT_UL,
  	OPTBIT_S,
  	OPTBIT_P,
  };
-@@ -85,6 +91,8 @@ enum {
- #define OPT_LAST	(opt & (1 << OPTBIT_N))
+@@ -88,6 +94,8 @@ enum {
+ #define OPT_ECHO	(opt & (1 << OPTBIT_E))
  #define OPT_SID		(opt & (1 << OPTBIT_S))
  #define OPT_PPID	(opt & (1 << OPTBIT_P))
 +#define OPT_EUID	(opt & (1 << OPTBIT_UL))
@@ -70,7 +73,7 @@ index 6d25c247e..6a12ac23b 100644
  
  static void act(unsigned pid, char *cmd, int signo)
  {
-@@ -105,7 +113,8 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+@@ -112,7 +120,8 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
  	unsigned opt;
  	int scan_mask;
  	int matched_pid;
@@ -80,18 +83,18 @@ index 6d25c247e..6a12ac23b 100644
  	char *cmd_last;
  	procps_status_t *proc;
  	/* These are initialized to 0 */
-@@ -131,7 +140,9 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+@@ -138,7 +147,9 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
  	/* Parse remaining options */
  	ppid2match = -1;
  	sid2match = -1;
--	opt = getopt32(argv, "vlafxons:+P:+", &sid2match, &ppid2match);
+-	opt = getopt32(argv, "vlafxones:+P:+", &sid2match, &ppid2match);
 +	uid2match = -1;
 +	euid2match = -1;
-+	opt = getopt32(argv, "vlafxonu:U:s:+P:+", &euid_arg, &uid_arg, &sid2match, &ppid2match);
++	opt = getopt32(argv, "vlafxoneu:U:s:+P:+", &euid_arg, &uid_arg, &sid2match, &ppid2match);
  	argv += optind;
  
  	if (pkill && OPT_LIST) { /* -l: print the whole signal list */
-@@ -147,8 +158,18 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+@@ -154,8 +165,18 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
  	if (OPT_FULL)
  		scan_mask |= PSSCAN_ARGVN;
  
@@ -111,7 +114,7 @@ index 6d25c247e..6a12ac23b 100644
  		bb_show_usage();
  
  	if (argv[0])
-@@ -170,6 +191,10 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+@@ -177,6 +198,10 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
  				continue;
  			if (sid2match >= 0 && sid2match != proc->sid)
  				continue;
@@ -122,7 +125,7 @@ index 6d25c247e..6a12ac23b 100644
  		}
  
  		cmdlen = -1;
-@@ -202,6 +227,10 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+@@ -209,6 +234,10 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
  				goto got_it;
  			if (sid2match >= 0 && sid2match != proc->sid)
  				goto got_it;
@@ -133,6 +136,3 @@ index 6d25c247e..6a12ac23b 100644
  		}
  
  		match = !argv[0]; /* if no PATTERN, then it's a match, else... */
--- 
-2.34.0
-
diff --git a/aports/busybox/0001-properly-fix-wget-https-support.patch b/aports/busybox/0009-properly-fix-wget-https-support.patch
index 7e59be7..9feff7c 100644
--- a/aports/busybox/0001-properly-fix-wget-https-support.patch
+++ b/aports/busybox/0009-properly-fix-wget-https-support.patch
@@ -1,7 +1,10 @@
-From ad8843a3df89aabfa6ebae841de32f22a48c2166 Mon Sep 17 00:00:00 2001
+From a93754ca66630221d10d1307b9cd165bed63d68e Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 30 May 2018 09:52:20 +0000
+Date: Wed, 30 May 2018 09:40:33 +0000
 Subject: [PATCH] properly fix wget https support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 See: https://git.alpinelinux.org/cgit/aports/commit/?id=1d0560a9b6b5597b191e5aff69a31c2fe0aba273
 ---
@@ -9,7 +12,7 @@ See: https://git.alpinelinux.org/cgit/aports/commit/?id=1d0560a9b6b5597b191e5aff
  1 file changed, 12 insertions(+), 9 deletions(-)
 
 diff --git a/networking/wget.c b/networking/wget.c
-index 6a9604421..96dd4c403 100644
+index 9ec0e67b9..66959058c 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -57,7 +57,6 @@
@@ -20,7 +23,7 @@ index 6a9604421..96dd4c403 100644
  //config:	help
  //config:	wget will use internal TLS code to connect to https:// URLs.
  //config:	It also enables FTPS support, but it's not well tested yet.
-@@ -760,10 +759,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+@@ -772,10 +771,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
  	int pid;
  	char *servername, *p;
  
@@ -33,7 +36,7 @@ index 6a9604421..96dd4c403 100644
  
  	servername = xstrdup(host);
  	p = strrchr(servername, ':');
-@@ -780,14 +777,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+@@ -792,14 +789,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
  		close(sp[0]);
  		xmove_fd(sp[1], 0);
  		xdup2(0, 1);
@@ -50,7 +53,7 @@ index 6a9604421..96dd4c403 100644
  
  			xmove_fd(network_fd, 3);
  			argv[0] = (char*)"ssl_client";
-@@ -795,8 +792,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+@@ -807,8 +804,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
  			//TODO: if (!is_ip_address(servername))...
  			argv[2] = (char*)"-n";
  			argv[3] = servername;
diff --git a/aports/busybox/0001-sed-check-errors-writing-file-with-sed-i.patch b/aports/busybox/0010-sed-check-errors-writing-file-with-sed-i.patch
index 90a5115..f1cc0a8 100644
--- a/aports/busybox/0001-sed-check-errors-writing-file-with-sed-i.patch
+++ b/aports/busybox/0010-sed-check-errors-writing-file-with-sed-i.patch
@@ -1,7 +1,10 @@
-From b99395ebf70eadb248da0ecf913eea0236eceea1 Mon Sep 17 00:00:00 2001
+From 97e305025e987e77da488133ded31c1e81a0282b Mon Sep 17 00:00:00 2001
 From: Dominique Martinet <dominique.martinet@atmark-techno.com>
-Date: Wed, 16 Nov 2022 11:52:29 +0900
+Date: Wed, 16 Nov 2022 07:08:13 +0900
 Subject: [PATCH] sed: check errors writing file with sed -i
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 sed would currently not error if write failed when modifying a file.
 
@@ -39,17 +42,14 @@ sed_main                                             754     801     +47
 
 Signed-off-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
 ---
-Upstream patch:
-http://lists.busybox.net/pipermail/busybox/2022-November/089967.html
-
  editors/sed.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/editors/sed.c b/editors/sed.c
-index 32a4b61f6d4c..be709eef3a9c 100644
+index 00dde60be..6179c5e80 100644
 --- a/editors/sed.c
 +++ b/editors/sed.c
-@@ -1639,6 +1639,11 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
+@@ -1648,6 +1648,11 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
  			fchown(nonstdoutfd, statbuf.st_uid, statbuf.st_gid);
  
  			process_files();
@@ -61,6 +61,3 @@ index 32a4b61f6d4c..be709eef3a9c 100644
  			fclose(G.nonstdout);
  			G.nonstdout = stdout;
  
--- 
-2.35.1
-
diff --git a/aports/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch b/aports/busybox/0011-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
index fd2503e..fe1a003 100644
--- a/aports/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
+++ b/aports/busybox/0011-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
@@ -1,14 +1,17 @@
-From 2e673aac06d661038001286fd389d1b45c511c66 Mon Sep 17 00:00:00 2001
+From df153459261ed2683ebb7ab766eaee6b741426ae Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 28 Nov 2017 13:23:17 +0100
+Date: Tue, 28 Nov 2017 16:30:23 +0100
 Subject: [PATCH] fsck: resolve LABEL=.../UUID=... spec to device
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 ---
  e2fsprogs/fsck.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
-index f5aa3dbe4..e2edc9747 100644
+index 028f8a803..7a0921979 100644
 --- a/e2fsprogs/fsck.c
 +++ b/e2fsprogs/fsck.c
 @@ -60,6 +60,7 @@
diff --git a/aports/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch b/aports/busybox/0012-nslookup-sanitize-all-printed-strings-with-printable.patch
index 01c45c9..63d72fe 100644
--- a/aports/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch
+++ b/aports/busybox/0012-nslookup-sanitize-all-printed-strings-with-printable.patch
@@ -1,8 +1,10 @@
-From 812b407e545b70b16cf32aade135b5c32eaf674f Mon Sep 17 00:00:00 2001
+From 2365aa9b62dd703cd279b94ede25ebb274cfe723 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Sun, 3 Apr 2022 12:16:45 +0000
-Subject: [PATCH 2/2] nslookup: sanitize all printed strings with
- printable_string
+Date: Sun, 3 Apr 2022 20:44:51 +0000
+Subject: [PATCH] nslookup: sanitize all printed strings with printable_string
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Otherwise, terminal sequences can be injected, which enables various terminal injection
 attacks from DNS results.
@@ -63,6 +65,3 @@ index 6da97baf4..4bdcde1b8 100644
  			cp += n;
  
  			printf("\tserial = %lu\n", ns_get32(cp));
--- 
-2.35.1
-
diff --git a/aports/busybox/0003-ash-exec-busybox.static.patch b/aports/busybox/0013-ash-exec-busybox.static.patch
index 8247e35..0458530 100644
--- a/aports/busybox/0003-ash-exec-busybox.static.patch
+++ b/aports/busybox/0013-ash-exec-busybox.static.patch
@@ -1,17 +1,20 @@
-From d06a13f4cd81aeda9b02d4da90ef2b941899d6c5 Mon Sep 17 00:00:00 2001
+From 69002bff6372fa6f7463271face3b3ead13aee4f Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 4 Aug 2016 11:03:07 +0200
+Date: Thu, 4 Aug 2016 02:09:48 +0200
 Subject: [PATCH] ash: exec busybox.static
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 ---
  shell/ash.c | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/shell/ash.c b/shell/ash.c
-index 051cc671f..73470eab2 100644
+index cb38582fc..55ee4f56a 100644
 --- a/shell/ash.c
 +++ b/shell/ash.c
-@@ -7991,6 +7991,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c
+@@ -8278,6 +8278,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c
  		}
  		/* re-exec ourselves with the new arguments */
  		execve(bb_busybox_exec_path, argv, envp);
diff --git a/aports/busybox/0013-ash-fix-unsafe-use-of-mempcpy.patch b/aports/busybox/0013-ash-fix-unsafe-use-of-mempcpy.patch
deleted file mode 100644
index 944fd38..0000000
--- a/aports/busybox/0013-ash-fix-unsafe-use-of-mempcpy.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7750b5a25a8cf9081b7c248687c876d0068e85bb Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Tue, 1 Mar 2022 09:56:54 +0100
-Subject: [PATCH] ash: fix unsafe use of mempcpy
-
-function                                             old     new   delta
-subevalvar                                          1549    1557      +8
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- shell/ash.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/shell/ash.c b/shell/ash.c
-index 54335c5dd..44ec2eafd 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -7191,7 +7191,13 @@ subevalvar(char *start, char *str, int strloc,
- 			len = orig_len - pos;
- 
- 		if (!quotes) {
--			loc = mempcpy(startp, startp + pos, len);
-+			/* want: loc = mempcpy(startp, startp + pos, len)
-+			 * but it does not allow overlapping arguments */
-+			loc = startp;
-+			while (--len >= 0) {
-+				*loc = loc[pos];
-+				loc++;
-+			}
- 		} else {
- 			for (vstr = startp; pos != 0; pos--) {
- 				if ((unsigned char)*vstr == CTLESC)
diff --git a/aports/busybox/0004-app-location-for-cpio-vi-and-lspci.patch b/aports/busybox/0014-app-location-for-cpio-vi-and-lspci.patch
index 2ca4bcd..768462f 100644
--- a/aports/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
+++ b/aports/busybox/0014-app-location-for-cpio-vi-and-lspci.patch
@@ -1,9 +1,13 @@
-From 97d4a0ffc6f58813fd91e5728d474b984f29b9a6 Mon Sep 17 00:00:00 2001
+From 42739bd6e55d90a9435ba76ea4bf7fbd49a68862 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 27 Dec 2016 20:46:59 +0100
+Date: Tue, 27 Dec 2016 19:38:39 +0100
 Subject: [PATCH] app location for cpio, vi and lspci
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Adjust location to where alpine linux installs them
+
 ---
  archival/cpio.c    | 2 +-
  editors/vi.c       | 2 +-
@@ -24,7 +28,7 @@ index 7149782d7..ee80efd9f 100644
  //kbuild:lib-$(CONFIG_CPIO) += cpio.o
  
 diff --git a/editors/vi.c b/editors/vi.c
-index 3dbe5b471..b29c16098 100644
+index 2645afe87..70c594353 100644
 --- a/editors/vi.c
 +++ b/editors/vi.c
 @@ -176,7 +176,7 @@
diff --git a/aports/busybox/0014-ash-fix-use-after-free-in-bash-pattern-substitution.patch b/aports/busybox/0014-ash-fix-use-after-free-in-bash-pattern-substitution.patch
deleted file mode 100644
index 6ff2b82..0000000
--- a/aports/busybox/0014-ash-fix-use-after-free-in-bash-pattern-substitution.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 103728181bfd9a60537166d036e5baca7b67cc1f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren@soeren-tempel.net>
-Date: Sat, 29 Jan 2022 06:11:12 +0100
-Subject: [PATCH] ash: fix use-after-free in bash pattern substitution
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-At Alpine Linux downstream, we were made aware of a segmentation fault
-occurring during string replacement in BusyBox ash [0]. Further
-debugging revealed that the segmentation fault occurs due to a
-use-after-free in BusyBox's bash pattern substitution implementation.
-Specially, the problem is that the repl variable (pointing to the
-replacement string) points to a value in the stack string. However, when
-accessing the repl pointer in Line 7350 it is possible that the stack
-has been moved since the last repl assignment due to the STPUTC
-invocations in Line 7317 and 7321 (since STPUTC may grow the stack via
-realloc(3)).
-
-For this reason, the code in Line 7350 may access an unmapped memory
-region and therefore causes a segmentation fault if prior STPUTC
-invocations moved the stack via realloc(3). The valgrind output
-for this edge case looks as follows:
-
-	Invalid read of size 1
-	   at 0x15D8DD: subevalvar (ash.c:7350)
-	   by 0x15DC43: evalvar (ash.c:7666)
-	   by 0x15B717: argstr (ash.c:6893)
-	   by 0x15BAEC: expandarg (ash.c:8090)
-	   by 0x15F4CC: evalcommand (ash.c:10429)
-	   by 0x15B26C: evaltree (ash.c:9365)
-	   by 0x15E4FC: cmdloop (ash.c:13569)
-	   by 0x15FD8B: ash_main (ash.c:14748)
-	   by 0x115BF2: run_applet_no_and_exit (appletlib.c:967)
-	   by 0x115F16: run_applet_and_exit (appletlib.c:986)
-	   by 0x115EF9: busybox_main (appletlib.c:917)
-	   by 0x115EF9: run_applet_and_exit (appletlib.c:979)
-	   by 0x115F8F: main (appletlib.c:1126)
-	 Address 0x48b8646 is 2,054 bytes inside a block of size 4,776 free'd
-	   at 0x48A6FC9: realloc (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so)
-	   by 0x116E86: xrealloc (xfuncs_printf.c:61)
-	   by 0x1565DB: growstackblock (ash.c:1736)
-	   by 0x156EF7: growstackstr (ash.c:1775)
-	   by 0x156F1A: _STPUTC (ash.c:1816)
-	   by 0x15D843: subevalvar (ash.c:7317)
-	   by 0x15DC43: evalvar (ash.c:7666)
-	   by 0x15B717: argstr (ash.c:6893)
-	   by 0x15BAEC: expandarg (ash.c:8090)
-	   by 0x15F4CC: evalcommand (ash.c:10429)
-	   by 0x15B26C: evaltree (ash.c:9365)
-	   by 0x15E4FC: cmdloop (ash.c:13569)
-
-A testcase for reproducing this edge case is provided in the downstream
-bug report [1]. This commit fixes the issue by reconstructing the repl
-pointer relative to stackblock() via strloc and slash_pos.
-
-[0]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13469
-[1]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13469#note_210530
-
-Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
----
- shell/ash.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/shell/ash.c b/shell/ash.c
-index 55df54bd0..24f9a8270 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -7346,6 +7346,12 @@ subevalvar(char *start, char *str, int strloc,
- 				idx = loc;
- 			}
- 
-+			// The STPUTC invocations above may resize and move the
-+			// stack via realloc(3). Since repl is a pointer into the
-+			// stack, we need to reconstruct it relative to stackblock().
-+			if (slash_pos >= 0)
-+				repl = (char *)stackblock() + strloc + slash_pos + 1;
-+
- 			//bb_error_msg("repl:'%s'", repl);
- 			for (loc = (char*)repl; *loc; loc++) {
- 				char *restart_detect = stackblock();
diff --git a/aports/busybox/0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch b/aports/busybox/0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch
deleted file mode 100644
index 5697a55..0000000
--- a/aports/busybox/0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 65bb493f2475368161431ed72816fd0c61e479b1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Tue, 8 Feb 2022 09:29:21 +0100
-Subject: [PATCH] ed: don't use memcpy with overlapping memory regions
-
-The memcpy invocations in the subCommand function, modified by this
-commit, previously used memcpy with overlapping memory regions. This is
-undefined behavior. On Alpine Linux, it causes BusyBox ed to crash since
-we compile BusyBox with -D_FORTIFY_SOURCE=2 and our fortify-headers
-implementation catches this source of undefined behavior [0]. The issue
-can only be triggered if the replacement string is the same size or
-shorter than the old string.
-
-Looking at the code, it seems to me that a memmove(3) is what was
-actually intended here, this commit modifies the code accordingly.
-
-[0]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13504
----
- editors/ed.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/editors/ed.c b/editors/ed.c
-index 209ce9942..4a84f7433 100644
---- a/editors/ed.c
-+++ b/editors/ed.c
-@@ -720,7 +720,7 @@ static void subCommand(const char *cmd, int num1, int num2)
- 		if (deltaLen <= 0) {
- 			memcpy(&lp->data[offset], newStr, newLen);
- 			if (deltaLen) {
--				memcpy(&lp->data[offset + newLen],
-+				memmove(&lp->data[offset + newLen],
- 					&lp->data[offset + oldLen],
- 					lp->len - offset - oldLen);
- 
diff --git a/aports/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch b/aports/busybox/0015-udhcpc-set-default-discover-retries-to-5.patch
index ea15834..7dd08dd 100644
--- a/aports/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
+++ b/aports/busybox/0015-udhcpc-set-default-discover-retries-to-5.patch
@@ -1,20 +1,24 @@
-From 7f626404022bb69cd314e2eea33a721d75cc933d Mon Sep 17 00:00:00 2001
+From 050863f09d1ea42cedd8935580cf570032fed339 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 4 Aug 2016 12:46:55 +0200
+Date: Thu, 4 Aug 2016 13:17:00 +0200
 Subject: [PATCH] udhcpc: set default discover retries to 5
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Some slower nics needs more attempts to get a lease
+
 ---
  networking/udhcp/d6_dhcpc.c | 4 ++--
  networking/udhcp/dhcpc.c    | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
-index 8d11a7539..794441953 100644
+index cdd06188e..3d0ec98f9 100644
 --- a/networking/udhcp/d6_dhcpc.c
 +++ b/networking/udhcp/d6_dhcpc.c
-@@ -1135,7 +1135,7 @@ static void client_background(void)
- //usage:     "\n	-s PROG		Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+@@ -1137,7 +1137,7 @@ static void client_background(void)
+ //usage:     "\n	-s PROG		Run PROG at DHCP events (default "CONFIG_UDHCPC6_DEFAULT_SCRIPT")"
  //usage:     "\n	-B		Request broadcast replies"
  //usage:     "\n	-t N		Send up to N discover packets"
 -//usage:     "\n	-T SEC		Pause between packets (default 3)"
@@ -22,7 +26,7 @@ index 8d11a7539..794441953 100644
  //usage:     "\n	-A SEC		Wait if lease is not obtained (default 20)"
  //usage:	USE_FOR_MMU(
  //usage:     "\n	-b		Background if lease is not obtained"
-@@ -1180,7 +1180,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
+@@ -1182,7 +1182,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
  	llist_t *list_x = NULL;
  	int tryagain_timeout = 20;
  	int discover_timeout = 3;
@@ -32,7 +36,7 @@ index 8d11a7539..794441953 100644
  	struct in6_addr ipv6_buf;
  	struct in6_addr *requested_ipv6;
 diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index 331f13a8c..0c1b58d7c 100644
+index c757fb37c..424d6dade 100644
 --- a/networking/udhcp/dhcpc.c
 +++ b/networking/udhcp/dhcpc.c
 @@ -1173,7 +1173,7 @@ static void client_background(void)
diff --git a/aports/busybox/0016-ash-don-t-read-past-end-of-var-in-subvareval-for-bas.patch b/aports/busybox/0016-ash-don-t-read-past-end-of-var-in-subvareval-for-bas.patch
deleted file mode 100644
index 3527fa5..0000000
--- a/aports/busybox/0016-ash-don-t-read-past-end-of-var-in-subvareval-for-bas.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From fa52ac9781f479de8ab4d8526276244c0a0471f4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren@soeren-tempel.net>
-Date: Mon, 28 Feb 2022 08:36:50 +0100
-Subject: [PATCH] ash: don't read past end of var in subvareval for bash
- substitutions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Without this patch, BusyBox handles bash pattern substitutions without
-a terminating '/' character incorrectly.
-
-Consider the following shell script:
-
-	_bootstrapver=5.0.211-r0
-	_referencesdir="/usr/${_bootstrapver/-*}/Sources"
-	echo $_referencesdir
-
-This should output `/usr/5.0.211/Sources`. However, without this patch
-it instead outputs `/usr/5.0.211Sources`. This is due to the fact that
-BusyBox expects the bash pattern substitutions to always be terminated
-with a '/' (at least in this part of subvareval) and thus reads passed
-the substitution itself and consumes the '/' character which is part of
-the literal string. If there is no '/' after the substitution then
-BusyBox might perform an out-of-bounds read under certain circumstances.
-
-When replacing the bash pattern substitution with `${_bootstrapver/-*/}`,
-or with this patch applied, ash outputs the correct value.
-
-Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- shell/ash.c                                                | 4 ++++
- shell/ash_test/ash-vars/var_bash_repl_unterminated.right   | 1 +
- shell/ash_test/ash-vars/var_bash_repl_unterminated.tests   | 2 ++
- shell/hush_test/hush-vars/var_bash_repl_unterminated.right | 1 +
- shell/hush_test/hush-vars/var_bash_repl_unterminated.tests | 2 ++
- 5 files changed, 10 insertions(+)
- create mode 100644 shell/ash_test/ash-vars/var_bash_repl_unterminated.right
- create mode 100755 shell/ash_test/ash-vars/var_bash_repl_unterminated.tests
- create mode 100644 shell/hush_test/hush-vars/var_bash_repl_unterminated.right
- create mode 100755 shell/hush_test/hush-vars/var_bash_repl_unterminated.tests
-
-diff --git a/shell/ash.c b/shell/ash.c
-index adb0f223a..54335c5dd 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -7081,6 +7081,10 @@ subevalvar(char *start, char *str, int strloc,
- 				*repl = '\0';
- 				break;
- 			}
-+			if ((unsigned char)*repl == CTLENDVAR) { /* ${v/pattern} (no trailing /, no repl) */
-+				repl = NULL;
-+				break;
-+			}
- 			/* Handle escaped slashes, e.g. "${v/\//_}" (they are CTLESC'ed by this point) */
- 			if ((unsigned char)*repl == CTLESC && repl[1])
- 				repl++;
-diff --git a/shell/ash_test/ash-vars/var_bash_repl_unterminated.right b/shell/ash_test/ash-vars/var_bash_repl_unterminated.right
-new file mode 100644
-index 000000000..5bff3a6fa
---- /dev/null
-+++ b/shell/ash_test/ash-vars/var_bash_repl_unterminated.right
-@@ -0,0 +1 @@
-+b/d
-diff --git a/shell/ash_test/ash-vars/var_bash_repl_unterminated.tests b/shell/ash_test/ash-vars/var_bash_repl_unterminated.tests
-new file mode 100755
-index 000000000..c9513343d
---- /dev/null
-+++ b/shell/ash_test/ash-vars/var_bash_repl_unterminated.tests
-@@ -0,0 +1,2 @@
-+a=b-c
-+echo ${a/-*}/d
-diff --git a/shell/hush_test/hush-vars/var_bash_repl_unterminated.right b/shell/hush_test/hush-vars/var_bash_repl_unterminated.right
-new file mode 100644
-index 000000000..5bff3a6fa
---- /dev/null
-+++ b/shell/hush_test/hush-vars/var_bash_repl_unterminated.right
-@@ -0,0 +1 @@
-+b/d
-diff --git a/shell/hush_test/hush-vars/var_bash_repl_unterminated.tests b/shell/hush_test/hush-vars/var_bash_repl_unterminated.tests
-new file mode 100755
-index 000000000..c9513343d
---- /dev/null
-+++ b/shell/hush_test/hush-vars/var_bash_repl_unterminated.tests
-@@ -0,0 +1,2 @@
-+a=b-c
-+echo ${a/-*}/d
diff --git a/aports/busybox/0006-ping-make-ping-work-without-root-privileges.patch b/aports/busybox/0016-ping-make-ping-work-without-root-privileges.patch
index ed35229..661f046 100644
--- a/aports/busybox/0006-ping-make-ping-work-without-root-privileges.patch
+++ b/aports/busybox/0016-ping-make-ping-work-without-root-privileges.patch
@@ -1,17 +1,20 @@
-From 278c73292f2cfc1ecef2dac71efdc7201c021211 Mon Sep 17 00:00:00 2001
+From 19c6c34fb6318605e58a9b209cf742d559c0d467 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 29 Mar 2016 18:59:22 +0200
+Date: Tue, 29 Mar 2016 09:23:08 +0200
 Subject: [PATCH] ping: make ping work without root privileges
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 ---
  networking/ping.c | 115 +++++++++++++++++++++++++++++++++++++---------
  1 file changed, 94 insertions(+), 21 deletions(-)
 
 diff --git a/networking/ping.c b/networking/ping.c
-index c4a15e06e..a2dccb57f 100644
+index 9805695a1..5e4488abd 100644
 --- a/networking/ping.c
 +++ b/networking/ping.c
-@@ -170,6 +170,7 @@ enum {
+@@ -208,6 +208,7 @@ enum {
  	pingsock = 0,
  };
  
@@ -19,7 +22,7 @@ index c4a15e06e..a2dccb57f 100644
  static void
  #if ENABLE_PING6
  create_icmp_socket(len_and_sockaddr *lsa)
-@@ -186,9 +187,23 @@ create_icmp_socket(void)
+@@ -224,9 +225,23 @@ create_icmp_socket(void)
  #endif
  		sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */
  	if (sock < 0) {
@@ -46,7 +49,7 @@ index c4a15e06e..a2dccb57f 100644
  	}
  
  	xmove_fd(sock, pingsock);
-@@ -241,10 +256,12 @@ static void ping4(len_and_sockaddr *lsa)
+@@ -279,10 +294,12 @@ static void ping4(len_and_sockaddr *lsa)
  				bb_simple_perror_msg("recvfrom");
  			continue;
  		}
@@ -62,7 +65,7 @@ index c4a15e06e..a2dccb57f 100644
  			if (pkt->icmp_id != G.myid)
  				continue; /* not our ping */
  			if (pkt->icmp_type == ICMP_ECHOREPLY)
-@@ -653,19 +670,21 @@ static void unpack_tail(int sz, uint32_t *tp,
+@@ -691,19 +708,21 @@ static void unpack_tail(int sz, uint32_t *tp,
  }
  static int unpack4(char *buf, int sz, struct sockaddr_in *from)
  {
@@ -90,7 +93,7 @@ index c4a15e06e..a2dccb57f 100644
  	if (icmppkt->icmp_id != myid)
  		return 0;				/* not our ping */
  
-@@ -677,7 +696,7 @@ static int unpack4(char *buf, int sz, struct sockaddr_in *from)
+@@ -715,7 +734,7 @@ static int unpack4(char *buf, int sz, struct sockaddr_in *from)
  			tp = (uint32_t *) icmppkt->icmp_data;
  		unpack_tail(sz, tp,
  			inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr),
@@ -99,7 +102,7 @@ index c4a15e06e..a2dccb57f 100644
  		return 1;
  	}
  	if (icmppkt->icmp_type != ICMP_ECHO) {
-@@ -727,11 +746,31 @@ static void ping4(len_and_sockaddr *lsa)
+@@ -765,11 +784,31 @@ static void ping4(len_and_sockaddr *lsa)
  	int sockopt;
  
  	pingaddr.sin = lsa->u.sin;
@@ -132,7 +135,7 @@ index c4a15e06e..a2dccb57f 100644
  	}
  
  	/* enable broadcast pings */
-@@ -748,6 +787,15 @@ static void ping4(len_and_sockaddr *lsa)
+@@ -786,6 +825,15 @@ static void ping4(len_and_sockaddr *lsa)
  		setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl);
  	}
  
@@ -148,7 +151,7 @@ index c4a15e06e..a2dccb57f 100644
  	signal(SIGINT, print_stats_and_exit);
  
  	/* start the ping's going ... */
-@@ -785,10 +833,33 @@ static void ping6(len_and_sockaddr *lsa)
+@@ -823,10 +871,33 @@ static void ping6(len_and_sockaddr *lsa)
  	char control_buf[CMSG_SPACE(36)];
  
  	pingaddr.sin6 = lsa->u.sin6;
@@ -183,7 +186,7 @@ index c4a15e06e..a2dccb57f 100644
  	{
  		struct icmp6_filter filt;
  		if (!(option_mask32 & OPT_VERBOSE)) {
-@@ -934,12 +1005,14 @@ static int common_ping_main(int opt, char **argv)
+@@ -972,12 +1043,14 @@ static int common_ping_main(int opt, char **argv)
  		interval = INT_MAX/1000000;
  	G.interval_us = interval * 1000000;
  
diff --git a/aports/busybox/0017-ash-Fix-use-after-free-on-idx-variable.patch b/aports/busybox/0017-ash-Fix-use-after-free-on-idx-variable.patch
deleted file mode 100644
index 22a2578..0000000
--- a/aports/busybox/0017-ash-Fix-use-after-free-on-idx-variable.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 3813e89e3622b034b0e51acae496493a717555cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 1 Jun 2022 11:51:40 +0200
-Subject: [PATCH] ash: Fix use-after-free on idx variable
-
-Consider the following code from ash.c:
-
-	STPUTC(*idx, expdest);
-	if (quotes && (unsigned char)*idx == CTLESC) {
-
-The idx variable points to a value in the stack string (as managed
-by STPUTC). STPUTC may resize this stack string via realloc(3). If
-this happens, the idx pointer needs to be updated. Otherwise,
-dereferencing idx may result in a use-after free.
-
-The valgrind output for this edge case looks as follows:
-
-	Invalid read of size 1
-	   at 0x113AD7: subevalvar (ash.c:7326)
-	   by 0x112EC7: evalvar (ash.c:7674)
-	   by 0x113219: argstr (ash.c:6891)
-	   by 0x113D10: expandarg (ash.c:8098)
-	   by 0x118989: evalcommand (ash.c:10377)
-	   by 0x116744: evaltree (ash.c:9373)
-	   by 0x1170DC: cmdloop (ash.c:13577)
-	   by 0x1191E4: ash_main (ash.c:14756)
-	   by 0x10CB3B: run_applet_no_and_exit (appletlib.c:967)
-	   by 0x10CBCA: run_applet_and_exit (appletlib.c:986)
-	   by 0x10CBCA: main (appletlib.c:1126)
-	 Address 0x48b4099 is 857 bytes inside a block of size 2,736 free'd
-	   at 0x48A6FC9: realloc (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so)
-	   by 0x125B03: xrealloc (xfuncs_printf.c:61)
-	   by 0x10F9D2: growstackblock (ash.c:1736)
-	   by 0x10FA4E: growstackstr (ash.c:1775)
-	   by 0x10FA71: _STPUTC (ash.c:1816)
-	   by 0x113A94: subevalvar (ash.c:7325)
-	   by 0x112EC7: evalvar (ash.c:7674)
-	   by 0x113219: argstr (ash.c:6891)
-	   by 0x113D10: expandarg (ash.c:8098)
-	   by 0x118989: evalcommand (ash.c:10377)
-	   by 0x116744: evaltree (ash.c:9373)
-	   by 0x1170DC: cmdloop (ash.c:13577)
-	 Block was alloc'd at
-	   at 0x48A26D5: malloc (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so)
-	   by 0x125AE9: xmalloc (xfuncs_printf.c:50)
-	   by 0x10ED56: stalloc (ash.c:1622)
-	   by 0x10F9FF: growstackblock (ash.c:1746)
-	   by 0x10FB2A: growstackto (ash.c:1783)
-	   by 0x10FB47: makestrspace (ash.c:1795)
-	   by 0x10FDE7: memtodest (ash.c:6390)
-	   by 0x10FE91: strtodest (ash.c:6417)
-	   by 0x112CC5: varvalue (ash.c:7558)
-	   by 0x112D80: evalvar (ash.c:7603)
-	   by 0x113219: argstr (ash.c:6891)
-	   by 0x113D10: expandarg (ash.c:8098)
-
-This patch fixes this issue by updating the pointers again via
-the restart label if STPUTC re-sized the stack. This issue
-has been reported to us at Alpine Linux downstream.
-
-Also: Move the second realloc-check inside the if statement
-that follows so it isn't done twice if the condition evaluates
-to false.
-
-See also:
-
-* https://gitlab.alpinelinux.org/alpine/aports/-/issues/13900
-* http://lists.busybox.net/pipermail/busybox/2022-April/089655.html
----
- shell/ash.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/shell/ash.c b/shell/ash.c
-index ef4a47afe..cbc50eefe 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -7323,13 +7323,15 @@ subevalvar(char *start, char *str, int strloc,
- 				if (idx >= end)
- 					break;
- 				STPUTC(*idx, expdest);
-+				if (stackblock() != restart_detect)
-+					goto restart;
- 				if (quotes && (unsigned char)*idx == CTLESC) {
- 					idx++;
- 					len++;
- 					STPUTC(*idx, expdest);
-+					if (stackblock() != restart_detect)
-+						goto restart;
- 				}
--				if (stackblock() != restart_detect)
--					goto restart;
- 				idx++;
- 				len++;
- 				rmesc++;
diff --git a/aports/busybox/0007-fbsplash-support-console-switching.patch b/aports/busybox/0017-fbsplash-support-console-switching.patch
index 8d19505..d5ec3f8 100644
--- a/aports/busybox/0007-fbsplash-support-console-switching.patch
+++ b/aports/busybox/0017-fbsplash-support-console-switching.patch
@@ -1,17 +1,20 @@
-From 8fb815ec846d9ac64c89ac21cededc17f0b804c3 Mon Sep 17 00:00:00 2001
+From 7a5d2b057b1aad464500073f15fa7547d2738ecf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 24 Sep 2012 07:58:29 +0300
+Date: Mon, 24 Sep 2012 06:42:10 +0300
 Subject: [PATCH] fbsplash: support console switching
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 ---
  miscutils/fbsplash.c | 82 ++++++++++++++++++++++++++++++++++++++++----
  1 file changed, 75 insertions(+), 7 deletions(-)
 
 diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
-index bc3c61055..1c206ef53 100644
+index 2934d8eb7..ae257e8bc 100644
 --- a/miscutils/fbsplash.c
 +++ b/miscutils/fbsplash.c
-@@ -47,7 +47,7 @@
+@@ -46,7 +46,7 @@
  //kbuild:lib-$(CONFIG_FBSPLASH) += fbsplash.o
  
  //usage:#define fbsplash_trivial_usage
@@ -20,7 +23,7 @@ index bc3c61055..1c206ef53 100644
  //usage:#define fbsplash_full_usage "\n\n"
  //usage:       "	-s	Image"
  //usage:     "\n	-c	Hide cursor"
-@@ -57,11 +57,17 @@
+@@ -56,11 +56,17 @@
  //usage:     "\n			BAR_R,BAR_G,BAR_B,IMG_LEFT,IMG_TOP"
  //usage:     "\n	-f	Control pipe (else exit after drawing image)"
  //usage:     "\n			commands: 'NN' (% for progress bar) or 'exit'"
@@ -38,7 +41,7 @@ index bc3c61055..1c206ef53 100644
  /* If you want logging messages on /tmp/fbsplash.log... */
  #define DEBUG 0
  
-@@ -75,6 +81,8 @@ struct globals {
+@@ -74,6 +80,8 @@ struct globals {
  	unsigned char *addr;	// pointer to framebuffer memory
  	unsigned ns[9];		// n-parameters
  	const char *image_filename;
@@ -47,7 +50,7 @@ index bc3c61055..1c206ef53 100644
  	struct fb_var_screeninfo scr_var;
  	struct fb_fix_screeninfo scr_fix;
  	unsigned bytes_per_pixel;
-@@ -488,6 +496,11 @@ static void init(const char *cfg_filename)
+@@ -487,6 +495,11 @@ static void init(const char *cfg_filename)
  	config_close(parser);
  }
  
@@ -59,7 +62,7 @@ index bc3c61055..1c206ef53 100644
  
  int fbsplash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int fbsplash_main(int argc UNUSED_PARAM, char **argv)
-@@ -497,6 +510,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+@@ -496,6 +509,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
  	char *num_buf;
  	unsigned num;
  	bool bCursorOff;
@@ -69,7 +72,7 @@ index bc3c61055..1c206ef53 100644
  
  	INIT_G();
  
-@@ -504,8 +520,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+@@ -503,8 +519,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
  	fb_device = "/dev/fb0";
  	cfg_filename = NULL;
  	fifo_filename = NULL;
@@ -81,7 +84,7 @@ index bc3c61055..1c206ef53 100644
  
  	// parse configuration file
  	if (cfg_filename)
-@@ -515,11 +532,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+@@ -514,11 +531,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
  	if (!G.image_filename)
  		bb_show_usage();
  
@@ -126,7 +129,7 @@ index bc3c61055..1c206ef53 100644
  	}
  
  	fb_drawimage();
-@@ -527,6 +576,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+@@ -526,6 +575,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
  	if (!fifo_filename)
  		return EXIT_SUCCESS;
  
@@ -134,7 +137,7 @@ index bc3c61055..1c206ef53 100644
  	fp = xfopen_stdin(fifo_filename);
  	if (fp != stdin) {
  		// For named pipes, we want to support this:
-@@ -542,8 +592,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+@@ -541,8 +591,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
  		// and become an additional writer :)
  		open(fifo_filename, O_WRONLY); // errors are ignored
  	}
@@ -145,7 +148,7 @@ index bc3c61055..1c206ef53 100644
  	// Block on read, waiting for some input.
  	// Use of <stdio.h> style I/O allows to correctly
  	// handle a case when we have many buffered lines
-@@ -558,12 +609,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+@@ -557,12 +608,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
  #if DEBUG
  			DEBUG_MESSAGE(itoa(num));
  #endif
diff --git a/aports/busybox/0018-ash-fix-ifs-cleanup-on-error-paths.patch b/aports/busybox/0018-ash-fix-ifs-cleanup-on-error-paths.patch
deleted file mode 100644
index c09bc84..0000000
--- a/aports/busybox/0018-ash-fix-ifs-cleanup-on-error-paths.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 1c5455284234e894dfb6086bf7f3e9a6d5d9611f Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Tue, 2 Aug 2022 11:13:44 +0200
-Subject: [PATCH] ash: fix ifs cleanup on error paths
-
-Patch by Alex Gorinson <algore3698@gmail.com>
-
-function                                             old     new   delta
-evalvar                                              477     495     +18
-varvalue                                             603     618     +15
-subevalvar                                          1557    1572     +15
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 3/0 up/down: 48/0)               Total: 48 bytes
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- shell/ash.c                                        | 2 ++
- shell/ash_test/ash-heredoc/heredoc_and_cmd.right   | 2 ++
- shell/ash_test/ash-heredoc/heredoc_and_cmd.tests   | 8 ++++++++
- shell/hush_test/hush-heredoc/heredoc_and_cmd.right | 2 ++
- shell/hush_test/hush-heredoc/heredoc_and_cmd.tests | 8 ++++++++
- 5 files changed, 22 insertions(+)
- create mode 100644 shell/ash_test/ash-heredoc/heredoc_and_cmd.right
- create mode 100755 shell/ash_test/ash-heredoc/heredoc_and_cmd.tests
- create mode 100644 shell/hush_test/hush-heredoc/heredoc_and_cmd.right
- create mode 100755 shell/hush_test/hush-heredoc/heredoc_and_cmd.tests
-
-diff --git a/shell/ash.c b/shell/ash.c
-index d29de37b7..c731a333b 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -7028,6 +7028,7 @@ varunset(const char *end, const char *var, const char *umsg, int varflags)
- 			msg = umsg;
- 		}
- 	}
-+	ifsfree();
- 	ash_msg_and_raise_error("%.*s: %s%s", (int)(end - var - 1), var, msg, tail);
- }
- 
-@@ -7453,6 +7454,7 @@ varvalue(char *name, int varflags, int flags, int quoted)
- 		if (discard)
- 			return -1;
- 
-+		ifsfree();
- 		raise_error_syntax("bad substitution");
- 	}
- 
-diff --git a/shell/ash_test/ash-heredoc/heredoc_and_cmd.right b/shell/ash_test/ash-heredoc/heredoc_and_cmd.right
-new file mode 100644
-index 000000000..25ae70561
---- /dev/null
-+++ b/shell/ash_test/ash-heredoc/heredoc_and_cmd.right
-@@ -0,0 +1,2 @@
-+./heredoc_and_cmd.tests: line 4: D: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-+Y
-diff --git a/shell/ash_test/ash-heredoc/heredoc_and_cmd.tests b/shell/ash_test/ash-heredoc/heredoc_and_cmd.tests
-new file mode 100755
-index 000000000..197542de7
---- /dev/null
-+++ b/shell/ash_test/ash-heredoc/heredoc_and_cmd.tests
-@@ -0,0 +1,8 @@
-+# The bug was only happening with <<REDIR;CMD form below:
-+M='AAAAAAAAAAAAAAAAA'
-+fff(){
-+date <<000; echo Y
-+${D?$M$M$M$M$M$M}
-+000
-+}
-+fff
-diff --git a/shell/hush_test/hush-heredoc/heredoc_and_cmd.right b/shell/hush_test/hush-heredoc/heredoc_and_cmd.right
-new file mode 100644
-index 000000000..5c19a0621
---- /dev/null
-+++ b/shell/hush_test/hush-heredoc/heredoc_and_cmd.right
-@@ -0,0 +1,2 @@
-+hush: D: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-+Y
-diff --git a/shell/hush_test/hush-heredoc/heredoc_and_cmd.tests b/shell/hush_test/hush-heredoc/heredoc_and_cmd.tests
-new file mode 100755
-index 000000000..197542de7
---- /dev/null
-+++ b/shell/hush_test/hush-heredoc/heredoc_and_cmd.tests
-@@ -0,0 +1,8 @@
-+# The bug was only happening with <<REDIR;CMD form below:
-+M='AAAAAAAAAAAAAAAAA'
-+fff(){
-+date <<000; echo Y
-+${D?$M$M$M$M$M$M}
-+000
-+}
-+fff
diff --git a/aports/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch b/aports/busybox/0018-fbsplash-support-image-and-bar-alignment-and-positio.patch
index ab3421e..f91f564 100644
--- a/aports/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
+++ b/aports/busybox/0018-fbsplash-support-image-and-bar-alignment-and-positio.patch
@@ -1,18 +1,22 @@
-From cc005e48ebd831199789d9dfb1a9307e743ecdaa Mon Sep 17 00:00:00 2001
+From 0a205b68300cea1a8905aa9c12926fe70d75eca8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 21 Nov 2014 16:06:34 +0200
+Date: Fri, 21 Nov 2014 15:15:43 +0200
 Subject: [PATCH] fbsplash: support image and bar alignment and positioning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Needed to center a splash screen image in the initramfs.
+
 ---
  miscutils/fbsplash.c | 93 ++++++++++++++++++++++++++++++++------------
  1 file changed, 69 insertions(+), 24 deletions(-)
 
 diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
-index 1c206ef53..500e04fcc 100644
+index ae257e8bc..2c6413157 100644
 --- a/miscutils/fbsplash.c
 +++ b/miscutils/fbsplash.c
-@@ -54,7 +54,7 @@
+@@ -53,7 +53,7 @@
  //usage:     "\n	-d	Framebuffer device (default /dev/fb0)"
  //usage:     "\n	-i	Config file (var=value):"
  //usage:     "\n			BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT"
@@ -21,7 +25,7 @@ index 1c206ef53..500e04fcc 100644
  //usage:     "\n	-f	Control pipe (else exit after drawing image)"
  //usage:     "\n			commands: 'NN' (% for progress bar) or 'exit'"
  //usage:     "\n	-T	Switch to TTY to hide all console messages"
-@@ -73,13 +73,39 @@
+@@ -72,13 +72,39 @@
  
  #define ESC "\033"
  
@@ -62,7 +66,7 @@ index 1c206ef53..500e04fcc 100644
  	const char *image_filename;
  	int silent_tty, fd_tty_s;
  	bool do_not_draw;
-@@ -96,16 +122,6 @@ struct globals {
+@@ -95,16 +121,6 @@ struct globals {
  	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
  } while (0)
  
@@ -79,7 +83,7 @@ index 1c206ef53..500e04fcc 100644
  #if DEBUG
  #define DEBUG_MESSAGE(strMessage, args...) \
  	if (G.bdebug_messages) { \
-@@ -386,7 +402,7 @@ static void fb_drawimage(void)
+@@ -385,7 +401,7 @@ static void fb_drawimage(void)
  	FILE *theme_file;
  	char *read_ptr;
  	unsigned char *pixline;
@@ -88,7 +92,7 @@ index 1c206ef53..500e04fcc 100644
  
  	if (LONE_DASH(G.image_filename)) {
  		theme_file = stdin;
-@@ -436,18 +452,39 @@ static void fb_drawimage(void)
+@@ -435,18 +451,39 @@ static void fb_drawimage(void)
  	line_size = width*3;
  	pixline = xmalloc(line_size);
  
@@ -135,7 +139,7 @@ index 1c206ef53..500e04fcc 100644
  		for (i = 0; i < width; i++) {
  			unsigned thispix = fb_pixel_value(pixel[0], pixel[1], pixel[2]);
  			fb_write_pixel(src, thispix);
-@@ -466,11 +503,15 @@ static void fb_drawimage(void)
+@@ -465,11 +502,15 @@ static void fb_drawimage(void)
   */
  static void init(const char *cfg_filename)
  {
@@ -152,7 +156,7 @@ index 1c206ef53..500e04fcc 100644
  #if DEBUG
  		"DEBUG\0"
  #endif
-@@ -479,14 +520,18 @@ static void init(const char *cfg_filename)
+@@ -478,14 +519,18 @@ static void init(const char *cfg_filename)
  	parser_t *parser = config_open2(cfg_filename, xfopen_stdin);
  	while (config_read(parser, token, 2, 2, "#=",
  				(PARSE_NORMAL | PARSE_MIN_DIE) & ~(PARSE_TRIM | PARSE_COLLAPSE))) {
diff --git a/aports/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch b/aports/busybox/0019-depmod-support-generating-kmod-binary-index-files.patch
index 9f697a5..62481f6 100644
--- a/aports/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch
+++ b/aports/busybox/0019-depmod-support-generating-kmod-binary-index-files.patch
@@ -1,13 +1,17 @@
-From 8d76137506e9c65404280694e56d9a7629d58280 Mon Sep 17 00:00:00 2001
+From 4eb6d6b1f36e9bf976549f3071beb1192e11c4ca Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Sun, 25 Oct 2015 22:21:41 +0200
+Date: Sun, 25 Oct 2015 12:33:58 +0200
 Subject: [PATCH] depmod: support generating kmod binary index files
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 This allows to use busybox depmod, and run daemons using libkmod (or
 even kmod modprobe if needed).
 
 About +1500 bytes when enabled. This patch merges some depmod code
 paths, so when this is disabled it shrinks the code size a little bit.
+
 ---
  modutils/Config.src |   9 ++
  modutils/depmod.c   | 281 ++++++++++++++++++++++++++++++++++++--------
@@ -37,7 +41,7 @@ index 188296814..7a4c037ad 100644
  	bool "Support module.symbols file"
  	default y
 diff --git a/modutils/depmod.c b/modutils/depmod.c
-index b5244fc60..26e223753 100644
+index bb42bbefe..9b034db0a 100644
 --- a/modutils/depmod.c
 +++ b/modutils/depmod.c
 @@ -2,7 +2,7 @@
@@ -49,7 +53,7 @@ index b5244fc60..26e223753 100644
   * Copyright (c) 2008 Vladimir Dronnikov
   *
   * Licensed under GPLv2 or later, see file LICENSE in this source tree.
-@@ -26,6 +26,24 @@
+@@ -25,6 +25,24 @@
  #include "modutils.h"
  #include <sys/utsname.h> /* uname() */
  
@@ -74,7 +78,7 @@ index b5244fc60..26e223753 100644
  /*
   * Theory of operation:
   * - iterate over all modules and record their full path
-@@ -53,18 +71,12 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
+@@ -53,18 +71,12 @@ static int FAST_FUNC parse_module(struct recursive_state *state,
  
  	for (ptr = image; ptr < image + len - 10; ptr++) {
  		if (is_prefixed_with(ptr, "depends=")) {
@@ -95,7 +99,7 @@ index b5244fc60..26e223753 100644
  		} else if (ENABLE_FEATURE_MODUTILS_SYMBOLS
  		 && is_prefixed_with(ptr, "__ksymtab_")
  		) {
-@@ -74,9 +86,10 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
+@@ -74,9 +86,10 @@ static int FAST_FUNC parse_module(struct recursive_state *state,
  			) {
  				continue;
  			}
@@ -301,7 +305,7 @@ index b5244fc60..26e223753 100644
  	getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL);
  	argv += optind;
  
-@@ -210,53 +382,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
+@@ -211,53 +383,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
  	}
  
  	/* Generate dependency and alias files */
@@ -396,10 +400,10 @@ index b5244fc60..26e223753 100644
  	if (ENABLE_FEATURE_CLEAN_UP)
  		moddb_free(&modules);
 diff --git a/modutils/modprobe.c b/modutils/modprobe.c
-index 0a372a049..20a60c1a6 100644
+index 235706fd5..604d9e6b5 100644
 --- a/modutils/modprobe.c
 +++ b/modutils/modprobe.c
-@@ -192,21 +192,6 @@ struct globals {
+@@ -191,21 +191,6 @@ struct globals {
  
  static int read_config(const char *path);
  
@@ -422,10 +426,10 @@ index 0a372a049..20a60c1a6 100644
  {
  	return moddb_get_or_create(&G.db, module);
 diff --git a/modutils/modutils.c b/modutils/modutils.c
-index 6f7cd9721..257089af4 100644
+index 037d609e4..502ad5422 100644
 --- a/modutils/modutils.c
 +++ b/modutils/modutils.c
-@@ -66,6 +66,21 @@ void FAST_FUNC moddb_free(module_db *db)
+@@ -67,6 +67,21 @@ void FAST_FUNC moddb_free(module_db *db)
  	}
  }
  
@@ -447,7 +451,7 @@ index 6f7cd9721..257089af4 100644
  void FAST_FUNC replace(char *s, char what, char with)
  {
  	while (*s) {
-@@ -75,6 +90,22 @@ void FAST_FUNC replace(char *s, char what, char with)
+@@ -76,6 +91,22 @@ void FAST_FUNC replace(char *s, char what, char with)
  	}
  }
  
diff --git a/aports/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch b/aports/busybox/0020-Add-flag-for-not-following-symlinks-when-recursing.patch
index e647d8d..44a3492 100644
--- a/aports/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
+++ b/aports/busybox/0020-Add-flag-for-not-following-symlinks-when-recursing.patch
@@ -1,7 +1,10 @@
-From 03293c16e509501ce7ec952900413138475f125d Mon Sep 17 00:00:00 2001
+From 333b48438e3001cddbc902bd6f5fc7eb116997ca Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 25 Jul 2014 15:28:33 +0200
+Date: Fri, 25 Jul 2014 02:10:50 +0200
 Subject: [PATCH] Add flag for not following symlinks when recursing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 function                                             old     new   delta
 .rodata                                             7934    7967     +33
@@ -10,12 +13,13 @@ packed_usage                                        1704    1720     +16
 diff_main                                           1665    1662      -3
 ------------------------------------------------------------------------------
 (add/remove: 0/0 grow/shrink: 3/1 up/down: 66/-3)              Total: 63 bytes
+
 ---
  editors/diff.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/editors/diff.c b/editors/diff.c
-index 280091756..42a36e2d4 100644
+index 1adc4cbc7..f7c0f5250 100644
 --- a/editors/diff.c
 +++ b/editors/diff.c
 @@ -113,6 +113,9 @@
diff --git a/aports/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch b/aports/busybox/0021-udhcpc-Don-t-background-if-n-is-given.patch
index 523768b..9ce7adf 100644
--- a/aports/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
+++ b/aports/busybox/0021-udhcpc-Don-t-background-if-n-is-given.patch
@@ -1,7 +1,10 @@
-From 0cd01228c1e4173683637c4e582448656b26c05f Mon Sep 17 00:00:00 2001
+From b6a7520ce7c77f14f61794e6a84c865042a31db3 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Jul 2017 11:40:14 +0200
+Date: Thu, 6 Jul 2017 07:05:15 +0200
 Subject: [PATCH] udhcpc: Don't background if -n is given
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 we need add -b to our udhcpc options to prevent boot forever if there are no
 dhcp server. We also need a way for users to disable this behavior by making
@@ -15,16 +18,17 @@ introducing this change.
 See also: https://bugs.busybox.net/11691
 
 [0]: https://git.busybox.net/busybox/commit/?id=87e216294af9eec39c0c1d553555f8a98c15db38
+
 ---
  networking/udhcp/d6_dhcpc.c | 20 +++++++-------------
  networking/udhcp/dhcpc.c    | 20 +++++++-------------
  2 files changed, 14 insertions(+), 26 deletions(-)
 
 diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
-index 8d11a7539..0284a0fd8 100644
+index 3d0ec98f9..cc3afa921 100644
 --- a/networking/udhcp/d6_dhcpc.c
 +++ b/networking/udhcp/d6_dhcpc.c
-@@ -1401,25 +1401,19 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
+@@ -1403,25 +1403,19 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
   leasefail:
  				change_listen_mode(LISTEN_NONE);
  				d6_run_script_no_option("leasefail");
@@ -58,7 +62,7 @@ index 8d11a7539..0284a0fd8 100644
  				timeout = tryagain_timeout;
  				packet_num = 0;
 diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index bbf95caca..8e034ac8a 100644
+index 424d6dade..06ad59fe5 100644
 --- a/networking/udhcp/dhcpc.c
 +++ b/networking/udhcp/dhcpc.c
 @@ -1456,25 +1456,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
diff --git a/aports/busybox/0023-tests-fix-tarball-creation.patch b/aports/busybox/0023-tests-fix-tarball-creation.patch
new file mode 100644
index 0000000..e4221e7
--- /dev/null
+++ b/aports/busybox/0023-tests-fix-tarball-creation.patch
@@ -0,0 +1,29 @@
+From 9448774028839a834a554384a7c64e89fd9c3486 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Wed, 4 Jan 2023 08:30:41 +0100
+Subject: [PATCH] tests: fix tarball creation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without this patch, the chmod 644 invocation takes away the executable
+bit from the input_dir directory, thus preventing the chmod of the files
+within the input_dir directory (due to lack of x-bit).
+
+---
+ testsuite/tar.tests | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testsuite/tar.tests b/testsuite/tar.tests
+index 0f2e89112..18e571af3 100755
+--- a/testsuite/tar.tests
++++ b/testsuite/tar.tests
+@@ -67,7 +67,7 @@ testing "tar hardlinks and repeated files" '\
+ ln input_hard1 input_hard2
+ mkdir input_dir
+ >input_dir/file
+-chmod -R 644 *
++for f in *; do [ "$f" = "input_dir" ] || chmod -R 644 "$f"; done
+ chmod    755 input_dir
+ tar cf test.tar input input_dir/ input_hard1 input_hard2 input_hard1 input_dir/ input
+ tar tvf test.tar | sed "s/.*[0-9] input/input/"
diff --git a/aports/busybox/0024-tests-musl-doesn-t-seem-to-recognize-UTC0-as-a-timez.patch b/aports/busybox/0024-tests-musl-doesn-t-seem-to-recognize-UTC0-as-a-timez.patch
new file mode 100644
index 0000000..de2cb36
--- /dev/null
+++ b/aports/busybox/0024-tests-musl-doesn-t-seem-to-recognize-UTC0-as-a-timez.patch
@@ -0,0 +1,40 @@
+From 707d69bf1e7a5f2e29309239d599933350cbfd59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Wed, 4 Jan 2023 08:04:07 +0100
+Subject: [PATCH] tests: musl doesn't seem to recognize UTC0 as a timezone
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+UTC works though.
+
+TODO: Figure out if musl /should/ regonize UTC0.
+---
+ testsuite/date/date-timezone | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/testsuite/date/date-timezone b/testsuite/date/date-timezone
+index 8628aa1d7..720ce4f26 100644
+--- a/testsuite/date/date-timezone
++++ b/testsuite/date/date-timezone
+@@ -1,17 +1,17 @@
+ # FEATURE: CONFIG_FEATURE_TIMEZONE
+ 
+ # 'Z' is UTC
+-dt=$(TZ=UTC0 busybox date -d '1999-1-2 3:4:5Z')
++dt=$(TZ=UTC busybox date -d '1999-1-2 3:4:5Z')
+ dt=$(echo "$dt" | cut -b1-19)
+ test x"$dt" = x"Sat Jan  2 03:04:05"
+ 
+ # '+0600' is six hours ahead of UTC
+-dt=$(TZ=UTC0 busybox date -d '1999-1-2 3:4:5 +0600')
++dt=$(TZ=UTC busybox date -d '1999-1-2 3:4:5 +0600')
+ dt=$(echo "$dt" | cut -b1-19)
+ test x"$dt" = x"Fri Jan  1 21:04:05"
+ 
+ # '-0600' is six hours behind UTC
+-dt=$(TZ=UTC0 busybox date -d '1999-1-2 3:4:5 -0600')
++dt=$(TZ=UTC busybox date -d '1999-1-2 3:4:5 -0600')
+ dt=$(echo "$dt" | cut -b1-19)
+ test x"$dt" = x"Sat Jan  2 09:04:05"
+ 
diff --git a/aports/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch b/aports/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
new file mode 100644
index 0000000..a3030da
--- /dev/null
+++ b/aports/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
@@ -0,0 +1,46 @@
+From 3ead51e53687e94a51beb793661363df27b00814 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Thu, 5 Jan 2023 15:47:55 +0100
+Subject: [PATCH] Hackfix to disable HW acceleration for MD5/SHA1 on x86
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This causes a direct segfault with musl libc.
+
+See: http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
+---
+ libbb/hash_md5_sha.c | 6 +++---
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
+index 880ffab01..a006422ab 100644
+--- a/libbb/hash_md5_sha.c
++++ b/libbb/hash_md5_sha.c
+@@ -14,7 +14,7 @@
+ #define NEED_SHA512 (ENABLE_SHA512SUM || ENABLE_USE_BB_CRYPT_SHA)
+ 
+ #if ENABLE_SHA1_HWACCEL || ENABLE_SHA256_HWACCEL
+-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
++# if defined(__GNUC__) && defined(__x86_64__)
+ static void cpuid(unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx)
+ {
+ 	asm ("cpuid"
+@@ -1173,7 +1173,7 @@ void FAST_FUNC sha1_begin(sha1_ctx_t *ctx)
+ 	ctx->total64 = 0;
+ 	ctx->process_block = sha1_process_block64;
+ #if ENABLE_SHA1_HWACCEL
+-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
++# if defined(__GNUC__) && defined(__x86_64__)
+ 	{
+ 		if (!shaNI) {
+ 			unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
+@@ -1227,7 +1227,7 @@ void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
+ 	/*ctx->total64 = 0; - done by prepending two 32-bit zeros to init256 */
+ 	ctx->process_block = sha256_process_block64;
+ #if ENABLE_SHA256_HWACCEL
+-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
++# if defined(__GNUC__) && defined(__x86_64__)
+ 	{
+ 		if (!shaNI) {
+ 			unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
diff --git a/aports/busybox/0026-lineedit-Handle-SIGWINCH-gracefully.patch b/aports/busybox/0026-lineedit-Handle-SIGWINCH-gracefully.patch
new file mode 100644
index 0000000..43f48b1
--- /dev/null
+++ b/aports/busybox/0026-lineedit-Handle-SIGWINCH-gracefully.patch
@@ -0,0 +1,61 @@
+From 63bb934c9e48d3ba1dc7f8001d423ea84b9a00c2 Mon Sep 17 00:00:00 2001
+From: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
+Date: Thu, 19 Jan 2023 17:18:18 +0100
+Subject: [PATCH] lineedit: Handle SIGWINCH gracefully
+
+Since 1.16.0 a resize of the terminal emulator resulted in ash printing
+a new command line. This fixes the issue by retrying read_key() in
+lineedit_read_key() on SIGWINCH, rendering reception of SIGWINCH
+transparent to callers of read_line_input().
+
+Fixes https://bugs.busybox.net/show_bug.cgi?id=15256
+---
+ libbb/lineedit.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/libbb/lineedit.c b/libbb/lineedit.c
+index d6b2e76ff..a47d9e508 100644
+--- a/libbb/lineedit.c
++++ b/libbb/lineedit.c
+@@ -2149,7 +2149,7 @@ static void cmdedit_setwidth(void)
+ 	redraw((new_y >= cmdedit_y ? new_y : cmdedit_y), command_len - cursor);
+ }
+ 
+-static void win_changed(int nsig UNUSED_PARAM)
++static void win_changed(int nsig)
+ {
+ 	if (S.ok_to_redraw) {
+ 		/* We are in read_key(), safe to redraw immediately */
+@@ -2157,6 +2157,7 @@ static void win_changed(int nsig UNUSED_PARAM)
+ 		cmdedit_setwidth();
+ 		fflush_all();
+ 		errno = sv_errno;
++		bb_got_signal = nsig;
+ 	} else {
+ 		/* Signal main loop that redraw is necessary */
+ 		S.SIGWINCH_count++;
+@@ -2186,7 +2187,9 @@ static int lineedit_read_key(char *read_key_buffer, int timeout)
+ 		 * Note: read_key sets errno to 0 on success.
+ 		 */
+ 		for (;;) {
+-			if ((state->flags & LI_INTERRUPTIBLE) && bb_got_signal) {
++			if ((state->flags & LI_INTERRUPTIBLE) && bb_got_signal
++			 && (bb_got_signal != SIGWINCH)
++			) {
+ 				errno = EINTR;
+ 				return -1;
+ 			}
+@@ -2197,6 +2200,10 @@ static int lineedit_read_key(char *read_key_buffer, int timeout)
+ 			IF_FEATURE_EDITING_WINCH(S.ok_to_redraw = 0;)
+ 			if (errno != EINTR)
+ 				break;
++			if (bb_got_signal == SIGWINCH) {
++				bb_got_signal = 0;
++				continue;
++			}
+ 			if (state->flags & LI_INTERRUPTIBLE) {
+ 				/* LI_INTERRUPTIBLE bails out on EINTR,
+ 				 * but nothing really guarantees that bb_got_signal
+-- 
+2.39.1
+
diff --git a/aports/busybox/0027-umount-Implement-O-option-to-unmount-by-mount-option.patch b/aports/busybox/0027-umount-Implement-O-option-to-unmount-by-mount-option.patch
new file mode 100644
index 0000000..2b330e5
--- /dev/null
+++ b/aports/busybox/0027-umount-Implement-O-option-to-unmount-by-mount-option.patch
@@ -0,0 +1,195 @@
+From 7ea459b570760f8e836d05e58422dbd3a7d1b016 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 19 Jun 2022 17:49:41 +0200
+Subject: [PATCH] umount: Implement -O option to unmount by mount options
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This commit adds an implementation of the umount -O option, as provided
+by util-linux's mount(8) implementation, to BusyBox. Similar to -t, the
+option is intended to be used in conjunction with -a thereby allowing
+users to filter which file systems are unmounted by mount options.
+Multiple options can be specified with -O, all of which need to match.
+Each option can be prefixed with `no` to indicate that no action should
+be taken for a mount point with this mount option. The "no" prefix
+interpretation can be disabled using the "+" prefix.
+
+At Alpine, this feature is often requested by users as the OpenRC
+netmount service uses `umount -a -O _netdev` to amount all network
+file systems [1] [2].
+
+This implementation is functionally equivalent to the util-linux
+implementation with the exception that it implements no special handling
+for `key="value"` mount options to keep the implementation simple.
+Therefore, filesystems mounted with options like `foo="bar"` won't
+be matched by `umount -a -O foo`.
+
+[1]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/9923
+[2]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13789
+
+Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
+Signed-off-by: Sören Tempel <soeren+git@soeren-tempel.net>
+---
+ include/libbb.h      |  1 +
+ libbb/Kbuild.src     |  1 +
+ libbb/match_fsopts.c | 69 ++++++++++++++++++++++++++++++++++++++++++++
+ util-linux/umount.c  | 10 +++++--
+ 4 files changed, 78 insertions(+), 3 deletions(-)
+ create mode 100644 libbb/match_fsopts.c
+
+diff --git a/include/libbb.h b/include/libbb.h
+index cca33a177..ad41adec8 100644
+--- a/include/libbb.h
++++ b/include/libbb.h
+@@ -1586,6 +1586,7 @@ const struct hwtype *get_hwntype(int type) FAST_FUNC;
+ 
+ 
+ extern int fstype_matches(const char *fstype, const char *comma_list) FAST_FUNC;
++extern int fsopts_matches(const char *opts_list, const char *reqopts_list) FAST_FUNC;
+ #ifdef HAVE_MNTENT_H
+ extern struct mntent *find_mount_point(const char *name, int subdir_too) FAST_FUNC;
+ #endif
+diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
+index 653025e56..4bb8260b9 100644
+--- a/libbb/Kbuild.src
++++ b/libbb/Kbuild.src
+@@ -120,6 +120,7 @@ lib-y += xrealloc_vector.o
+ 
+ lib-$(CONFIG_MOUNT) += match_fstype.o
+ lib-$(CONFIG_UMOUNT) += match_fstype.o
++lib-$(CONFIG_UMOUNT) += match_fsopts.o
+ 
+ lib-$(CONFIG_FEATURE_UTMP) += utmp.o
+ 
+diff --git a/libbb/match_fsopts.c b/libbb/match_fsopts.c
+new file mode 100644
+index 000000000..b1cc85c3c
+--- /dev/null
++++ b/libbb/match_fsopts.c
+@@ -0,0 +1,69 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * Match fsopts for use in mount unmount -O.
++ *
++ * Returns 1 for a match, otherwise 0.
++ *
++ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
++ */
++
++#include "libbb.h"
++
++static int fsopt_matches(const char *opts_list, const char *opt, size_t optlen)
++{
++	int match = 1;
++
++	if (optlen >= 2 && opt[0] == 'n' && opt[1] == 'o') {
++		match--;
++		opt += 2; optlen -= 2;
++	}
++
++	/* The alone "no" is an error, all matching ends with False. */
++	if (optlen == 0)
++		return 0;
++
++	/* The "no" prefix interpretation can be disabled by the "+" prefix. */
++	if (match && optlen > 1 && *opt == '+') {
++		opt++; optlen--;
++	}
++
++	while (1) {
++		if (strncmp(opts_list, opt, optlen) == 0) {
++			const char *after_opt = opts_list + optlen;
++			if (*after_opt == '\0' || *after_opt == ',')
++				return match;
++		}
++
++		opts_list = strchr(opts_list, ',');
++		if (!opts_list)
++			break;
++		opts_list++;
++	}
++
++	return !match;
++}
++
++/* This function implements the mnt_match_options function from libmount. */
++int FAST_FUNC fsopts_matches(const char *opts_list, const char *reqopts_list)
++{
++	if (!reqopts_list)
++		return 1; /* no options requested, match anything */
++
++	while (1) {
++		size_t len;
++		const char *comma = strchr(reqopts_list, ',');
++		if (!comma)
++			len = strlen(reqopts_list);
++		else
++			len = comma - reqopts_list;
++
++		if (len && !fsopt_matches(opts_list, reqopts_list, len))
++			return 0;
++
++		if (!comma)
++			break;
++		reqopts_list = ++comma;
++	}
++
++	return 1;
++}
+diff --git a/util-linux/umount.c b/util-linux/umount.c
+index 23da32868..7a54cafb0 100644
+--- a/util-linux/umount.c
++++ b/util-linux/umount.c
+@@ -41,7 +41,7 @@
+ //kbuild:lib-$(CONFIG_UMOUNT) += umount.o
+ 
+ //usage:#define umount_trivial_usage
+-//usage:       "[-rlf"IF_FEATURE_MTAB_SUPPORT("m")IF_FEATURE_MOUNT_LOOP("d")IF_FEATURE_UMOUNT_ALL("a")"] [-t FSTYPE] FILESYSTEM|DIRECTORY"
++//usage:       "[-rlf"IF_FEATURE_MTAB_SUPPORT("m")IF_FEATURE_MOUNT_LOOP("d")IF_FEATURE_UMOUNT_ALL("a")"] [-t FSTYPE] [-O FSOPT] FILESYSTEM|DIRECTORY"
+ //usage:#define umount_full_usage "\n\n"
+ //usage:       "Unmount filesystems\n"
+ //usage:	IF_FEATURE_UMOUNT_ALL(
+@@ -57,6 +57,7 @@
+ //usage:     "\n	-d	Free loop device if it has been used"
+ //usage:	)
+ //usage:     "\n	-t FSTYPE[,...]	Unmount only these filesystem type(s)"
++//usage:     "\n	-O FSOPT[,...]	Unmount only filesystem mounted with the given options"
+ //usage:
+ //usage:#define umount_example_usage
+ //usage:       "$ umount /dev/hdc1\n"
+@@ -82,7 +83,7 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
+ #endif
+ 
+ /* ignored: -c -v -i */
+-#define OPTION_STRING           "fldnrat:" "cvi"
++#define OPTION_STRING           "fldnrat:O:" "cvi"
+ #define OPT_FORCE               (1 << 0) // Same as MNT_FORCE
+ #define OPT_LAZY                (1 << 1) // Same as MNT_DETACH
+ #define OPT_FREELOOP            (1 << 2)
+@@ -96,6 +97,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
+ 	int doForce;
+ 	struct mntent me;
+ 	FILE *fp;
++	char *opts = NULL;
+ 	char *fstype = NULL;
+ 	int status = EXIT_SUCCESS;
+ 	unsigned opt;
+@@ -105,7 +107,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
+ 		struct mtab_list *next;
+ 	} *mtl, *m;
+ 
+-	opt = getopt32(argv, OPTION_STRING, &fstype);
++	opt = getopt32(argv, OPTION_STRING, &fstype, &opts);
+ 	//argc -= optind;
+ 	argv += optind;
+ 
+@@ -133,6 +135,8 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
+ 			/* Match fstype (fstype==NULL matches always) */
+ 			if (!fstype_matches(me.mnt_type, fstype))
+ 				continue;
++			if (!fsopts_matches(me.mnt_opts, opts))
++				continue;
+ 			m = xzalloc(sizeof(*m));
+ 			m->next = mtl;
+ 			m->device = xstrdup(me.mnt_fsname);
diff --git a/aports/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch b/aports/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch
new file mode 100644
index 0000000..a8c13e4
--- /dev/null
+++ b/aports/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch
@@ -0,0 +1,34 @@
+From 3e83699ce23400d75c7ddaa7ebfdec015177caa7 Mon Sep 17 00:00:00 2001
+From: Karsten Sperling <ksperling@apple.com>
+Date: Thu, 18 May 2023 16:47:49 +0200
+Subject: [PATCH] ash: use-after-free in bash pattern substitution
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit daa66ed6 fixed a number of use-after-free bugs in bash pattern
+substitution, however one "unguarded" STPUTC remained, which is fixed here.
+
+function                                             old     new   delta
+subevalvar                                          1564    1576     +12
+
+Signed-off-by: Karsten Sperling <ksperling@apple.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+Signed-off-by: Sören Tempel <soeren+git@soeren-tempel.net>
+---
+ shell/ash.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/shell/ash.c b/shell/ash.c
+index d2c5c5d50..51b627fcc 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -7370,6 +7370,8 @@ subevalvar(char *start, char *str, int strloc,
+ 				char *restart_detect = stackblock();
+ 				if (quotes && *loc == '\\') {
+ 					STPUTC(CTLESC, expdest);
++					if (stackblock() != restart_detect)
++						goto restart;
+ 					len++;
+ 				}
+ 				STPUTC(*loc, expdest);
diff --git a/aports/busybox/0029-awk-fix-use-after-realloc-CVE-2021-42380-closes-1560.patch b/aports/busybox/0029-awk-fix-use-after-realloc-CVE-2021-42380-closes-1560.patch
new file mode 100644
index 0000000..e49bff4
--- /dev/null
+++ b/aports/busybox/0029-awk-fix-use-after-realloc-CVE-2021-42380-closes-1560.patch
@@ -0,0 +1,82 @@
+From 5b1deb2b98a0513b101c600e856d64edd9d47a2e Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Fri, 26 May 2023 18:52:52 +0200
+Subject: [PATCH] awk: fix use-after-realloc (CVE-2021-42380), closes 15601
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ editors/awk.c       | 26 ++++++++++++++++-----
+ 2 files changed, 75 insertions(+), 6 deletions(-)
+
+diff --git a/editors/awk.c b/editors/awk.c
+index 728ee8685..2af823808 100644
+--- a/editors/awk.c
++++ b/editors/awk.c
+@@ -555,7 +555,7 @@ struct globals {
+ 	const char *g_progname;
+ 	int g_lineno;
+ 	int nfields;
+-	int maxfields; /* used in fsrealloc() only */
++	unsigned maxfields;
+ 	var *Fields;
+ 	char *g_pos;
+ 	char g_saved_ch;
+@@ -1931,9 +1931,9 @@ static void fsrealloc(int size)
+ {
+ 	int i, newsize;
+ 
+-	if (size >= maxfields) {
+-		/* Sanity cap, easier than catering for overflows */
+-		if (size > 0xffffff)
++	if ((unsigned)size >= maxfields) {
++		/* Sanity cap, easier than catering for over/underflows */
++		if ((unsigned)size > 0xffffff)
+ 			bb_die_memory_exhausted();
+ 
+ 		i = maxfields;
+@@ -2891,6 +2891,7 @@ static var *evaluate(node *op, var *res)
+ 		uint32_t opinfo;
+ 		int opn;
+ 		node *op1;
++		var *old_Fields_ptr;
+ 
+ 		opinfo = op->info;
+ 		opn = (opinfo & OPNMASK);
+@@ -2899,10 +2900,16 @@ static var *evaluate(node *op, var *res)
+ 		debug_printf_eval("opinfo:%08x opn:%08x\n", opinfo, opn);
+ 
+ 		/* execute inevitable things */
++		old_Fields_ptr = NULL;
+ 		if (opinfo & OF_RES1) {
+ 			if ((opinfo & OF_REQUIRED) && !op1)
+ 				syntax_error(EMSG_TOO_FEW_ARGS);
+ 			L.v = evaluate(op1, TMPVAR0);
++			/* Does L.v point to $n variable? */
++			if ((size_t)(L.v - Fields) < maxfields) {
++				/* yes, remember where Fields[] is */
++				old_Fields_ptr = Fields;
++			}
+ 			if (opinfo & OF_STR1) {
+ 				L.s = getvar_s(L.v);
+ 				debug_printf_eval("L.s:'%s'\n", L.s);
+@@ -2921,8 +2928,15 @@ static var *evaluate(node *op, var *res)
+ 		 */
+ 		if (opinfo & OF_RES2) {
+ 			R.v = evaluate(op->r.n, TMPVAR1);
+-			//TODO: L.v may be invalid now, set L.v to NULL to catch bugs?
+-			//L.v = NULL;
++			/* Seen in $5=$$5=$0:
++			 * Evaluation of R.v ($$5=$0 expression)
++			 * made L.v ($5) invalid. It's detected here.
++			 */
++			if (old_Fields_ptr) {
++				//if (old_Fields_ptr != Fields)
++				//	debug_printf_eval("L.v moved\n");
++				L.v += Fields - old_Fields_ptr;
++			}
+ 			if (opinfo & OF_STR2) {
+ 				R.s = getvar_s(R.v);
+ 				debug_printf_eval("R.s:'%s'\n", R.s);
diff --git a/aports/busybox/0030-shell-avoid-segfault-on-0-0-0-09J-.-Closes-15216.patch b/aports/busybox/0030-shell-avoid-segfault-on-0-0-0-09J-.-Closes-15216.patch
new file mode 100644
index 0000000..4017548
--- /dev/null
+++ b/aports/busybox/0030-shell-avoid-segfault-on-0-0-0-09J-.-Closes-15216.patch
@@ -0,0 +1,80 @@
+From f69ade3845f9c1cc8cf47251d5f3ba41aab2ce21 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 12 Jun 2023 16:51:43 +0200
+Subject: [PATCH] shell: avoid segfault on ${0::0/0~09J}. Closes 15216
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+function                                             old     new   delta
+evaluate_string                                     1011    1053     +42
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ shell/math.c | 39 +++++++++++++++++++++++++++++++++++----
+ 1 file changed, 35 insertions(+), 4 deletions(-)
+
+diff --git a/shell/math.c b/shell/math.c
+index 76d22c9bd..727c29467 100644
+--- a/shell/math.c
++++ b/shell/math.c
+@@ -577,6 +577,28 @@ static arith_t strto_arith_t(const char *nptr, char **endptr)
+ # endif
+ #endif
+ 
++//TODO: much better estimation than expr_len/2? Such as:
++//static unsigned estimate_nums_and_names(const char *expr)
++//{
++//	unsigned count = 0;
++//	while (*(expr = skip_whitespace(expr)) != '\0') {
++//		const char *p;
++//		if (isdigit(*expr)) {
++//			while (isdigit(*++expr))
++//				continue;
++//			count++;
++//			continue;
++//		}
++//		p = endofname(expr);
++//		if (p != expr) {
++//			expr = p;
++//			count++;
++//			continue;
++//		}
++//	}
++//	return count;
++//}
++
+ static arith_t
+ evaluate_string(arith_state_t *math_state, const char *expr)
+ {
+@@ -584,10 +606,12 @@ evaluate_string(arith_state_t *math_state, const char *expr)
+ 	const char *errmsg;
+ 	const char *start_expr = expr = skip_whitespace(expr);
+ 	unsigned expr_len = strlen(expr) + 2;
+-	/* Stack of integers */
+-	/* The proof that there can be no more than strlen(startbuf)/2+1
+-	 * integers in any given correct or incorrect expression
+-	 * is left as an exercise to the reader. */
++	/* Stack of integers/names */
++	/* There can be no more than strlen(startbuf)/2+1
++	 * integers/names in any given correct or incorrect expression.
++	 * (modulo "09v09v09v09v09v" case,
++	 * but we have code to detect that early)
++	 */
+ 	var_or_num_t *const numstack = alloca((expr_len / 2) * sizeof(numstack[0]));
+ 	var_or_num_t *numstackptr = numstack;
+ 	/* Stack of operator tokens */
+@@ -652,6 +676,13 @@ evaluate_string(arith_state_t *math_state, const char *expr)
+ 			numstackptr->var = NULL;
+ 			errno = 0;
+ 			numstackptr->val = strto_arith_t(expr, (char**) &expr);
++			/* A number can't be followed by another number, or a variable name.
++			 * We'd catch this later anyway, but this would require numstack[]
++			 * to be twice as deep to handle strings where _every_ char is
++			 * a new number or name. Example: 09v09v09v09v09v09v09v09v09v
++			 */
++			if (isalnum(*expr) || *expr == '_')
++				goto err;
+ //bb_error_msg("val:%lld", numstackptr->val);
+ 			if (errno)
+ 				numstackptr->val = 0; /* bash compat */
diff --git a/aports/busybox/APKBUILD b/aports/busybox/APKBUILD
index 35ead0b..40e77d6 100644
--- a/aports/busybox/APKBUILD
+++ b/aports/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gabor Pali <pali.gabor@gmail.com>
 pkgname=busybox
-pkgver=1.35.0
-pkgrel=4 # base: 29
+pkgver=1.36.1
+pkgrel=0 # base: 2
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url="https://busybox.net/"
 arch="all"
@@ -12,8 +12,7 @@ makedepends_host="linux-headers openssl-dev>3"
 # skalibs-static is needed for utmps-static
 [ -z "$BOOTSTRAP" ] && makedepends_host="$makedepends_host utmps-dev utmps-static skalibs-static"
 makedepends="$makedepends_build $makedepends_host"
-checkdepends=
-provides="/bin/sh"
+checkdepends="zip"
 install=
 subpackages=
 options="!check"
@@ -26,38 +25,36 @@ _openrc_files="acpid.initd
 _mdev_openrc_files="mdev.initd"
 
 source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
-	0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
-	0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
-	0001-properly-fix-wget-https-support.patch
-	0001-modutils-check-ELF-header-before-calling-finit_module.patch
-	0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
-	0003-ash-exec-busybox.static.patch
-	0004-app-location-for-cpio-vi-and-lspci.patch
-	0005-udhcpc-set-default-discover-retries-to-5.patch
-	0006-ping-make-ping-work-without-root-privileges.patch
-	0007-fbsplash-support-console-switching.patch
-	0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
-	0009-depmod-support-generating-kmod-binary-index-files.patch
-	0010-Add-flag-for-not-following-symlinks-when-recursing.patch
-	0012-udhcpc-Don-t-background-if-n-is-given.patch
-	0013-ash-fix-unsafe-use-of-mempcpy.patch
-	0014-ash-fix-use-after-free-in-bash-pattern-substitution.patch
-	0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch
-	0016-ash-don-t-read-past-end-of-var-in-subvareval-for-bas.patch
-	0017-ash-Fix-use-after-free-on-idx-variable.patch
-	0018-ash-fix-ifs-cleanup-on-error-paths.patch
-
-	0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
-
-	0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch
-
-	0001-avoid-redefined-warnings-when-building-with-utmps.patch
-
-	0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch
-	0002-nslookup-sanitize-all-printed-strings-with-printable.patch
-	0001-modinfo-add-k-option-for-kernel-version.patch
-	CVE-2022-30065.patch
-	0001-sed-check-errors-writing-file-with-sed-i.patch
+	0001-modutils-check-ELF-header-before-calling-finit_modul.patch
+	0002-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
+	0003-ash-add-built-in-BB_ASH_VERSION-variable.patch
+	0004-Avoid-redefined-warnings-when-buiding-with-utmps.patch
+	0005-libbb-sockaddr2str-ensure-only-printable-characters-.patch
+	0006-modinfo-add-k-option-for-kernel-version.patch
+	0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
+	0008-pgrep-add-support-for-matching-against-UID-and-RUID.patch
+	0009-properly-fix-wget-https-support.patch
+	0010-sed-check-errors-writing-file-with-sed-i.patch
+	0011-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
+	0012-nslookup-sanitize-all-printed-strings-with-printable.patch
+	0013-ash-exec-busybox.static.patch
+	0014-app-location-for-cpio-vi-and-lspci.patch
+	0015-udhcpc-set-default-discover-retries-to-5.patch
+	0016-ping-make-ping-work-without-root-privileges.patch
+	0017-fbsplash-support-console-switching.patch
+	0018-fbsplash-support-image-and-bar-alignment-and-positio.patch
+	0019-depmod-support-generating-kmod-binary-index-files.patch
+	0020-Add-flag-for-not-following-symlinks-when-recursing.patch
+	0021-udhcpc-Don-t-background-if-n-is-given.patch
+
+	0023-tests-fix-tarball-creation.patch
+	0024-tests-musl-doesn-t-seem-to-recognize-UTC0-as-a-timez.patch
+	0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
+	0026-lineedit-Handle-SIGWINCH-gracefully.patch
+	0027-umount-Implement-O-option-to-unmount-by-mount-option.patch
+	0028-ash-use-after-free-in-bash-pattern-substitution.patch
+	0029-awk-fix-use-after-realloc-CVE-2021-42380-closes-1560.patch
+	0030-shell-avoid-segfault-on-0-0-0-09J-.-Closes-15216.patch
 
 	acpid.logrotate
 	config
@@ -189,45 +186,46 @@ EOF
 }
 
 sha512sums="
-62b2e718b6669271380445ed6db249618d777a4e8d5e6d879fa39ffee43887b6a2e93ceef874c615c565ad492deb772b03a19b7475c403202741579fb151e16a  busybox-1.35.0.tar.bz2
-ead3403578c071c2216de17ab0543984c1f1509c12c062f03af49141547c3ea21356f3e8f0f0695550f05a41a1379dd73fc3cc18dcd78addbb411f247351e353  0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
-a2787a3ecaf6746dadef62166e8ee6ecaa166147e5ad8b917c5838536057c875bab5f9cf40c3e05eba74d575484ac662929ac3799d58432d3a99ac46f364f302  0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
-1efe1c4894ae983fed5ac848125f8603f157b9d91c952c53f4192b48d3e50967e05559851148397b583f34fb02d480393547904b4635e4248248be567ab268ea  0001-properly-fix-wget-https-support.patch
-0cac9b944928500293e366b42e03211d4159d05b622da60664825e5ee87c9bf6d5a8ea5e794584713f7464efb4cdc431e02f439c717b7e62b1864a228bc8cbac  0001-modutils-check-ELF-header-before-calling-finit_module.patch
-d8694293edc8cd55cecafeb902f03c01af318e13966f399365cf792b840793891ac086bb67ef83e7a5a2e01b246497a6c6511cb6a856834f6672dee4bca76896  0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
-8c34dd5ce9a6e84279fa6494cbae0b254778976f341af1d0ccc2a3afb405fb22d374e9623ea83d1500da77c7463db2ed5218d2c9f49350a21114bd0bb17fd87d  0003-ash-exec-busybox.static.patch
-f9745497abd4d04621f089c62d9f2104c30d54f342125f597292253f2974d385c5f4a46e7d87a5d1b641b11b34ba5221183dd5dad1e3bbe74a787fb8d6a994b7  0004-app-location-for-cpio-vi-and-lspci.patch
-f12916e70f7cc1ef4f6d85d09b9a496a52a494e6318029fdce9a9c812ab5c7b2a046c33b66834127bf809f243c91a53c3c5e27efca026a96fe6b03421de26e60  0005-udhcpc-set-default-discover-retries-to-5.patch
-89215c328a46afc686c458a133dd88dcda817586df60eb041a694715e73dc78a297fc0f9a92e8ee7d0a39ce7f6053a6b8e38f3ee078ff90ed13fac2608510105  0006-ping-make-ping-work-without-root-privileges.patch
-7873b98c676a92faea61511d50c1efac1220354d20afd53de19e2c8f1472559cb333b9dd4e0d6432616d8c5f59885f1503c448c86a912e8031c9bfed628c2db1  0007-fbsplash-support-console-switching.patch
-2c56906dac70dea6276e4c573707cb06c4c8b53defcd33b1e5a28f928e7dafe905a52ce40571de430e4af7e00a75ecc0f249d2fec02da5f3d9edd4e904919a35  0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
-df02adb3e3cd3349cc8d070911e3392164cb2e30bd72cae7ceaa974b2db6f958fdcedf809abc7b4bee37c729a4d20abf127f615b0e238a667d572137abe6a79e  0009-depmod-support-generating-kmod-binary-index-files.patch
-ecbe5c890d966f09280c7eb534109f785c68e292765f17ed7ff62fcc61d20f61443c4155add0a1ebfb67ce8564e104c1aa22a8ef0400e119b0bca2bca3671f2d  0010-Add-flag-for-not-following-symlinks-when-recursing.patch
-3ae5ecf3ea66c8d98762432026806fdb67b13a28075c6a3cb6e811a34ef89c2f0ed651946003aaad97fb4b7f74d132af3c394c114b7a72e1d20b319b739c5a6e  0012-udhcpc-Don-t-background-if-n-is-given.patch
-6b1ebc6da26c355a63c166f4c8d1774e7a9c5456ec76b773395a2158cb4848cf245fa5553843666c0a46f4c97d03e08815abae777f2b80bbb69d916618f94761  0013-ash-fix-unsafe-use-of-mempcpy.patch
-3eb7609054fa8e03d7e366f7debc5cb0630ff65d521a91be84803bdef3854f81e29d26a9567c501a121e94a55d3a3477894e774508f80def775f2ecc812805e7  0014-ash-fix-use-after-free-in-bash-pattern-substitution.patch
-0040800382a6e3adcc6a8094b821488c7e297fc80304afba23a4fca43b7b26ac699378dfbd930ebbf9985336b3e431301f7ca93e2d041a071902a48740d263ef  0015-ed-don-t-use-memcpy-with-overlapping-memory-regions.patch
-4c95dc4bf6aff9018bfb52b400f6d8375a1d22493b44ea516cb12dba6556f12797a3cba55768d2e59ff57c0f3247ec1ff95edb8f17561f3d37ec18d83ca47eb0  0016-ash-don-t-read-past-end-of-var-in-subvareval-for-bas.patch
-ccdf098fb15eaa316708181469a1193d6eec7067131e7b7645e0219bf03cfd07f4f79e8f62c1e560f6146dcc38186a29bdee08aaa39f290e11d020b8f07d2f65  0017-ash-Fix-use-after-free-on-idx-variable.patch
-3abdbd25f1f0daa24b0aabe92880c28dc2d3b59eb29fad357dfaf2b78bb895466bbf4495e2185370d9219d65b22e65e525769e369e50fb1fdfd71b5229a4f429  0018-ash-fix-ifs-cleanup-on-error-paths.patch
-6d100fe44da2b97c2cbdda253d0504b487212d195144d9315cddbe8c51d18fae3745701923b170b40e35f54b592f94f02cadbffd9cb716661c12a7f1da022763  0001-ash-add-built-in-BB_ASH_VERSION-variable.patch
-e33dbc27d77c4636f4852d5d5216ef60a9a4343484e4559e391c13c813bf65c782b889914eff2e1f038d74cf02cb0d23824ebbb1044b5f8c86260d5a1bbc4e4d  0001-pgrep-add-support-for-matching-against-UID-and-RUID.patch
-7608fbb9deddc9268ba53bc5b762a00fa16744d595f6f8a2f5a857339e754ea0c3da084a1e48269c8281553e9171d2bb29b8530fbe85e6a934f97c3cfcdbe31b  0001-avoid-redefined-warnings-when-building-with-utmps.patch
-b52050678e79e4da856956906d07fcb620cbf35f2ef6b5a8ee3b8d244ea63b4b98eef505451184d5b4937740d91eef154ed748c30d329ac485be51b37626f251  0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch
-ead4ad65d270d8659e1898fa16f76b6cbcf567d8aba238eacccda3764edb4362240d9359d6389873bedc126d405f805fc6dfce653a7181618ebcc67c94bd08d2  0002-nslookup-sanitize-all-printed-strings-with-printable.patch
-4f6ddd59d6096943f617b0938fca428114190b8b37732d6783faab291451a2c30c452ed39299db22d1d9679d007022f87d43e93b38a4f6ced64a8659e9233773  0001-modinfo-add-k-option-for-kernel-version.patch
-22e2fa8f7a6105fd9990f93b71c235980fd4eab62269939a0e3a920fe517ee4f913c6bd0148a554b67fe01d1660bf0fd76a80e9dcac290b4b8b2c304ef6080a9  CVE-2022-30065.patch
-d1a2fcbf9de623531953e7ad869e41e896aa79a0917983e6f0d20ddf7393e11220dda8be93c796b7abbf34006d8f03e871a6ab293988267df5aadb74cbd8aeb1  0001-sed-check-errors-writing-file-with-sed-i.patch
+8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4  busybox-1.36.1.tar.bz2
+17249174b24ba77b6138d640eee4eebcda567a86656623122d8b31044a762ea472096c406d70ba1a1f79450236fa259d4f46c363fa25db6cc4d44950e7a4b223  0001-modutils-check-ELF-header-before-calling-finit_modul.patch
+7ebb1ab462083564d2ace3e5719464326b91a40cfcf6117de4b393d3f01ed7acd37a583725323dce4220e255ba742428e0160072a90e4d566b4d7053d1f4a37f  0002-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
+f7caad3ef18db7de6deff0fb7b7a7e82fff613d4245f334b56a11e982c40ebcfc6160c235e49d0b4fa7d39b58c0e4924e14473a3770a66d1ef7d4df379b6d858  0003-ash-add-built-in-BB_ASH_VERSION-variable.patch
+383cbc2f2f644dc34678d145ea27696a7fa7f46b8952a3448de78d516cb0452872abbc37cb3dcf2b6725c6f7675b972554404b462dec377a8e61c3b73c1cd890  0004-Avoid-redefined-warnings-when-buiding-with-utmps.patch
+ce30a642e6804827ef4f7e453d162747143a52dc905950998e996d84767d19548bbbd51bd25530575670c5942137f6926e3cb6f8668e7410569d695bb4165170  0005-libbb-sockaddr2str-ensure-only-printable-characters-.patch
+fa0c2f58e5bb8f646bc8451ce00375d860ded228fb7ec4ed61e3920e41990822be1fcdd8cdf9c0342318ba263516a71a837549a9bf52875b1ba652fbc7c54f92  0006-modinfo-add-k-option-for-kernel-version.patch
+7313809f283d68521308f7178f6d6e458ee5c826f4c50f40a4595c7a71042d0fe83d938ad2af08e95cbfbc7c0c690fb6c2b2578c2f3e41055bf06bc5cc22d2f2  0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
+24b57ec15205a006310096c63829c8e09820aa8a816a9652bbf9f90efc3e6d28893be1d917deac9793121cd9cca811773272776ead121cc30e9e77cbe904cbcd  0008-pgrep-add-support-for-matching-against-UID-and-RUID.patch
+63dae6bf0adb2def1436bed2bcd6ea889bbf666799a8282345e6a4bbf2b567732456fdb20439df870ead5bf242ce2b403170075429b951c5fdf53c134c9e9ef3  0009-properly-fix-wget-https-support.patch
+7fea95c4d686b4f5cc5d86b3f5e0df246767b2f86349d36a9596c05af10e7d616edaee2597bcbe96c73b8d307ca6286d276308dce52b881085e67eaaa2b23542  0010-sed-check-errors-writing-file-with-sed-i.patch
+2ddf584e1e960a45675e08f6bd4e61a80251bed0fe76ad968b79f4a15d0da89039a3ca62ee6f9605c56ca7e86d8c5696e8ec235acb90bed0998073fef1a4b2dd  0011-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
+05b00a98c2d5a2cab89bb6b6b80a39cea5fc2f5ea27589d39232fb2f8b85e2fca78cef84f55de202702274c1c7f7802dd04497a212834ae931297767a9186dc9  0012-nslookup-sanitize-all-printed-strings-with-printable.patch
+85d85dcf1fc9c54ed7cbb7ffac36971b6d0a1024e7b6df7fcdccb7e3832bf6b1fa0b0d2e2b7990d0154b752af35a9e8b9b815e244226a9d190c56bf09e9094eb  0013-ash-exec-busybox.static.patch
+42a61fa7ad5eeb757f1985331d10ac3a9977aeed8add0eff16aba3da20be0b0e19ed4b9544b6efa75c31d481af5353d7a9707750f5dcb99975f40591bed49a03  0014-app-location-for-cpio-vi-and-lspci.patch
+a4a440645f1e8be9b1a92d8611190425e339049cf3e21e837f41b348796b3bb81c4369846d837359e7fbc74a32c34cea7e6924d77ca0865550c84f47fd73a1de  0015-udhcpc-set-default-discover-retries-to-5.patch
+c1c522487cde86f73efb4800f610d54674d3fa381a0266598cf6c1b002b2b18be9011014b26d5d5ab82c22f6a9eaa920f32cfbb956790880497ff4316c26a64d  0016-ping-make-ping-work-without-root-privileges.patch
+a9f7dd37b2722265089b39d24d47e9c4911ff1e31f9dd1c3d5ba49bca7656f3fd2b42dcfd2f837ba5ae6b850dd1b02bb6af9a97a3980fe098daf1c20fb2a4630  0017-fbsplash-support-console-switching.patch
+5653c818400c38966726adf1c99b603f6f760179a291c13b5320b79e0ef63d1ad9251b276d6eed68a6b8c95bfabd95eccce9d73edbc2ea888b994d6a02763050  0018-fbsplash-support-image-and-bar-alignment-and-positio.patch
+ce4316e44148562addc1f5839166ca9314ee6f26dae218617c287791a8d9239e374f993688a9299e24c9a237e4c21e481a0b35baa4e8b123ce9e2b23d065001c  0019-depmod-support-generating-kmod-binary-index-files.patch
+80c426dc2ea6cafa359a078a4a283735db0b3611a6c953ee7b7b2ec00c41a1263b61085c37447fcc50a01c229db93fa8fa675b8c995040eb31e9ed6f3723a0cf  0020-Add-flag-for-not-following-symlinks-when-recursing.patch
+22c1d3233b210b8a334f31101eb6ff15d276eaef009758cff57a642b660ebe38114d7f3c8055113f12d6620acc8a8f0a2fe51dbede9100cd3d0eb5cdd2d01e39  0021-udhcpc-Don-t-background-if-n-is-given.patch
+923c29b050f456210fbb06d72c77f53eff2179757e8595a8e9cd1ad3f1d4d300c525bec88de3170fa16dbe6a0ea498cdf01ab5a20a289af913ca05b27abab27d  0023-tests-fix-tarball-creation.patch
+192fe9b535b3ae4cfbd8455d642e9c73b134ddbdf9265b3ebd1a185122bbb1064cf2c1f01840a8cf35d0665969846ff7168c215fdce96b46b031d73c16f7622f  0024-tests-musl-doesn-t-seem-to-recognize-UTC0-as-a-timez.patch
+0a0e4c425879d8250b4dee925dc9feb2595ed68b1fdb5c22e78f3452e46dc17c882ea47f119c2308915f4105b69e5c6f38156131bee1fe9ba0ff684bfd10a049  0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
+09358ed36d6c13a50119a9d96898fdc2d3e6ca089659780604425ae3d32960a17c3083de81a131b1cf9a9a2b449e40a8ed6af3a8b916247571ebc41765ab365b  0026-lineedit-Handle-SIGWINCH-gracefully.patch
+e3670ab567818a42593698546dcdabaa447c10682261c128901b4390eb2bf2dbea9e84f8f2dcdd6d67c82bf93bb1eed14406e5a8dd723b4670d1995b6100651f  0027-umount-Implement-O-option-to-unmount-by-mount-option.patch
+d3bd84c42487de573c0c5165a847fd233ddcd4d53a61b1e03c30a46b6dba3993e741f12daf167b8347fb7a420b188f4027582f16e92dc822eb3293804dfc62f8  0028-ash-use-after-free-in-bash-pattern-substitution.patch
+5f8c1a848f28aff2b28085950c561e1a51dfcea043da455e3daf9b960025dd8789ecfe43370553cb727d4ec239aa23c42e3ae5f6ef1cd5768d69c80c31b8f39e  0029-awk-fix-use-after-realloc-CVE-2021-42380-closes-1560.patch
+28748a431718f270b2d0023d09f059e6a32501afb9fd243c4b127fec28bc9312ffb7fdcc1563544a2cb29bed66383ecfea7957d557f7b21402ec3bdb6938004f  0030-shell-avoid-segfault-on-0-0-0-09J-.-Closes-15216.patch
 aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1  acpid.logrotate
-3265cb4489feae24b253ddeee2f74814b96017027d80dfeb5ba324a3a938faef445ce148e9efc7ec1f5898346254abcfc9627924ee348514be3c9697dc473baf  config
-e063599f412df919b75584fee9501925418ef21689232792e9d61178f4e34a65c3cff8a3b1b4cf3e5be61efea2065cc303db35c53ec07b361d3a65e888247544  default.script
-dd548670114a92404b8e35fb915fdbe5994498b05b0a418583271c3dd72fb7800950e42c095c902a014eb198c046b8a346d43dccd8e7a158048ae33767c572ed  acpid.initd
+b1e13a736eaf8a621b648d97c2526fe72215a5bfb13277a58c7d631bcee08cbcea20dd3d11ea8a97e545ec137adc41bd75f5f6dcbcfae96934fe6b3d14c94b46  config
+6c1d25c733fd9ac6ba7d3c7f474c836fbfd41d8f1753ec9c21c08d57cd6249023a0b16f81da4d2ec5d56d14509f7ba1fffadf691504f0670f90017aaf1ed564b  default.script
+fcb532233fd7ba8cad302d037b88cff00ee8b96b37c90b34fc823479208cf7cdda48818c972ce2c4703b7283fd58e99ba8a724818f884f3b09eaa7e2d6ffad21  acpid.initd
 34c6f3197064bb91619b899b28a201bd4d920b18bded3845440b2cb36dc6f16cabf447c96878349b16e46c30184cbe48bac00a01c5f7cf1be038c0b7136064c5  crond.confd
-c9d0fb0f8cc27d661d3b4e58c56eb598ca368890576e18ffffd42efdf68ba35537656be9be319b2e2818aa0152d3ca8611bece2433512fbfcd4eed7988765549  crond.initd
+f3a104095c659eef79925e8df850cdac499f6c7756fb9647088a24b98dc72f37413c3869da6113bcc578c2178c1c2e5ab8d31a50ad2e472c06aaf408e8924d6a  crond.initd
 23ef7f32447f239b617d5ae221b024c7b47ca4faa9a27f80a4a6a473fd148cb4339a728fee3bb55ce67d531a141ec07c66dca533138652058d3a6a936b68d3c7  defaults.initd
 bf8173ee33a5d2b61cbdbc1b070e599a17a21e5433a0d8aa9beef71e4ac831304076af8e7e58dc594cdee61562329793afdc57af91e5496bf5fffb9b734a3d9c  syslog.confd
-acfd45bda4526ab551a30faec1742ad1569aa85e0d315959c3e3a3d6a693f94c74efeb57a00b8791524651e8a61d3f7ea3e3e08a4b0291ec46309f594ee8124c  syslog.initd
+a13a6add6f7fb10a3a2563391b6f8b68161249147e9f50e6d857c5689123f6d974368ce4f13b8d93312fa38d05f604d67c4c976d8a7eef301af50a3a6ad50c23  syslog.initd
 2947b23728d3ad6839f660fee11fc4c86d0d1a3fc450ceff85480932b0699e7b7293eb7258cf0e957542ed3c7a4416376ebb284992e6682aede61f48069b1043  udhcpd.confd
-1d4574ec7cc6d7e9952bb50b4fcb10a910868688da03a25aede492835313c686247bde1faa17f50243d61a93bfc1d8fa54cf821d7be908581e365b0f1b6a5588  udhcpd.initd
+4a8d1e924284fca730a262fedc3cb76b4f4689a6c650b0c5544b65eeab6cfd9e8eb91f448d9ebbba6efbb056695428c1b26e5eaeb7233bae090676d1789954cc  udhcpd.initd
 6ce0b2a8fe69cc7ea657c5b9076aba51c8f0beeaafa4a887d8673bcc9f9cf8ee40f4b07d2d901ec7a1a1e4f29c150c496559559e803595d0bd487dec56b530a2  mdev.initd
 "
diff --git a/aports/busybox/CVE-2022-30065.patch b/aports/busybox/CVE-2022-30065.patch
deleted file mode 100644
index 4a9cd67..0000000
--- a/aports/busybox/CVE-2022-30065.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 3c284dcb726ff6599d3b87fb366fb04411cf5595 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 17 Jun 2022 09:52:11 +0000
-Subject: [PATCH 1/2] awk: fix use after free (CVE-2022-30065)
-
-fixes https://bugs.busybox.net/show_bug.cgi?id=14781
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- editors/awk.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/editors/awk.c b/editors/awk.c
-index 079d0bde5..728ee8685 100644
---- a/editors/awk.c
-+++ b/editors/awk.c
-@@ -3128,6 +3128,9 @@ static var *evaluate(node *op, var *res)
- 
- 		case XC( OC_MOVE ):
- 			debug_printf_eval("MOVE\n");
-+			/* make sure that we never return a temp var */
-+			if (L.v == TMPVAR0)
-+				L.v = res;
- 			/* if source is a temporary string, jusk relink it to dest */
- 			if (R.v == TMPVAR1
- 			 && !(R.v->type & VF_NUMBER)
--- 
-2.36.1
-
-
-From 30c8f8e69230ef27f116a2c10ca2e4a6cc343dad Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 16 Jun 2022 21:54:48 +0200
-Subject: [PATCH 2/2] awk: add tests for CVE-2022-30065
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- testsuite/awk.tests | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/testsuite/awk.tests b/testsuite/awk.tests
-index 93e25d8c1..6c3a03c37 100755
---- a/testsuite/awk.tests
-+++ b/testsuite/awk.tests
-@@ -479,4 +479,15 @@ testing 'awk backslash+newline eaten with no trace' \
- 	"Hello world\n" \
- 	'' ''
- 
-+testing 'awk use-after-free (CVE-2022-30065)' \
-+	"awk '\$3i\$3in\$9=\$r||\$9=i6/6-9f'" \
-+	"" \
-+	"" \
-+	""
-+
-+testing 'awk assign while test' \
-+	"awk '\$1==\$1=\"foo\" {print \$1}'" \
-+	"foo\n" \
-+	"" \
-+	"foo"
- exit $FAILCOUNT
--- 
-2.36.1
-
diff --git a/aports/busybox/acpid.initd b/aports/busybox/acpid.initd
index 2e73b77..ec31833 100644
--- a/aports/busybox/acpid.initd
+++ b/aports/busybox/acpid.initd
@@ -2,8 +2,9 @@
 
 name="busybox acpid"
 command="/sbin/acpid"
-command_args="$ACPID_OPTS"
-pidfile="/var/run/acpid.pid"
+command_args="$ACPID_OPTS -f"
+pidfile="/run/acpid.pid"
+command_background=true
 start_stop_daemon_args="-g wheel -k 027"
 
 depend() {
diff --git a/aports/busybox/config b/aports/busybox/config
index 953b502..efab056 100644
--- a/aports/busybox/config
+++ b/aports/busybox/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.35.0
-# Sat Jun 25 18:59:59 2022
+# Busybox version: 1.36.1
+# Sat Jul 29 21:11:24 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
+CONFIG_SHA1_SMALL=3
+CONFIG_SHA1_HWACCEL=y
+CONFIG_SHA256_HWACCEL=y
 CONFIG_SHA3_SMALL=1
 CONFIG_FEATURE_NON_POSIX_CP=y
 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
@@ -123,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
+# CONFIG_LOOP_CONFIGURE is not set
+# CONFIG_NO_LOOP_CONFIGURE is not set
+CONFIG_TRY_LOOP_CONFIGURE=y
 
 #
 # Applets
@@ -338,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
 CONFIG_TRUE=y
 CONFIG_TRUNCATE=y
+CONFIG_TSORT=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
 CONFIG_UNAME_OSNAME="GNU/Linux"
@@ -828,10 +835,12 @@ CONFIG_FEATURE_LESS_ENV=y
 CONFIG_RFKILL=y
 CONFIG_RUNLEVEL=y
 # CONFIG_RX is not set
+CONFIG_SEEDRNG=y
 # CONFIG_SETFATTR is not set
 # CONFIG_SETSERIAL is not set
 # CONFIG_STRINGS is not set
 CONFIG_TIME=y
+CONFIG_TREE=y
 # CONFIG_TS is not set
 # CONFIG_TTYSIZE is not set
 # CONFIG_UBIATTACH is not set
@@ -1004,6 +1013,7 @@ CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default6.script"
 CONFIG_UDHCPC6=y
 CONFIG_FEATURE_UDHCPC6_RFC3646=y
 CONFIG_FEATURE_UDHCPC6_RFC4704=y
@@ -1138,6 +1148,7 @@ CONFIG_ASH_MAIL=y
 CONFIG_ASH_ECHO=y
 CONFIG_ASH_PRINTF=y
 CONFIG_ASH_TEST=y
+CONFIG_ASH_SLEEP=y
 CONFIG_ASH_HELP=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
diff --git a/aports/busybox/crond.initd b/aports/busybox/crond.initd
index afaf384..87febb1 100644
--- a/aports/busybox/crond.initd
+++ b/aports/busybox/crond.initd
@@ -2,8 +2,9 @@
 
 name="busybox $SVCNAME"
 command="/usr/sbin/$SVCNAME"
-pidfile="/var/run/$SVCNAME.pid"
-command_args="$CRON_OPTS"
+pidfile="/run/$SVCNAME.pid"
+command_args="$CRON_OPTS -f"
+command_background=true
 
 depend() {
 	need localmount
diff --git a/aports/busybox/default.script b/aports/busybox/default.script
index a00a303..cbc4179 100644
--- a/aports/busybox/default.script
+++ b/aports/busybox/default.script
@@ -117,7 +117,7 @@ resolvconf() {
 		echo "nameserver $i" >> "$RESOLV_CONF.$$"
 	done
 	chmod a+r "$RESOLV_CONF.$$"
-	mv "$RESOLV_CONF.$$" "$RESOLV_CONF"
+	mv -f "$RESOLV_CONF.$$" "$RESOLV_CONF"
 }
 
 udhcpd_conf() {
diff --git a/aports/busybox/syslog.initd b/aports/busybox/syslog.initd
index 629d868..3b20345 100644
--- a/aports/busybox/syslog.initd
+++ b/aports/busybox/syslog.initd
@@ -4,8 +4,9 @@ description="Message logging system"
 
 name="busybox syslog"
 command="/sbin/syslogd"
-command_args="${SYSLOGD_OPTS}"
-pidfile="/var/run/syslogd.pid"
+command_args="${SYSLOGD_OPTS} -n"
+pidfile="/run/syslogd.pid"
+command_background=true
 start_stop_daemon_args="-g wheel -k 027"
 
 depend() {
diff --git a/aports/busybox/udhcpd.initd b/aports/busybox/udhcpd.initd
index 02c7620..e4dabd5 100644
--- a/aports/busybox/udhcpd.initd
+++ b/aports/busybox/udhcpd.initd
@@ -1,9 +1,10 @@
 #!/sbin/openrc-run
 
-name="busybox $SVCNAME"
-command="/usr/sbin/$SVCNAME"
-command_args="$UDHCPD_OPTS "
-pidfile="/var/run/$SVCNAME.pid"
+name="busybox $RC_SVCNAME"
+command="/usr/sbin/$RC_SVCNAME"
+command_args="$UDHCPD_OPTS -f"
+pidfile="/run/$SVCNAME.pid"
+command_background=true
 
 depend() {
 	need net
diff --git a/aports/forwarding/APKBUILD b/aports/forwarding/APKBUILD
index 5115aa9..1c28f9f 100644
--- a/aports/forwarding/APKBUILD
+++ b/aports/forwarding/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=forwarding
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Forwarding management service for Wifibox"
 url="https://github.com/pgj/freebsd-wifibox-alpine"
 arch="all"
diff --git a/aports/hostapd/APKBUILD b/aports/hostapd/APKBUILD
index 3e767b9..68fc159 100644
--- a/aports/hostapd/APKBUILD
+++ b/aports/hostapd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gabor Pali <pali.gabor@gmail.com>
 pkgname=hostapd
 pkgver=2.10
-pkgrel=2 # base: 5
+pkgrel=3 # base: 6
 pkgdesc="daemon for wireless software access points"
 url="https://w1.fi/hostapd/"
 arch="all"
@@ -62,6 +62,7 @@ prepare() {
 			-e '/^#CONFIG_LIBNL32=y/s/^#//' \
 			-e '/^#CONFIG_ACS=y/s/^#//' \
 			-e '/^#CONFIG_WEP=y/s/^#//' \
+			-e '/^#CONFIG_SAE=y/s/^#//' \
 			defconfig
 
 		echo "CC ?= ${CC:-gcc}"
diff --git a/aports/ifupdown-ng/01-add-onlink-to-default-route.patch b/aports/ifupdown-ng/01-add-onlink-to-default-route.patch
new file mode 100644
index 0000000..e663cdf
--- /dev/null
+++ b/aports/ifupdown-ng/01-add-onlink-to-default-route.patch
@@ -0,0 +1,30 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Wed,  4 Jan 2023 00:23 +0000
+Subject: [PATCH] for static executor add "onlink" option to default route
+
+Add the "onlink" next-hop option to the default route. This is required
+for situations like some VPS/Cloud Providers where they provide a /32 IPv4
+address or a /128 IPv6 address and obviously the router to use as the gateway
+for the default route is not in the same subnet.
+
+The ifupdown package has been adding the "onlink" option for the past 7
+years when Debian added it:
+
+https://salsa.debian.org/debian/ifupdown/-/commit/8b7bca9597d2f75670b182f0fc149cdbaec3544c
+
+This patch has been submitted upstream to ifupdown-ng as PR #207.
+
+---
+
+diff -aur a/executor-scripts/linux/static b/executor-scripts/linux/static
+--- a/executor-scripts/linux/static
++++ b/executor-scripts/linux/static
+@@ -33,7 +33,7 @@
+ configure_gateways() {
+ 	for gw in ${IF_GATEWAYS}; do
+ 		addrfam=$(addr_family ${gw})
+-		${MOCK} ip "${addrfam}" route add default via "${gw}" ${VRF_TABLE} ${METRIC} dev "${IFACE}"
++		${MOCK} ip "${addrfam}" route add default via "${gw}" ${VRF_TABLE} ${METRIC} dev "${IFACE}" onlink
+ 	done
+ }
+ 
diff --git a/aports/ifupdown-ng/APKBUILD b/aports/ifupdown-ng/APKBUILD
index 2881383..a523fa4 100644
--- a/aports/ifupdown-ng/APKBUILD
+++ b/aports/ifupdown-ng/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ifupdown-ng
 pkgver=0.12.1
-pkgrel=0 # base: 1
+pkgrel=1 # base: 2
 pkgdesc="tools for managing network configuration"
 url="https://github.com/ifupdown-ng/ifupdown-ng"
 arch="all"
@@ -12,9 +12,10 @@ makedepends=
 install=""
 subpackages=
 source="https://distfiles.dereferenced.org/ifupdown-ng/ifupdown-ng-$pkgver.tar.xz
+	01-add-onlink-to-default-route.patch
 	no-examples.patch
 	interfaces
-"
+	"
 builddir="$srcdir/ifupdown-ng-$pkgver"
 provides="ifupdown-any"
 provider_priority=900
@@ -36,6 +37,7 @@ package() {
 
 sha512sums="
 c2c1e27fbd53eeb4150e544a893352f13845b491850e982a5880160c3be03b628794f7989c802ff823ac3e8c6c34dc4ab97c0abcefdda85f06fcd64ced8ac60c  ifupdown-ng-0.12.1.tar.xz
+5a4900356cf4ea48d5088d98328cf3f8a821a52a3b9518987a6432fc1349c3a314bbe20d46736ec8781e2a675398e15183c1ab8c0ba617c3e49b164fbbb48baf  01-add-onlink-to-default-route.patch
 e261fd3f185372bf8f2075216b9dd3e2d8090e978654ee742122ee7869017d309eac54b1415e79878015f312a39fa8fdd4b0d8c2bed8515e5a94c15da1b7b844  no-examples.patch
 cde5422ed19c79f970b24fde267f9bef34f069f806e7ed671fb443df6ff169e81791baaeebbe02595218f30224add65dabfd0337f9984d2387965001872a1038  interfaces
 "
diff --git a/aports/iptables/APKBUILD b/aports/iptables/APKBUILD
index f6ed3cc..5e6f907 100644
--- a/aports/iptables/APKBUILD
+++ b/aports/iptables/APKBUILD
@@ -1,24 +1,22 @@
 # Maintainer: Gabor Pali <pali.gabor@gmail.com>
 
 pkgname=iptables
-pkgver=1.8.8
+pkgver=1.8.9
 pkgrel=0 # base: 2
 pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
 url="https://www.netfilter.org/projects/iptables/index.html"
 arch="all"
 license="GPL-2.0-or-later"
 makedepends="libnftnl-dev bison flex autoconf automake"
-source="https://www.netfilter.org/projects/iptables/files/iptables-$pkgver.tar.bz2
+source="https://www.netfilter.org/projects/iptables/files/iptables-$pkgver.tar.xz
+	format-security.patch
 	use-sh-iptables-apply.patch
-	fix-xtables.patch
-	fix-u_int16_t.patch
 	iptables.initd
 	iptables.confd
 	ip6tables.confd
 	"
 
 build() {
-	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	./configure \
 		--build="$CBUILD" \
 		--host="$CHOST" \
@@ -39,7 +37,7 @@ build() {
 }
 
 package() {
-	make -j1 install DESTDIR="$pkgdir"
+	make install DESTDIR="$pkgdir"
 
 	rm -rf "$pkgdir"/tmp \
 		"$pkgdir"/usr/bin \
@@ -59,10 +57,9 @@ package() {
 }
 
 sha512sums="
-f21df23279a77531a23f3fcb1b8f0f8ec0c726bda236dd0e33af74b06753baff6ce3f26fb9fcceb6fada560656ba901e68fc6452eb840ac1b206bc4654950f59  iptables-1.8.8.tar.bz2
+e367bf286135e39b7401e852de25c1ed06d44befdffd92ed1566eb2ae9704b48ac9196cb971f43c6c83c6ad4d910443d32064bcdf618cfcef6bcab113e31ff70  iptables-1.8.9.tar.xz
+9501cd8572d37a680d46ee0b1e95ede3b3d79ff5e347ca32afb0e5e16b3717ed085c96d2214a3b2e08e10619c3295561d86e18089f18026b7ef20daeeb094587  format-security.patch
 ac78898c2acbe66ed8d32a06f41ff08cde7c22c3df6dfec6bc89a912d2cef2bde730de19d25a5407886d567cb0972a0b7bde7e6b18a34c4511495b4dad3b90ad  use-sh-iptables-apply.patch
-ce8c4ff001be49b77bb82efc3cb8b9f3c8f8684abcb07d079c6a00fab5c7a22e0d7f66f8ccdf3aab63d8fdb2b01b249679a89561e2f723111c8ce4075681b134  fix-xtables.patch
-015ca550cf27802446d74521b7618095a342663d4fd73700975f3186428ecdc9eec27016f4d40862d3837cbbe0bb43509c1022b19ef8692ab28cc24e18831d57  fix-u_int16_t.patch
 a37c17a5382c756fcfb183af73af2283f0d09932c5a767241cbab5d784738f6f587f287a0cdf13b4fa74724ecd3a2063a9689ccee84c1bda02e730f63480f74d  iptables.initd
 85bb1660c2452fdede5ae0a483489a3648a8b327ea658839a1ad8c6405f6526bdf842a62d4df3f6e3cbbb9ad59137d37b39266cee21e252814191964d4c50f44  iptables.confd
 0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4  ip6tables.confd
diff --git a/aports/iptables/fix-u_int16_t.patch b/aports/iptables/fix-u_int16_t.patch
deleted file mode 100644
index 37b3950..0000000
--- a/aports/iptables/fix-u_int16_t.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From f319389525b066b7dc6d389c88f16a0df3b8f189 Mon Sep 17 00:00:00 2001
-From: Nick Hainke <vincent@systemli.org>
-Date: Mon, 16 May 2022 18:16:41 +0200
-Subject: treewide: use uint* instead of u_int*
-
-Gcc complains about missing types. Some commits introduced u_int* instead
-of uint*. Use uint treewide.
-
-Fixes errors in the form of:
-In file included from xtables-legacy-multi.c:5:
-xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
-    83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
-        |                                                        ^~~~~~~~~
-        |                                                        uint16_t
-make[6]: *** [Makefile:712: xtables_legacy_multi-xtables-legacy-multi.o] Error 1
-
-Avoid libipq API breakage by adjusting libipq.h include accordingly. For
-arpt_mangle.h kernel uAPI header, apply same change as in kernel commit
-e91ded8db5747 ("uapi: netfilter_arp: use __u8 instead of u_int8_t").
-
-Signed-off-by: Nick Hainke <vincent@systemli.org>
-Signed-off-by: Phil Sutter <phil@nwl.cc>
----
- extensions/libxt_conntrack.c              | 2 +-
- include/libipq/libipq.h                   | 8 ++++----
- include/libiptc/libxtc.h                  | 2 +-
- include/linux/netfilter_arp/arpt_mangle.h | 2 +-
- iptables/xshared.c                        | 2 +-
- iptables/xshared.h                        | 2 +-
- libipq/ipq_create_handle.3                | 2 +-
- libipq/ipq_set_mode.3                     | 2 +-
- 8 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
-index 64018ce1..234085c5 100644
---- a/extensions/libxt_conntrack.c
-+++ b/extensions/libxt_conntrack.c
-@@ -778,7 +778,7 @@ matchinfo_print(const void *ip, const struct xt_entry_match *match, int numeric,
- 
- static void
- conntrack_dump_ports(const char *prefix, const char *opt,
--		     u_int16_t port_low, u_int16_t port_high)
-+		     uint16_t port_low, uint16_t port_high)
- {
- 	if (port_high == 0 || port_low == port_high)
- 		printf(" %s%s %u", prefix, opt, port_low);
-diff --git a/include/libipq/libipq.h b/include/libipq/libipq.h
-index 3cd13292..dd0cb205 100644
---- a/include/libipq/libipq.h
-+++ b/include/libipq/libipq.h
-@@ -24,7 +24,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <fcntl.h>
--#include <sys/types.h>
-+#include <stdint.h>
- #include <sys/socket.h>
- #include <sys/uio.h>
- #include <asm/types.h>
-@@ -48,19 +48,19 @@ typedef unsigned long ipq_id_t;
- struct ipq_handle
- {
- 	int fd;
--	u_int8_t blocking;
-+	uint8_t blocking;
- 	struct sockaddr_nl local;
- 	struct sockaddr_nl peer;
- };
- 
--struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol);
-+struct ipq_handle *ipq_create_handle(uint32_t flags, uint32_t protocol);
- 
- int ipq_destroy_handle(struct ipq_handle *h);
- 
- ssize_t ipq_read(const struct ipq_handle *h,
-                 unsigned char *buf, size_t len, int timeout);
- 
--int ipq_set_mode(const struct ipq_handle *h, u_int8_t mode, size_t len);
-+int ipq_set_mode(const struct ipq_handle *h, uint8_t mode, size_t len);
- 
- ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf);
- 
-diff --git a/include/libiptc/libxtc.h b/include/libiptc/libxtc.h
-index 37010188..a1d16ef9 100644
---- a/include/libiptc/libxtc.h
-+++ b/include/libiptc/libxtc.h
-@@ -10,7 +10,7 @@ extern "C" {
- #endif
- 
- #ifndef XT_MIN_ALIGN
--/* xt_entry has pointers and u_int64_t's in it, so if you align to
-+/* xt_entry has pointers and uint64_t's in it, so if you align to
-    it, you'll also align to any crazy matches and targets someone
-    might write */
- #define XT_MIN_ALIGN (__alignof__(struct xt_entry))
-diff --git a/include/linux/netfilter_arp/arpt_mangle.h b/include/linux/netfilter_arp/arpt_mangle.h
-index 250f5029..8c2b16a1 100644
---- a/include/linux/netfilter_arp/arpt_mangle.h
-+++ b/include/linux/netfilter_arp/arpt_mangle.h
-@@ -13,7 +13,7 @@ struct arpt_mangle
- 	union {
- 		struct in_addr tgt_ip;
- 	} u_t;
--	u_int8_t flags;
-+	__u8 flags;
- 	int target;
- };
- 
-diff --git a/iptables/xshared.c b/iptables/xshared.c
-index a8512d38..9b5e5b5b 100644
---- a/iptables/xshared.c
-+++ b/iptables/xshared.c
-@@ -1025,7 +1025,7 @@ static const int inverse_for_options[NUMBER_OF_OPT] =
- };
- 
- void
--set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
-+set_option(unsigned int *options, unsigned int option, uint16_t *invflg,
- 	   bool invert)
- {
- 	if (*options & option)
-diff --git a/iptables/xshared.h b/iptables/xshared.h
-index 14568bb0..f8212988 100644
---- a/iptables/xshared.h
-+++ b/iptables/xshared.h
-@@ -80,7 +80,7 @@ struct xtables_target;
- #define IPT_INV_ARPHRD		0x0800
- 
- void
--set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
-+set_option(unsigned int *options, unsigned int option, uint16_t *invflg,
- 	   bool invert);
- 
- /**
-diff --git a/libipq/ipq_create_handle.3 b/libipq/ipq_create_handle.3
-index 11ef95c4..ebe46daa 100644
---- a/libipq/ipq_create_handle.3
-+++ b/libipq/ipq_create_handle.3
-@@ -24,7 +24,7 @@ ipq_create_handle, ipq_destroy_handle \(em create and destroy libipq handles.
- .br
- .B #include <libipq.h>
- .sp
--.BI "struct ipq_handle *ipq_create_handle(u_int32_t " flags ", u_int32_t " protocol ");"
-+.BI "struct ipq_handle *ipq_create_handle(uint32_t " flags ", uint32_t " protocol ");"
- .br
- .BI "int ipq_destroy_handle(struct ipq_handle *" h );
- .SH DESCRIPTION
-diff --git a/libipq/ipq_set_mode.3 b/libipq/ipq_set_mode.3
-index 0edd3c00..e206886c 100644
---- a/libipq/ipq_set_mode.3
-+++ b/libipq/ipq_set_mode.3
-@@ -24,7 +24,7 @@ ipq_set_mode \(em set the ip_queue queuing mode
- .br
- .B #include <libipq.h>
- .sp
--.BI "int ipq_set_mode(const struct ipq_handle *" h ", u_int8_t " mode ", size_t " range );
-+.BI "int ipq_set_mode(const struct ipq_handle *" h ", uint8_t " mode ", size_t " range );
- .SH DESCRIPTION
- The
- .B ipq_set_mode
--- 
-cgit v1.2.3
-
diff --git a/aports/iptables/fix-xtables.patch b/aports/iptables/fix-xtables.patch
deleted file mode 100644
index 657c821..0000000
--- a/aports/iptables/fix-xtables.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libxtables/xtables.c	2022-05-13 13:26:26.000000000 +0000
-+++ b/libxtables/xtables.c	2022-05-17 08:56:52.670556393 +0000
-@@ -45,7 +45,6 @@
- 
- #include <xtables.h>
- #include <limits.h> /* INT_MAX in ip_tables.h/ip6_tables.h */
--#include <linux/if_ether.h> /* ETH_ALEN */
- #include <linux/netfilter_ipv4/ip_tables.h>
- #include <linux/netfilter_ipv6/ip6_tables.h>
- #include <libiptc/libxtc.h>
diff --git a/aports/iptables/format-security.patch b/aports/iptables/format-security.patch
new file mode 100644
index 0000000..432aac9
--- /dev/null
+++ b/aports/iptables/format-security.patch
@@ -0,0 +1,31 @@
+Patch-Source: https://git.netfilter.org/iptables/patch/?id=ed4082a7405a5838c205a34c1559e289949200cc
+--
+From ed4082a7405a5838c205a34c1559e289949200cc Mon Sep 17 00:00:00 2001
+From: Phil Sutter <phil@nwl.cc>
+Date: Thu, 12 Jan 2023 14:38:44 +0100
+Subject: extensions: NAT: Fix for -Werror=format-security
+
+Have to pass either a string literal or format string to xt_xlate_add().
+
+Fixes: f30c5edce0413 ("extensions: Merge SNAT, DNAT, REDIRECT and MASQUERADE")
+Signed-off-by: Phil Sutter <phil@nwl.cc>
+---
+ extensions/libxt_NAT.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extensions/libxt_NAT.c b/extensions/libxt_NAT.c
+index da9f2201..2a634398 100644
+--- a/extensions/libxt_NAT.c
++++ b/extensions/libxt_NAT.c
+@@ -424,7 +424,7 @@ __NAT_xlate(struct xt_xlate *xl, const struct nf_nat_range2 *r,
+ 	if (r->flags & NF_NAT_RANGE_PROTO_OFFSET)
+ 		return 0;
+ 
+-	xt_xlate_add(xl, tgt);
++	xt_xlate_add(xl, "%s", tgt);
+ 	if (strlen(range_str))
+ 		xt_xlate_add(xl, " to %s", range_str);
+ 	if (r->flags & NF_NAT_RANGE_PROTO_RANDOM) {
+-- 
+cgit v1.2.3
+
diff --git a/aports/linux-lts/0001-mt76-mt7921-add-support-for-PCIe-ID-0x0608.patch b/aports/linux-lts/0001-mt76-mt7921-add-support-for-PCIe-ID-0x0608.patch
deleted file mode 100644
index 008bfbe..0000000
--- a/aports/linux-lts/0001-mt76-mt7921-add-support-for-PCIe-ID-0x0608.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
-@@ -14,6 +14,7 @@
- 
- static const struct pci_device_id mt7921_pci_device_table[] = {
- 	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7961) },
-+	{ PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x0608) },
- 	{ },
- };
- 
diff --git a/aports/linux-lts/APKBUILD b/aports/linux-lts/APKBUILD
index 2602e96..0aa90fd 100644
--- a/aports/linux-lts/APKBUILD
+++ b/aports/linux-lts/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gabor Pali <pali.gabor@gmail.com>
 
 pkgname=linux-lts
-pkgver=5.15.104
+pkgver=6.1.53
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -12,14 +12,15 @@ url="https://www.kernel.org"
 depends=
 _depends_dev="perl gmp-dev mpc1-dev mpfr-dev elfutils-dev bash flex bison zstd"
 makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any openssl-dev>3 mawk
-	diffutils findutils zstd"
+	diffutils findutils zstd pahole>=1.25 python3"
 options="!strip"
 install=
 source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
+	awk.patch
 	config-lts.x86_64
-	0001-mt76-mt7921-add-support-for-PCIe-ID-0x0608.patch
 	"
 subpackages="$pkgname-dev:_dev:$CBUILD_ARCH"
+builddir="$srcdir"/linux-"$_kernver"
 
 if [ "${pkgver%.0}" = "$pkgver" ]; then
 	source="$source
@@ -27,91 +28,80 @@ if [ "${pkgver%.0}" = "$pkgver" ]; then
 fi
 
 arch="x86_64"
-license="GPL-2.0"
+license="GPL-2.0-only"
 
 prepare() {
-	local _patch_failed=
-	cd "$srcdir"/linux-$_kernver
 	if [ "$_kernver" != "$pkgver" ]; then
 		msg "Applying patch-$pkgver.xz"
 		unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N
 	fi
 
-	# first apply patches in specified order
-	for i in $source; do
-		case $i in
-		*.patch)
-			msg "Applying $i..."
-			if ! patch -s -p1 -N -i "$srcdir"/$i; then
-				echo $i >>failed
-				_patch_failed=1
-			fi
-			;;
-		esac
-	done
-
-	if ! [ -z "$_patch_failed" ]; then
-		error "The following patches failed:"
-		cat failed
-		return 1
-	fi
+	default_prepare
 
 	# remove localversion from patch if any
 	rm -f localversion*
-	oldconfig
 }
 
-oldconfig() {
-	local _config=config-lts.x86_64
+_prepareconfig() {
+	local _config="config-lts.x86_64"
 	local _builddir="$srcdir"/build-lts.x86_64
 	mkdir -p "$_builddir"
-	echo "-$pkgrel-lts" > "$_builddir"/localversion-alpine \
-		|| return 1
+	echo "-$pkgrel-lts" > "$_builddir"/localversion-alpine
 
-	cp "$srcdir"/$_config "$_builddir"/.config
-	make -C "$srcdir"/linux-$_kernver \
+	cp "$srcdir"/"$_config" "$_builddir"/.config
+	msg "Configuring the kernel"
+	make -C "$srcdir"/linux-"$_kernver" \
 		O="$_builddir" \
-		ARCH="x86_64" \
-		listnewconfig oldconfig
+		ARCH=x86_64 \
+		olddefconfig
 }
 
 build() {
 	unset LDFLAGS
+	# for some reason these sometimes leak into the kernel build,
+	# -Werror=format-security breaks some stuff
+	unset CFLAGS CPPFLAGS CXXFLAGS
 	export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
+	_prepareconfig
+	msg "Building the kernel"
 	cd "$srcdir"/build-lts.x86_64
-	make ARCH="x86_64" CC="${CC:-gcc}" \
+	make ARCH="x86_64" \
+		CC="${CC:-gcc}" \
+		AWK="${AWK:-mawk}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
 }
 
 package() {
 	local _outdir="$pkgdir"
-	local _abi_release=${pkgver}-${pkgrel}-lts
 	export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
 	cd "$srcdir"/build-lts.x86_64
+	local _abi_release="$(make -s kernelrelease)"
 	# modules_install seems to regenerate a defect Modules.symvers on s390x. Work
 	# around it by backing it up and restore it after modules_install
 	cp Module.symvers Module.symvers.backup
 
 	mkdir -p "$_outdir"/boot "$_outdir"/lib/modules
 
-	make -j1 modules_install install \
+	make modules_install install \
 		ARCH="x86_64" \
 		INSTALL_MOD_PATH="$_outdir" \
+		INSTALL_MOD_STRIP=1 \
 		INSTALL_PATH="$_outdir"/boot \
 		INSTALL_DTBS_PATH="$_outdir/boot/dtbs-lts"
 
 	cp Module.symvers.backup Module.symvers
 
-	rm -f "$_outdir"/lib/modules/${_abi_release}/build \
-		"$_outdir"/lib/modules/${_abi_release}/source \
+	rm -f "$_outdir"/lib/modules/"$_abi_release"/build \
+		"$_outdir"/lib/modules/"$_abi_release"/source \
 		"$_outdir"/boot/System.map-lts \
 		"$_outdir"/boot/config-lts
 	rm -rf "$_outdir"/lib/firmware
 }
 
 _dev() {
-	local _abi_release=${pkgver}-${pkgrel}-lts
+	local _builddir="$srcdir"/build-lts.x86_64
+	local _abi_release="$(make -C "$_builddir" -s kernelrelease)"
 	# copy the only the parts that we really need for build 3rd party
 	# kernel modules and install those as /usr/src/linux-headers,
 	# simlar to what ubuntu does
@@ -121,17 +111,20 @@ _dev() {
 	#
 	pkgdesc="Headers and script for third party modules for lts kernel"
 	depends="$_depends_dev"
-	local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release}
+	local dir="$subpkgdir"/usr/src/linux-headers-"$_abi_release"
 	export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
 	# first we import config, run prepare to set up for building
 	# external modules, and create the scripts
 	mkdir -p "$dir"
-	cp "$srcdir"/config-lts.x86_64 "$dir"/.config
-	echo "-$pkgrel-lts" > "$dir"/localversion-alpine
+	cp -a "$_builddir"/.config "$_builddir"/localversion-alpine \
+		"$dir"/
 
-	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" ARCH="x86_64" \
-		syncconfig prepare modules_prepare scripts
+	make -C "$srcdir"/linux-"$_kernver" \
+		O="$dir" \
+		ARCH="x86_64" \
+		AWK="${AWK:-mawk}" \
+		prepare modules_prepare scripts
 
 	# remove the stuff that points to real sources. we want 3rd party
 	# modules to believe this is the soruces
@@ -141,7 +134,7 @@ _dev() {
 	#
 	# this is taken from ubuntu kernel build script
 	# http://kernel.ubuntu.com/git/ubuntu/ubuntu-zesty.git/tree/debian/rules.d/3-binary-indep.mk
-	cd "$srcdir"/linux-$_kernver
+	cd "$srcdir"/linux-"$_kernver"
 	find .  -path './include/*' -prune \
 		-o -path './scripts/*' -prune -o -type f \
 		\( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \
@@ -150,20 +143,26 @@ _dev() {
 
 	cp -a scripts include "$dir"
 
-	find $(find arch -name include -type d -print) -type f \
-		| cpio -pdm "$dir"
+	find arch/x86 -name include -type d -print | while IFS='' read -r folder; do
+		find "$folder" -type f
+	done | sort -u | cpio -pdm "$dir"
 
 	install -Dm644 "$srcdir"/build-lts.$CARCH/Module.symvers \
 		"$dir"/Module.symvers
 
-	mkdir -p "$subpkgdir"/lib/modules/${_abi_release}
-	ln -sf /usr/src/linux-headers-${_abi_release} \
-		"$subpkgdir"/lib/modules/${_abi_release}/build
+	# remove unneeded things
+	msg "Removing documentation..."
+	rm -rf "$dir"/Documentation
+	find "$dir" -type f -name '*.o' -printf 'Removing %P\n' -delete
+	
+	mkdir -p "$subpkgdir"/lib/modules/"$_abi_release"
+	ln -sf /usr/src/linux-headers-"$_abi_release" \
+		"$subpkgdir"/lib/modules/"$_abi_release"/build
 }
 
 sha512sums="
-d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a  linux-5.15.tar.xz
-eba6a9c78a065c08f2dfd98b8373df78f9fc80f5770c9111b7ef80cc1d3dceb42d344813df461dcf62de74e7e114f5e9cd3bcc7780c3ec3ac11e4ea4da16612c  config-lts.x86_64
-65504e60731f7254079caa997cd44585f8b9608aa66e0879e677872f89b91aa77b67f28617eddef7fe9932a73a5942466c12c733432405ee7e42944daadef6d4  0001-mt76-mt7921-add-support-for-PCIe-ID-0x0608.patch
-8c534f15a45372c3f1a07b74c7790105b1f4deecca726184f80ec75a196cf199294f61c2e81634245b96a950d037037f0e08ee049e71fb560300ea13987e3b37  patch-5.15.104.xz
+6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68  linux-6.1.tar.xz
+3816cfc8dd14d1c5ced05bbf19b099472c9bbbd1abced32cbb4b6b5baecfaa28c345e4e522648837d98e5bc7c311810cae9160f4c91019bb857a3857076b8e0e  awk.patch
+4084cfdfca1a3dd85816be4f59c30f0f6f8e007ce2a063d11385a841d879dc096b0ab60e2ef36e0ef9ea7dbe60aa03a84bbbd7a369cd4a4c3a2433f034ebde2a  config-lts.x86_64
+b5442dead51ac824dde986f08a62371e94a6743f7d27ed40410a30d2da9e31602068a8929cc693a15b7b2d41d23e09e702f2ddd5e0485ec1bbf5750765eba2e0  patch-6.1.53.xz
 "
diff --git a/aports/linux-lts/awk.patch b/aports/linux-lts/awk.patch
new file mode 100644
index 0000000..b73f69b
--- /dev/null
+++ b/aports/linux-lts/awk.patch
@@ -0,0 +1,15 @@
+tools/objtool does not pass AWK= as an makefile argument so we need pass it as an env.
+
+diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
+index 92ce4fc..cfedb0c 100644
+--- a/tools/objtool/Makefile
++++ b/tools/objtool/Makefile
+@@ -37,7 +37,7 @@ LDFLAGS  += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
+ elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E - | grep elf_getshdr)
+ CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
+ 
+-AWK = awk
++AWK ?= awk
+ 
+ SUBCMD_CHECK := n
+ SUBCMD_ORC := n
diff --git a/aports/linux-lts/config-lts.x86_64 b/aports/linux-lts/config-lts.x86_64
index db4ea15..3c8d0f8 100644
--- a/aports/linux-lts/config-lts.x86_64
+++ b/aports/linux-lts/config-lts.x86_64
@@ -1,19 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.104 Kernel Configuration
+# Linux/x86_64 6.1.53 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 12.2.1_git20220924-r4) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 12.2.1_git20220924-r10) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23900
+CONFIG_AS_VERSION=24000
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23900
+CONFIG_LD_VERSION=24000
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
-CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -30,6 +29,7 @@ CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
 # CONFIG_WERROR is not set
+# CONFIG_UAPI_HEADER_TEST is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -40,16 +40,15 @@ CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_HAVE_KERNEL_LZ4=y
 CONFIG_HAVE_KERNEL_ZSTD=y
-CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
 # CONFIG_KERNEL_ZSTD is not set
 CONFIG_DEFAULT_INIT=""
 CONFIG_DEFAULT_HOSTNAME="(none)"
-# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -74,7 +73,6 @@ CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
 CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
 # end of IRQ subsystem
 
 CONFIG_CLOCKSOURCE_WATCHDOG=y
@@ -97,6 +95,7 @@ CONFIG_NO_HZ_COMMON=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100
 # end of Timers subsystem
 
 CONFIG_BPF=y
@@ -110,9 +109,11 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 # CONFIG_BPF_JIT is not set
 # end of BPF subsystem
 
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_PREEMPT_NONE_BUILD=y
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_DYNAMIC is not set
 
 #
 # CPU/Task time and stats accounting
@@ -142,7 +143,6 @@ CONFIG_TINY_SRCU=y
 # CONFIG_IKHEADERS is not set
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-# CONFIG_PRINTK_INDEX is not set
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 
 #
@@ -153,6 +153,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
+CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 # CONFIG_CGROUPS is not set
 CONFIG_NAMESPACES=y
@@ -168,6 +171,7 @@ CONFIG_NAMESPACES=y
 CONFIG_RELAY=y
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_BOOT_CONFIG is not set
+# CONFIG_INITRAMFS_PRESERVE_MTIME is not set
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_LD_ORPHAN_WARN=y
@@ -197,8 +201,8 @@ CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 CONFIG_KALLSYMS_BASE_RELATIVE=y
-# CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_RSEQ=y
 # CONFIG_EMBEDDED is not set
@@ -208,17 +212,9 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # end of Kernel Performance Events And Counters
 
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLAB_MERGE_DEFAULT=y
-# CONFIG_SLAB_FREELIST_RANDOM is not set
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 # CONFIG_PROFILING is not set
 # end of General setup
@@ -241,18 +237,13 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_NR_GPIO=1024
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=5
+CONFIG_PGTABLE_LEVELS=4
 CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 
 #
@@ -266,8 +257,7 @@ CONFIG_X86_FEATURE_NAMES=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 # CONFIG_X86_INTEL_LPSS is not set
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
-# CONFIG_IOSF_MBI is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_IOSF_MBI=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_HYPERVISOR_GUEST is not set
 # CONFIG_MK8 is not set
@@ -301,12 +291,7 @@ CONFIG_UP_LATE_INIT=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-# CONFIG_X86_MCELOG_LEGACY is not set
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
+# CONFIG_X86_MCE is not set
 
 #
 # Performance monitoring
@@ -316,23 +301,21 @@ CONFIG_PERF_EVENTS_INTEL_RAPL=y
 CONFIG_PERF_EVENTS_INTEL_CSTATE=y
 # CONFIG_PERF_EVENTS_AMD_POWER is not set
 CONFIG_PERF_EVENTS_AMD_UNCORE=y
+# CONFIG_PERF_EVENTS_AMD_BRS is not set
 # end of Performance monitoring
 
 CONFIG_X86_16BIT=y
 CONFIG_X86_ESPFIX64=y
 CONFIG_X86_VSYSCALL_EMULATION=y
-CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_I8K is not set
+# CONFIG_X86_IOPL_IOPERM is not set
 # CONFIG_MICROCODE is not set
 # CONFIG_X86_MSR is not set
 # CONFIG_X86_CPUID is not set
-CONFIG_X86_5LEVEL=y
+# CONFIG_X86_5LEVEL is not set
 CONFIG_X86_DIRECT_GBPAGES=y
-# CONFIG_X86_CPA_STATISTICS is not set
 # CONFIG_AMD_MEM_ENCRYPT is not set
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 # CONFIG_X86_PMEM_LEGACY is not set
@@ -342,14 +325,13 @@ CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
 CONFIG_X86_UMIP=y
-CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_CC_HAS_IBT=y
+# CONFIG_X86_KERNEL_IBT is not set
+# CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set
 CONFIG_X86_INTEL_TSX_MODE_OFF=y
 # CONFIG_X86_INTEL_TSX_MODE_ON is not set
 # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
-# CONFIG_X86_SGX is not set
 # CONFIG_EFI is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
@@ -359,20 +341,15 @@ CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
-CONFIG_CRASH_DUMP=y
+# CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_X86_NEED_RELOCS=y
+# CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x200000
-CONFIG_DYNAMIC_MEMORY_LAYOUT=y
-CONFIG_RANDOMIZE_MEMORY=y
-CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
-# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
 CONFIG_LEGACY_VSYSCALL_XONLY=y
 # CONFIG_LEGACY_VSYSCALL_NONE is not set
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
+# CONFIG_STRICT_SIGALTSTACK_SIZE is not set
 CONFIG_HAVE_LIVEPATCH=y
 # end of Processor type and features
 
@@ -388,7 +365,6 @@ CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
 # CONFIG_SUSPEND is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ARCH_SUPPORTS_ACPI=y
 CONFIG_ACPI=y
@@ -396,22 +372,22 @@ CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
 # CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SPCR_TABLE=y
+# CONFIG_ACPI_SPCR_TABLE is not set
 # CONFIG_ACPI_FPDT is not set
 CONFIG_ACPI_LPIT=y
-CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
-CONFIG_ACPI_AC=y
-CONFIG_ACPI_BATTERY=y
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
 CONFIG_ACPI_BUTTON=y
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_DOCK=y
+# CONFIG_ACPI_FAN is not set
+# CONFIG_ACPI_DOCK is not set
 CONFIG_ACPI_CPU_FREQ_PSS=y
 CONFIG_ACPI_PROCESSOR_CSTATE=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
 CONFIG_ACPI_PROCESSOR=y
 # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
-CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_THERMAL is not set
 CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_PCI_SLOT is not set
@@ -419,13 +395,13 @@ CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 # CONFIG_ACPI_SBS is not set
 # CONFIG_ACPI_HED is not set
-# CONFIG_ACPI_CUSTOM_METHOD is not set
 # CONFIG_ACPI_NFIT is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 # CONFIG_ACPI_APEI is not set
 # CONFIG_ACPI_DPTF is not set
 # CONFIG_ACPI_CONFIGFS is not set
+# CONFIG_ACPI_PFRUT is not set
 # CONFIG_PMIC_OPREGION is not set
 CONFIG_X86_PM_TIMER=y
 
@@ -460,7 +436,7 @@ CONFIG_AMD_NB=y
 # Binary Emulations
 #
 # CONFIG_IA32_EMULATION is not set
-# CONFIG_X86_X32 is not set
+# CONFIG_X86_X32_ABI is not set
 # end of Binary Emulations
 
 CONFIG_HAVE_KVM=y
@@ -486,6 +462,7 @@ CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
 CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
 CONFIG_HAVE_NMI=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -496,12 +473,14 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_ARCH_WANTS_NO_INSTR=y
 CONFIG_HAVE_ASM_MODVERSIONS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_RUST=y
 CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
@@ -512,6 +491,7 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_MERGE_VMAS=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -528,9 +508,10 @@ CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y
+CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y
+CONFIG_HAVE_CONTEXT_TRACKING_USER=y
+CONFIG_HAVE_CONTEXT_TRACKING_USER_OFFSTACK=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOVE_PUD=y
@@ -538,42 +519,54 @@ CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
 CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
 CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_HAVE_OBJTOOL=y
+CONFIG_HAVE_JUMP_LABEL_HACK=y
+CONFIG_HAVE_NOINSTR_HACK=y
+CONFIG_HAVE_NOINSTR_VALIDATION=y
+CONFIG_HAVE_UACCESS_VALIDATION=y
 CONFIG_HAVE_STACK_VALIDATION=y
 CONFIG_HAVE_RELIABLE_STACKTRACE=y
 # CONFIG_COMPAT_32BIT_TIME is not set
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET=y
 # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_HAVE_STATIC_CALL=y
 CONFIG_HAVE_STATIC_CALL_INLINE=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
+CONFIG_HAVE_PREEMPT_DYNAMIC_CALL=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_HAS_ELFCORE_COMPAT=y
 CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y
+CONFIG_DYNAMIC_SIGFRAME=y
+CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
 
 #
 # GCOV-based kernel profiling
 #
-# CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
@@ -587,6 +580,7 @@ CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_UNLOAD_TAINT_TRACKING is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
@@ -594,15 +588,16 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 CONFIG_MODULE_COMPRESS_XZ=y
 # CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_DECOMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
+# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set
 # CONFIG_BLK_DEV_BSGLIB is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_ZONED is not set
 # CONFIG_BLK_WBT is not set
-# CONFIG_BLK_DEBUG_FS is not set
 # CONFIG_BLK_SED_OPAL is not set
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
 
@@ -653,48 +648,66 @@ CONFIG_COREDUMP=y
 #
 # Memory Management options
 #
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
+# CONFIG_SWAP is not set
+
+#
+# SLAB allocator options
+#
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SLAB_MERGE_DEFAULT=y
+# CONFIG_SLAB_FREELIST_RANDOM is not set
+# CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLUB_STATS is not set
+# end of SLAB allocator options
+
+# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
+# CONFIG_COMPAT_BRK is not set
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_FAST_GUP=y
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
-CONFIG_PAGE_REPORTING=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
+# CONFIG_PAGE_REPORTING is not set
 CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_VIRT_TO_BUS=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANTS_THP_SWAP=y
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
 CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_CLEANCACHE is not set
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 # CONFIG_CMA is not set
-# CONFIG_ZPOOL is not set
-# CONFIG_ZSMALLOC is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-CONFIG_ARCH_HAS_PKEYS=y
+CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_TEST is not set
+
+#
+# GUP_TEST needs to have DEBUG_FS enabled
+#
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_SECRETMEM=y
+# CONFIG_ANON_VMA_NAME is not set
+# CONFIG_USERFAULTFD is not set
+# CONFIG_LRU_GEN is not set
+CONFIG_LOCK_MM_AND_FIND_VMA=y
 
 #
 # Data Access Monitoring
@@ -705,6 +718,7 @@ CONFIG_SECRETMEM=y
 
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
 CONFIG_SKB_EXTENSIONS=y
 
 #
@@ -736,8 +750,8 @@ CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
 CONFIG_NET_IP_TUNNEL=y
@@ -798,7 +812,6 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_SEG6_HMAC is not set
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
 # CONFIG_IPV6_IOAM6_LWTUNNEL is not set
-CONFIG_NETLABEL=y
 # CONFIG_MPTCP is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NET_PTP_CLASSIFY=y
@@ -810,6 +823,8 @@ CONFIG_NETFILTER_ADVANCED=y
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_EGRESS=y
+CONFIG_NETFILTER_SKIP_EGRESS=y
 CONFIG_NETFILTER_NETLINK=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
 # CONFIG_NETFILTER_NETLINK_QUEUE is not set
@@ -819,7 +834,7 @@ CONFIG_NF_CONNTRACK=y
 CONFIG_NF_LOG_SYSLOG=y
 # CONFIG_NF_CONNTRACK_MARK is not set
 # CONFIG_NF_CONNTRACK_ZONES is not set
-CONFIG_NF_CONNTRACK_PROCFS=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 # CONFIG_NF_CONNTRACK_TIMESTAMP is not set
@@ -936,8 +951,8 @@ CONFIG_NF_DEFRAG_IPV4=y
 # CONFIG_NF_SOCKET_IPV4 is not set
 # CONFIG_NF_TPROXY_IPV4 is not set
 # CONFIG_NF_DUP_IPV4 is not set
-CONFIG_NF_LOG_ARP=y
-CONFIG_NF_LOG_IPV4=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=y
 CONFIG_IP_NF_IPTABLES=y
 # CONFIG_IP_NF_MATCH_AH is not set
@@ -947,8 +962,8 @@ CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
 # CONFIG_IP_NF_TARGET_SYNPROXY is not set
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
 # CONFIG_IP_NF_TARGET_NETMAP is not set
 # CONFIG_IP_NF_TARGET_REDIRECT is not set
 CONFIG_IP_NF_MANGLE=y
@@ -956,7 +971,6 @@ CONFIG_IP_NF_MANGLE=y
 # CONFIG_IP_NF_TARGET_ECN is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 # end of IP: Netfilter Configuration
 
@@ -985,7 +999,6 @@ CONFIG_IP6_NF_TARGET_REJECT=y
 # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
 CONFIG_IP6_NF_MANGLE=y
 # CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_SECURITY is not set
 # CONFIG_IP6_NF_NAT is not set
 # end of IPv6: Netfilter Configuration
 
@@ -1001,7 +1014,6 @@ CONFIG_NF_DEFRAG_IPV6=y
 # CONFIG_BRIDGE is not set
 # CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
@@ -1132,7 +1144,6 @@ CONFIG_CFG80211=y
 CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
 CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_CFG80211_WEXT_EXPORT=y
@@ -1148,7 +1159,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
@@ -1156,6 +1166,7 @@ CONFIG_RFKILL=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_NET_9P=y
+# CONFIG_NET_9P_FD is not set
 CONFIG_NET_9P_VIRTIO=y
 # CONFIG_NET_9P_DEBUG is not set
 # CONFIG_CAIF is not set
@@ -1166,7 +1177,7 @@ CONFIG_NET_9P_VIRTIO=y
 # CONFIG_LWTUNNEL is not set
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
-# CONFIG_FAILOVER is not set
+CONFIG_FAILOVER=y
 CONFIG_ETHTOOL_NETLINK=y
 
 #
@@ -1190,6 +1201,7 @@ CONFIG_PCIE_PME=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 CONFIG_PCI_ATS=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
@@ -1197,6 +1209,8 @@ CONFIG_PCI_LOCKLESS_CONFIG=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_LABEL=y
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
@@ -1249,6 +1263,7 @@ CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_DEVTMPFS_SAFE is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
@@ -1259,22 +1274,28 @@ CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_FW_LOADER_COMPRESS is not set
+# CONFIG_FW_UPLOAD is not set
 # end of Firmware loader
 
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
 # end of Generic Driver Options
 
 #
 # Bus devices
 #
 CONFIG_MHI_BUS=m
-# CONFIG_MHI_BUS_DEBUG is not set
 # CONFIG_MHI_BUS_PCI_GENERIC is not set
+# CONFIG_MHI_BUS_EP is not set
 # end of Bus devices
 
 CONFIG_CONNECTOR=y
@@ -1295,7 +1316,6 @@ CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
 # CONFIG_FW_CFG_SYSFS is not set
-CONFIG_SYSFB=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 
@@ -1323,16 +1343,13 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_VIRTIO_BLK=y
 # CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_RSXX is not set
+# CONFIG_BLK_DEV_UBLK is not set
 
 #
 # NVME Support
@@ -1420,10 +1437,9 @@ CONFIG_NET_CORE=y
 # CONFIG_GENEVE is not set
 # CONFIG_BAREUDP is not set
 # CONFIG_GTP is not set
+# CONFIG_AMT is not set
 # CONFIG_MACSEC is not set
-CONFIG_NETCONSOLE=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
+# CONFIG_NETCONSOLE is not set
 # CONFIG_TUN is not set
 # CONFIG_TUN_VNET_CROSS_LE is not set
 # CONFIG_VETH is not set
@@ -1442,6 +1458,7 @@ CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_AMD is not set
 # CONFIG_NET_VENDOR_AQUANTIA is not set
 # CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ASIX is not set
 # CONFIG_NET_VENDOR_ATHEROS is not set
 # CONFIG_CX_ECAT is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
@@ -1450,11 +1467,14 @@ CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_CHELSIO is not set
 # CONFIG_NET_VENDOR_CISCO is not set
 # CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DAVICOM is not set
 # CONFIG_DNET is not set
 # CONFIG_NET_VENDOR_DEC is not set
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_ENGLEDER is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
+# CONFIG_NET_VENDOR_FUNGIBLE is not set
 # CONFIG_NET_VENDOR_GOOGLE is not set
 # CONFIG_NET_VENDOR_HUAWEI is not set
 # CONFIG_NET_VENDOR_I825XX is not set
@@ -1472,6 +1492,7 @@ CONFIG_E1000=y
 # CONFIG_ICE is not set
 # CONFIG_FM10K is not set
 # CONFIG_IGC is not set
+# CONFIG_NET_VENDOR_WANGXUN is not set
 # CONFIG_JME is not set
 # CONFIG_NET_VENDOR_LITEX is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
@@ -1510,6 +1531,7 @@ CONFIG_E1000=y
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
 # CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VERTEXCOM is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
@@ -1517,6 +1539,7 @@ CONFIG_E1000=y
 # CONFIG_HIPPI is not set
 # CONFIG_NET_SB1000 is not set
 # CONFIG_PHYLIB is not set
+# CONFIG_PSE_CONTROLLER is not set
 # CONFIG_MDIO_DEVICE is not set
 
 #
@@ -1545,7 +1568,6 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 # CONFIG_ATH9K_AHB is not set
-# CONFIG_ATH9K_DEBUGFS is not set
 # CONFIG_ATH9K_DYNACK is not set
 # CONFIG_ATH9K_WOW is not set
 CONFIG_ATH9K_RFKILL=y
@@ -1559,8 +1581,8 @@ CONFIG_ATH10K=m
 CONFIG_ATH10K_CE=y
 CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_WCN36XX is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_ATH11K=m
 CONFIG_ATH11K_PCI=m
 # CONFIG_ATH11K_DEBUG is not set
@@ -1590,7 +1612,7 @@ CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 CONFIG_B43LEGACY_LEDS=y
 CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_DEBUG=y
+# CONFIG_B43LEGACY_DEBUG is not set
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -1599,7 +1621,8 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
-# CONFIG_BRCMFMAC_PCIE is not set
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
 CONFIG_WLAN_VENDOR_CISCO=y
@@ -1629,7 +1652,6 @@ CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_BCAST_FILTERING is not set
 
 #
 # Debugging Options
@@ -1641,7 +1663,7 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 # CONFIG_LIBERTAS_DEBUG is not set
-# CONFIG_LIBERTAS_MESH is not set
+CONFIG_LIBERTAS_MESH=y
 CONFIG_LIBERTAS_THINFIRM=m
 # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
 CONFIG_MWIFIEX=m
@@ -1660,8 +1682,10 @@ CONFIG_MT7603E=m
 CONFIG_MT7615_COMMON=m
 CONFIG_MT7615E=m
 CONFIG_MT7915E=m
+CONFIG_MT7921_COMMON=m
 CONFIG_MT7921E=m
 CONFIG_WLAN_VENDOR_MICROCHIP=y
+CONFIG_WLAN_VENDOR_PURELIFI=y
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -1698,20 +1722,12 @@ CONFIG_RTLWIFI_PCI=m
 CONFIG_RTL8192C_COMMON=m
 CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
-CONFIG_RTW88=m
-CONFIG_RTW88_CORE=m
-CONFIG_RTW88_PCI=m
-CONFIG_RTW88_8822B=m
-CONFIG_RTW88_8822C=m
-CONFIG_RTW88_8723D=m
-CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8723DE=m
-# CONFIG_RTW88_8821CE is not set
-# CONFIG_RTW88_DEBUG is not set
-# CONFIG_RTW88_DEBUGFS is not set
+# CONFIG_RTW88 is not set
+# CONFIG_RTW89 is not set
 # CONFIG_WLAN_VENDOR_RSI is not set
-# CONFIG_WLAN_VENDOR_ST is not set
+# CONFIG_WLAN_VENDOR_SILABS is not set
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
 CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WL1251=m
 CONFIG_WL12XX=m
@@ -1733,7 +1749,6 @@ CONFIG_QTNFMAC_PCIE=m
 
 # CONFIG_VMXNET3 is not set
 # CONFIG_FUJITSU_ES is not set
-# CONFIG_NETDEVSIM is not set
 # CONFIG_NET_FAILOVER is not set
 # CONFIG_ISDN is not set
 
@@ -1741,9 +1756,9 @@ CONFIG_QTNFMAC_PCIE=m
 # Input device support
 #
 CONFIG_INPUT=y
-# CONFIG_INPUT_LEDS is not set
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
+CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_SPARSEKMAP=y
 # CONFIG_INPUT_MATRIXKMAP is not set
 
 #
@@ -1821,6 +1836,7 @@ CONFIG_SERIAL_8250_DWLIB=y
 # CONFIG_SERIAL_8250_RT288X is not set
 CONFIG_SERIAL_8250_LPSS=y
 CONFIG_SERIAL_8250_MID=y
+CONFIG_SERIAL_8250_PERICOM=y
 
 #
 # Non-8250 serial port support
@@ -1831,14 +1847,12 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_LANTIQ is not set
 # CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# CONFIG_SERIAL_SPRD is not set
 # end of Serial drivers
 
 CONFIG_SERIAL_NONSTANDARD=y
@@ -1914,16 +1928,7 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 # CONFIG_GPIOLIB is not set
 # CONFIG_W1 is not set
 # CONFIG_POWER_RESET is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_POWER_SUPPLY_HWMON is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_POWER_SUPPLY is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -1938,7 +1943,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_K10TEMP is not set
 # CONFIG_SENSORS_FAM15H_POWER is not set
 # CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASPEED is not set
 # CONFIG_SENSORS_DELL_SMM is not set
 # CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_F71805F is not set
@@ -1950,7 +1954,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MR75203 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
 # CONFIG_SENSORS_NCT6683 is not set
 # CONFIG_SENSORS_NCT6775 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
@@ -1971,6 +1974,7 @@ CONFIG_HWMON=y
 #
 # CONFIG_SENSORS_ACPI_POWER is not set
 # CONFIG_SENSORS_ATK0110 is not set
+# CONFIG_SENSORS_ASUS_EC is not set
 CONFIG_THERMAL=y
 # CONFIG_THERMAL_NETLINK is not set
 # CONFIG_THERMAL_STATISTICS is not set
@@ -1991,7 +1995,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 #
 # CONFIG_INTEL_POWERCLAMP is not set
 CONFIG_X86_THERMAL_VECTOR=y
-# CONFIG_X86_PKG_TEMP_THERMAL is not set
+CONFIG_X86_PKG_TEMP_THERMAL=m
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 
 #
@@ -2002,7 +2006,7 @@ CONFIG_X86_THERMAL_VECTOR=y
 
 # CONFIG_INTEL_PCH_THERMAL is not set
 # CONFIG_INTEL_TCC_COOLING is not set
-# CONFIG_INTEL_MENLOW is not set
+# CONFIG_INTEL_HFI_THERMAL is not set
 # end of Intel thermal drivers
 
 CONFIG_WATCHDOG=y
@@ -2031,6 +2035,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_EBC_C384_WDT is not set
+# CONFIG_EXAR_WDT is not set
 # CONFIG_F71808E_WDT is not set
 # CONFIG_SP5100_TCO is not set
 # CONFIG_SBC_FITPC2_WATCHDOG is not set
@@ -2090,12 +2095,11 @@ CONFIG_BCMA_DRIVER_PCI=y
 #
 # CONFIG_MFD_MADERA is not set
 # CONFIG_HTC_PASIC3 is not set
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_MFD_INTEL_LPSS_ACPI is not set
 # CONFIG_MFD_INTEL_LPSS_PCI is not set
-# CONFIG_MFD_INTEL_PMT is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_MT6397 is not set
@@ -2109,15 +2113,19 @@ CONFIG_BCMA_DRIVER_PCI=y
 
 # CONFIG_REGULATOR is not set
 # CONFIG_RC_CORE is not set
+
+#
+# CEC support
+#
 # CONFIG_MEDIA_CEC_SUPPORT is not set
+# end of CEC support
+
 # CONFIG_MEDIA_SUPPORT is not set
 
 #
 # Graphics support
 #
 # CONFIG_AGP is not set
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_VGA_SWITCHEROO is not set
 # CONFIG_DRM is not set
 
@@ -2177,7 +2185,6 @@ CONFIG_LEDS_CLASS=y
 # LED drivers
 #
 # CONFIG_LEDS_APU is not set
-# CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_LEDS_INTEL_SS4200 is not set
 
 #
@@ -2187,12 +2194,17 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_MLXREG is not set
 # CONFIG_LEDS_USER is not set
 # CONFIG_LEDS_NIC78BX is not set
+# CONFIG_LEDS_TI_LMU_COMMON is not set
 
 #
 # Flash and Torch LED drivers
 #
 
 #
+# RGB LED drivers
+#
+
+#
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
@@ -2214,6 +2226,10 @@ CONFIG_LEDS_TRIGGERS=y
 # CONFIG_LEDS_TRIGGER_PATTERN is not set
 # CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set
+
+#
+# Simple LED drivers
+#
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_ATOMIC_SCRUB=y
@@ -2281,23 +2297,29 @@ CONFIG_RTC_DRV_CMOS=y
 #
 # DMABUF options
 #
-# CONFIG_SYNC_FILE is not set
+CONFIG_SYNC_FILE=y
+# CONFIG_UDMABUF is not set
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
 # CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
 # end of DMABUF options
 
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 # CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_PCI_LIB=y
+CONFIG_VIRTIO_PCI_LIB_LEGACY=y
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=y
+# CONFIG_VIRTIO_BALLOON is not set
 CONFIG_VIRTIO_INPUT=y
-CONFIG_VIRTIO_MMIO=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+# CONFIG_VIRTIO_MMIO is not set
 # CONFIG_VDPA is not set
 # CONFIG_VHOST_MENU is not set
 
@@ -2309,23 +2331,57 @@ CONFIG_VIRTIO_MMIO=y
 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 # CONFIG_STAGING is not set
-# CONFIG_X86_PLATFORM_DEVICES is not set
-CONFIG_PMC_ATOM=y
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Clock driver for ARM Reference designs
-#
-# CONFIG_ICST is not set
-# CONFIG_CLK_SP810 is not set
-# end of Clock driver for ARM Reference designs
-
-# CONFIG_XILINX_VCU is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_ACPI_WMI is not set
+# CONFIG_ACERHDF is not set
+# CONFIG_ACER_WIRELESS is not set
+# CONFIG_AMD_PMC is not set
+# CONFIG_AMD_HSMP is not set
+# CONFIG_ADV_SWBUTTON is not set
+# CONFIG_ASUS_WIRELESS is not set
+# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
+# CONFIG_AMILO_RFKILL is not set
+# CONFIG_FUJITSU_TABLET is not set
+# CONFIG_GPD_POCKET_FAN is not set
+# CONFIG_X86_PLATFORM_DRIVERS_HP is not set
+# CONFIG_WIRELESS_HOTKEY is not set
+# CONFIG_IBM_RTL is not set
+# CONFIG_SENSORS_HDAPS is not set
+# CONFIG_INTEL_ATOMISP2_PM is not set
+# CONFIG_INTEL_SAR_INT1092 is not set
+# CONFIG_INTEL_PMC_CORE is not set
+
+#
+# Intel Speed Select Technology interface support
+#
+# CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set
+# end of Intel Speed Select Technology interface support
+
+#
+# Intel Uncore Frequency Control
+#
+# CONFIG_INTEL_UNCORE_FREQ_CONTROL is not set
+# end of Intel Uncore Frequency Control
+
+# CONFIG_INTEL_PUNIT_IPC is not set
+# CONFIG_INTEL_RST is not set
+# CONFIG_INTEL_SMARTCONNECT is not set
+# CONFIG_INTEL_VSEC is not set
+# CONFIG_SAMSUNG_Q10 is not set
+# CONFIG_TOSHIBA_BT_RFKILL is not set
+# CONFIG_TOSHIBA_HAPS is not set
+# CONFIG_ACPI_CMPC is not set
+# CONFIG_TOPSTAR_LAPTOP is not set
+# CONFIG_INTEL_IPS is not set
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
+# CONFIG_SIEMENS_SIMATIC_IPC is not set
+# CONFIG_WINMATE_FM07_KEYS is not set
+CONFIG_P2SB=y
+# CONFIG_COMMON_CLK is not set
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -2373,6 +2429,11 @@ CONFIG_CLKBLD_I8253=y
 # end of NXP/Freescale QorIQ SoC drivers
 
 #
+# fujitsu SoC drivers
+#
+# end of fujitsu SoC drivers
+
+#
 # i.MX SoC drivers
 #
 # end of i.MX SoC drivers
@@ -2401,7 +2462,6 @@ CONFIG_QCOM_QMI_HELPERS=m
 # CONFIG_MEMORY is not set
 # CONFIG_IIO is not set
 # CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
 # CONFIG_PWM is not set
 
 #
@@ -2417,7 +2477,13 @@ CONFIG_QCOM_QMI_HELPERS=m
 #
 # CONFIG_GENERIC_PHY is not set
 # CONFIG_PHY_CAN_TRANSCEIVER is not set
+
+#
+# PHY drivers for Broadcom platforms
+#
 # CONFIG_BCM_KONA_USB2_PHY is not set
+# end of PHY drivers for Broadcom platforms
+
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_INTEL_LGM_EMMC is not set
@@ -2437,7 +2503,7 @@ CONFIG_QCOM_QMI_HELPERS=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+# CONFIG_ANDROID_BINDER_IPC is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -2455,11 +2521,12 @@ CONFIG_NVMEM_SYSFS=y
 
 # CONFIG_FPGA is not set
 # CONFIG_TEE is not set
-# CONFIG_UNISYS_VISORBUS is not set
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
 # CONFIG_INTERCONNECT is not set
 # CONFIG_COUNTER is not set
+# CONFIG_PECI is not set
+# CONFIG_HTE is not set
 # end of Device Drivers
 
 #
@@ -2477,25 +2544,26 @@ CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_F2FS_FS is not set
-# CONFIG_FS_DAX is not set
+CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
 CONFIG_FILE_LOCKING=y
 # CONFIG_FS_ENCRYPTION is not set
 # CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
+# CONFIG_DNOTIFY is not set
+# CONFIG_INOTIFY_USER is not set
 # CONFIG_FANOTIFY is not set
 # CONFIG_QUOTA is not set
-CONFIG_AUTOFS4_FS=y
-CONFIG_AUTOFS_FS=y
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTOFS_FS is not set
 # CONFIG_FUSE_FS is not set
 # CONFIG_OVERLAY_FS is not set
 
 #
 # Caches
 #
+CONFIG_NETFS_SUPPORT=y
+# CONFIG_NETFS_STATS is not set
 # CONFIG_FSCACHE is not set
 # end of Caches
 
@@ -2521,8 +2589,6 @@ CONFIG_AUTOFS_FS=y
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
-CONFIG_PROC_VMCORE=y
-# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROC_CHILDREN is not set
@@ -2530,13 +2596,14 @@ CONFIG_PROC_PID_ARCH_STATUS=y
 CONFIG_KERNFS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_TMPFS_XATTR is not set
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
 # CONFIG_TMPFS_INODE64 is not set
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_HUGETLB_PAGE_FREE_VMEMMAP=y
-# CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON is not set
+CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
+CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
+# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set
 CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 # CONFIG_CONFIGFS_FS is not set
@@ -2581,7 +2648,6 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_EROFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
 # CONFIG_CEPH_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_SMB_SERVER is not set
@@ -2592,7 +2658,7 @@ CONFIG_9P_FS=y
 # CONFIG_9P_FS_SECURITY is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-# CONFIG_NLS_CODEPAGE_437 is not set
+CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -2615,8 +2681,8 @@ CONFIG_NLS_DEFAULT="utf8"
 # CONFIG_NLS_ISO8859_8 is not set
 # CONFIG_NLS_CODEPAGE_1250 is not set
 # CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_ISO8859_1 is not set
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set
@@ -2640,7 +2706,7 @@ CONFIG_NLS_DEFAULT="utf8"
 # CONFIG_NLS_MAC_INUIT is not set
 # CONFIG_NLS_MAC_ROMANIAN is not set
 # CONFIG_NLS_MAC_TURKISH is not set
-# CONFIG_NLS_UTF8 is not set
+CONFIG_NLS_UTF8=y
 # CONFIG_UNICODE is not set
 CONFIG_IO_WQ=y
 # end of File systems
@@ -2651,32 +2717,18 @@ CONFIG_IO_WQ=y
 CONFIG_KEYS=y
 # CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_TRUSTED_KEYS is not set
 # CONFIG_ENCRYPTED_KEYS is not set
 # CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
+# CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-# CONFIG_SECURITY_PATH is not set
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 # CONFIG_HARDENED_USERCOPY is not set
 # CONFIG_FORTIFY_SOURCE is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
-# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_SECURITY_LANDLOCK is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-# CONFIG_IMA is not set
-# CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf"
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor,bpf"
 
 #
 # Kernel hardening options
@@ -2688,14 +2740,16 @@ CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf"
 CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
 CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y
 CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
-CONFIG_INIT_STACK_NONE=y
+# CONFIG_INIT_STACK_NONE is not set
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
+CONFIG_INIT_STACK_ALL_ZERO=y
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 # CONFIG_ZERO_CALL_USED_REGS is not set
 # end of Memory initialization
+
+CONFIG_RANDSTRUCT_NONE=y
 # end of Kernel hardening options
 # end of Security options
 
@@ -2729,6 +2783,7 @@ CONFIG_CRYPTO_NULL2=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_TEST is not set
+# end of Crypto core or helper
 
 #
 # Public-key cryptography
@@ -2740,107 +2795,86 @@ CONFIG_CRYPTO_RSA=y
 # CONFIG_CRYPTO_ECRDSA is not set
 # CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
-# CONFIG_CRYPTO_CURVE25519_X86 is not set
+# end of Public-key cryptography
 
 #
-# Authenticated Encryption with Associated Data
+# Block ciphers
 #
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
-# CONFIG_CRYPTO_AEGIS128 is not set
-# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=y
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_TI is not set
+# CONFIG_CRYPTO_ARIA is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SM4_GENERIC is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# end of Block ciphers
 
 #
-# Block modes
+# Length-preserving ciphers and modes
 #
+# CONFIG_CRYPTO_ADIANTUM is not set
+# CONFIG_CRYPTO_CHACHA20 is not set
 CONFIG_CRYPTO_CBC=y
 # CONFIG_CRYPTO_CFB is not set
 CONFIG_CRYPTO_CTR=y
 # CONFIG_CRYPTO_CTS is not set
 # CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_HCTR2 is not set
+# CONFIG_CRYPTO_KEYWRAP is not set
 # CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_OFB is not set
 # CONFIG_CRYPTO_PCBC is not set
 # CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_KEYWRAP is not set
-# CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set
-# CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set
-# CONFIG_CRYPTO_ADIANTUM is not set
-# CONFIG_CRYPTO_ESSIV is not set
+# end of Length-preserving ciphers and modes
 
 #
-# Hash modes
+# AEAD (authenticated encryption with associated data) ciphers
 #
-CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=y
+# CONFIG_CRYPTO_ESSIV is not set
+# end of AEAD (authenticated encryption with associated data) ciphers
 
 #
-# Digest
+# Hashes, digests, and MACs
 #
-CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_CRC32 is not set
-# CONFIG_CRYPTO_CRC32_PCLMUL is not set
-# CONFIG_CRYPTO_XXHASH is not set
 # CONFIG_CRYPTO_BLAKE2B is not set
-# CONFIG_CRYPTO_BLAKE2S_X86 is not set
-# CONFIG_CRYPTO_CRCT10DIF is not set
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_GHASH=y
-# CONFIG_CRYPTO_POLY1305 is not set
-# CONFIG_CRYPTO_POLY1305_X86_64 is not set
+CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_POLY1305 is not set
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA1_SSSE3 is not set
-# CONFIG_CRYPTO_SHA256_SSSE3 is not set
-# CONFIG_CRYPTO_SHA512_SSSE3 is not set
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SHA3 is not set
-# CONFIG_CRYPTO_SM3 is not set
+# CONFIG_CRYPTO_SM3_GENERIC is not set
 # CONFIG_CRYPTO_STREEBOG is not set
+# CONFIG_CRYPTO_VMAC is not set
 # CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XXHASH is not set
+# end of Hashes, digests, and MACs
 
 #
-# Ciphers
+# CRCs (cyclic redundancy checks)
 #
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-# CONFIG_CRYPTO_AES_NI_INTEL is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAMELLIA_X86_64 is not set
-# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set
-# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CAST6_AVX_X86_64 is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_CHACHA20 is not set
-# CONFIG_CRYPTO_CHACHA20_X86_64 is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set
-# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set
-# CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set
-# CONFIG_CRYPTO_SM4 is not set
-# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set
-# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
-# CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set
-# CONFIG_CRYPTO_TWOFISH_AVX_X86_64 is not set
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_CRC32 is not set
+# CONFIG_CRYPTO_CRCT10DIF is not set
+# end of CRCs (cyclic redundancy checks)
 
 #
 # Compression
@@ -2851,9 +2885,10 @@ CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_LZ4 is not set
 # CONFIG_CRYPTO_LZ4HC is not set
 # CONFIG_CRYPTO_ZSTD is not set
+# end of Compression
 
 #
-# Random Number Generation
+# Random number generation
 #
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DRBG_MENU=y
@@ -2862,11 +2897,56 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+# end of Random number generation
+
+#
+# Userspace interface
+#
 # CONFIG_CRYPTO_USER_API_HASH is not set
 # CONFIG_CRYPTO_USER_API_SKCIPHER is not set
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
+# end of Userspace interface
+
 CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Accelerated Cryptographic Algorithms for CPU (x86)
+#
+# CONFIG_CRYPTO_CURVE25519_X86 is not set
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
+# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set
+# CONFIG_CRYPTO_CAMELLIA_X86_64 is not set
+# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set
+# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set
+# CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set
+# CONFIG_CRYPTO_CAST6_AVX_X86_64 is not set
+# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
+# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set
+# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set
+# CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set
+# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set
+# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set
+# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
+# CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set
+# CONFIG_CRYPTO_TWOFISH_AVX_X86_64 is not set
+# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set
+# CONFIG_CRYPTO_CHACHA20_X86_64 is not set
+# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
+# CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set
+# CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set
+# CONFIG_CRYPTO_BLAKE2S_X86 is not set
+# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
+# CONFIG_CRYPTO_POLY1305_X86_64 is not set
+# CONFIG_CRYPTO_SHA1_SSSE3 is not set
+# CONFIG_CRYPTO_SHA256_SSSE3 is not set
+# CONFIG_CRYPTO_SHA512_SSSE3 is not set
+# CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
+# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
+# CONFIG_CRYPTO_CRC32_PCLMUL is not set
+# end of Accelerated Cryptographic Algorithms for CPU (x86)
+
 # CONFIG_CRYPTO_HW is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
@@ -2875,6 +2955,7 @@ CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+# CONFIG_FIPS_SIGNATURE_SELFTEST is not set
 
 #
 # Certificates for signature checking
@@ -2894,8 +2975,7 @@ CONFIG_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_CORDIC=y
+CONFIG_CORDIC=m
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_RATIONAL=y
 CONFIG_GENERIC_PCI_IOMAP=y
@@ -2907,6 +2987,7 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 #
 # Crypto library routines
 #
+CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
@@ -2915,13 +2996,14 @@ CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
 # CONFIG_CRYPTO_LIB_POLY1305 is not set
 # CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA256=y
 # end of Crypto library routines
 
-CONFIG_LIB_MEMNEQ=y
 CONFIG_CRC_CCITT=y
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC64_ROCKSOFT is not set
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@@ -2939,6 +3021,7 @@ CONFIG_XXHASH=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMMON=y
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
@@ -2947,9 +3030,9 @@ CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
+# CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
-CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
@@ -2959,7 +3042,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_SWIOTLB=y
 # CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
@@ -2975,6 +3057,7 @@ CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_COPY_MC=y
 CONFIG_ARCH_STACKWALK=y
+CONFIG_STACKDEPOT=y
 CONFIG_SBITMAP=y
 # end of Library routines
 
@@ -2991,59 +3074,83 @@ CONFIG_PRINTK_TIME=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_DYNAMIC_DEBUG_CORE is not set
 CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
 
-CONFIG_AS_HAS_NON_CONST_LEB128=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
 
 #
 # Compile-time checks and compiler options
 #
+CONFIG_AS_HAS_NON_CONST_LEB128=y
+CONFIG_DEBUG_INFO_NONE=y
+# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 CONFIG_FRAME_WARN=2048
 # CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_READABLE_ASM is not set
+CONFIG_HEADERS_INSTALL=y
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_STACK_VALIDATION=y
+CONFIG_OBJTOOL=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # end of Compile-time checks and compiler options
 
 #
 # Generic Kernel Debugging Instruments
 #
 # CONFIG_MAGIC_SYSRQ is not set
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_FS_ALLOW_ALL=y
-# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
-# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+# CONFIG_DEBUG_FS is not set
 CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
 CONFIG_HAVE_ARCH_KCSAN=y
 CONFIG_HAVE_KCSAN_COMPILER=y
+# CONFIG_KCSAN is not set
 # end of Generic Kernel Debugging Instruments
 
-# CONFIG_DEBUG_KERNEL is not set
+#
+# Networking Debugging
+#
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
+# CONFIG_DEBUG_NET is not set
+# end of Networking Debugging
 
 #
 # Memory Debugging
 #
 # CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_PAGE_OWNER is not set
+# CONFIG_PAGE_TABLE_CHECK is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_ARCH_HAS_DEBUG_WX=y
 # CONFIG_DEBUG_WX is not set
 CONFIG_GENERIC_PTDUMP=y
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_SCHED_STACK_END_CHECK is not set
 CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+# CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_VM_PGTABLE is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
+# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
@@ -3051,22 +3158,31 @@ CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # CONFIG_KASAN is not set
 CONFIG_HAVE_ARCH_KFENCE=y
 # CONFIG_KFENCE is not set
+CONFIG_HAVE_ARCH_KMSAN=y
 # end of Memory Debugging
 
+# CONFIG_DEBUG_SHIRQ is not set
+
 #
 # Debug Oops, Lockups and Hangs
 #
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
 CONFIG_PANIC_TIMEOUT=0
+# CONFIG_SOFTLOCKUP_DETECTOR is not set
 CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_WQ_WATCHDOG is not set
 # CONFIG_TEST_LOCKUP is not set
 # end of Debug Oops, Lockups and Hangs
 
 #
 # Scheduler Debugging
 #
+CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_INFO=y
+# CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
 # CONFIG_DEBUG_TIMEKEEPING is not set
@@ -3075,40 +3191,72 @@ CONFIG_SCHED_INFO=y
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)
 
 # CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
 
 #
 # Debug kernel data structures
 #
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# CONFIG_DEBUG_MAPLE_TREE is not set
 # end of Debug kernel data structures
 
+# CONFIG_DEBUG_CREDENTIALS is not set
+
 #
 # RCU Debugging
 #
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_REF_SCALE_TEST is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging
 
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_LATENCYTOP is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_RETHOOK=y
 CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_NO_PATCHABLE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_FENTRY=y
 CONFIG_HAVE_OBJTOOL_MCOUNT=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_SAMPLES is not set
+CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
+CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_IO_STRICT_DEVMEM is not set
@@ -3121,11 +3269,17 @@ CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_EARLY_PRINTK_DBGP=y
 # CONFIG_EARLY_PRINTK_USB_XDBC is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_UDELAY is not set
 # CONFIG_IO_DELAY_NONE is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
 CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
@@ -3135,6 +3289,8 @@ CONFIG_UNWINDER_ORC=y
 # Kernel Testing and Coverage
 #
 # CONFIG_KUNIT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
@@ -3142,4 +3298,9 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_ARCH_USE_MEMTEST=y
 # CONFIG_MEMTEST is not set
 # end of Kernel Testing and Coverage
+
+#
+# Rust hacking
+#
+# end of Rust hacking
 # end of Kernel hacking
diff --git a/aports/mDNSResponder/APKBUILD b/aports/mDNSResponder/APKBUILD
index 5bcf199..49016e5 100644
--- a/aports/mDNSResponder/APKBUILD
+++ b/aports/mDNSResponder/APKBUILD
@@ -2,12 +2,12 @@
 
 pkgname='mDNSResponder'
 pkgver=1790.80.10
-pkgrel=0
+pkgrel=1
 pkgdesc='Bonjour (zero-configuration networking) by Apple'
 arch="x86_64"
 url='https://opensource.apple.com/tarballs/mDNSResponder/'
 license="APACHE-2.0 BSD3"
-makedepends="musl-nscd-dev mbedtls-dev"
+makedepends="linux-headers musl-nscd-dev mbedtls-dev"
 depends=
 install=
 options="!check !strip"
diff --git a/aports/openrc/0009-dont-overwrite-empty-supervise_daemon_args.patch b/aports/openrc/0009-dont-overwrite-empty-supervise_daemon_args.patch
deleted file mode 100644
index 4716d06..0000000
--- a/aports/openrc/0009-dont-overwrite-empty-supervise_daemon_args.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Patch-Source: https://github.com/OpenRC/openrc/pull/558
---
-From a2f1d65f1646e5f539e986f22964cf078ba58fce Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Sun, 6 Nov 2022 02:14:26 +0100
-Subject: [PATCH] supervise-daemon: don't overwrite empty supervise_daemon_args
-
-If supervise_daemon_args is not set *or empty*, it defaults to
-`start_stop_daemon_args`. This is bad because supervise-daemon doesn't
-accept the same options as `start-stop-daemon`. So if we set e.g.
-`start_stop_daemon_args="--wait 50"`, but not `supervise_daemon_args`,
-and the user adds `supervisor=supervise-daemon` to the corresponding
-/etc/conf.d/<service> file, the service will fail to start due to
-unrecognized option "wait".
-
-It would be best to remove this fallback, but that might break some
-existing scripts that depend on it. So this commit just changes it to
-use `start_stop_daemon_args` as the default for `supervise_daemon_args`
-only if `supervise_daemon_args` is not set at all, but not if it's
-empty.
-
-This at least simplifies workarounds; we can just add
-`supervise_daemon_args="$supervise_daemon_args"` to init scripts.
----
- sh/supervise-daemon.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sh/supervise-daemon.sh b/sh/supervise-daemon.sh
-index 8d2d6faff..8eb98a17a 100644
---- a/sh/supervise-daemon.sh
-+++ b/sh/supervise-daemon.sh
-@@ -41,7 +41,7 @@ supervise_start()
- 		${no_new_privs:+--no_new_privs} \
- 		${command_user+--user} $command_user \
- 		${umask+--umask} $umask \
--		${supervise_daemon_args:-${start_stop_daemon_args}} \
-+		${supervise_daemon_args-${start_stop_daemon_args}} \
- 		$command \
- 		-- $command_args $command_args_foreground
- 	rc=$?
diff --git a/aports/openrc/APKBUILD b/aports/openrc/APKBUILD
index c0289bd..7efd42e 100644
--- a/aports/openrc/APKBUILD
+++ b/aports/openrc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gabor Pali <pali.gabor@gmail.com>
 pkgname=openrc
-pkgver=0.45.2
-pkgrel=0 # base: 7
+pkgver=0.48
+pkgrel=0 # base: 0
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="https://github.com/OpenRC/openrc"
 arch="all"
@@ -21,10 +21,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve
 	0006-Add-support-for-starting-services-in-a-specified-VRF.patch
 	0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch
 	0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch
-	0009-dont-overwrite-empty-supervise_daemon_args.patch
-	$pkgname-grep-3.8.patch::https://github.com/OpenRC/openrc/commit/9380347f042f7d294317f4420b648422817eb75a.patch
 
-	remount-root.patch
 	supervise-daemon-defaults.patch
 
 	openrc.logrotate
@@ -126,7 +123,7 @@ package() {
 }
 
 sha512sums="
-ca2958772240f6e5037e39db1ee62a81091a2efa654da967f68e03a721868c6c0a41d32a2bddf55c8eadbc9bf5837b710cc2e4564844a7fbc0e585366da4fdf9  openrc-0.45.2.tar.gz
+c67c0a1c87f44a6fde0a7634fcdff0683a821eef5183a4f3e1ef850d04dd7f6c23ec0a72b4a76d9f6c08cb34e362d5e204937caec549eadc638c286c2389c5ee  openrc-0.48.tar.gz
 257861f5f0562e9b9a9fccebae474bd75c4bb51f005a2b8132fd551f061f65863de46c5bc4437f137b4a9d3ca741f9de9274bfa7b418eda70497ed4b5fd3056d  0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
 3f47b4f7e6c5b7fb53ff8a13470fbada67f7470e5eba71a683e6c022162c3905f560d561c3d61698e3fde367d6ae715edf76e99949f52a22a3bbf79debc33f64  0002-fsck-don-t-add-C0-to-busybox-fsck.patch
 0bd69d9e8e9c321a5e67cf924be07b9dd0b58801143c18f74bebf442958fc878e46a65f07cc2842566a8c3434e788ef3ca0c90c607de6b10931f01324bfc1b11  0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
@@ -135,9 +132,6 @@ ca2958772240f6e5037e39db1ee62a81091a2efa654da967f68e03a721868c6c0a41d32a2bddf55c
 8bf00b82d7fc0eb1b529ec735009f91d277141ba7e5c04e23d10bbcf36eb453f0b31d48aec45e50b5be4c14f611acc4454933f3cefdf8beab07d851328223464  0006-Add-support-for-starting-services-in-a-specified-VRF.patch
 431ac28808e684bea5511386bf5f06efe7f509f1dbe7e15ae6309563d813deae8f3edd872a0943ef8088e3cf778d7bc5ebd15a893dc4a08f4022b7a56bbafc63  0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch
 475f4ea63b9b5d7eb9c623e96b6cc3d3072abcb7194d0045b84e0688836c8514fccfc68b0eae0b4bee60878cdea8042c3ce7e48406ee7a2f0e4a3e128a153468  0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch
-7bdd5e97186fd9c9d17d3d9a19e16f8432e0abc27b067d2191c8038d3c32c5502ee0b5b6d539bc3550400cba63b6bccfcca05a7a3b95e352ea692b6a1be8000e  0009-dont-overwrite-empty-supervise_daemon_args.patch
-0a19a00af670e38742cea8e7f59a8ef329cc2fe7f57582ce8dcd0bfb90f7b5116cc0e64a6138f56c1c20c35354f835d1638bd14d6d2ebef2e5b4332a12ec8021  openrc-grep-3.8.patch
-5e60f2ea652349d716646ccf05b13a510e5797daafc5e491dd35cc3850c543a7e7499a70956f91f30702c524989386d6e08735d7ad9b7bda5ff0c2c249d52cf8  remount-root.patch
 1323a8476580f7b56a9cf1b24b26b10da76c5916cf23d7dab01f08a3261751341dfe01d1ed884df8e6ea17ff6a52021cc40fb3101e99b77d4ae7f3f61ee330e8  supervise-daemon-defaults.patch
 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec  openrc.logrotate
 493f27d588e64bb2bb542b32493ed05873f4724e8ad1751002982d7b4e07963cfb72f93603b2d678f305177cf9556d408a87b793744c6b7cd46cf9be4b744c02  hostname.initd
diff --git a/aports/rtl8821ce/APKBUILD b/aports/rtl8821ce/APKBUILD
index 8545949..b058e18 100644
--- a/aports/rtl8821ce/APKBUILD
+++ b/aports/rtl8821ce/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Gabor Pali <pali.gabor@gmail.com>
 
 pkgname='rtl8821ce'
-pkgver=20230101
-pkgrel=3
-_gitrev='a3e2f7c1f91e92f2dc788e8fcd7f2986af3d19b6'
+pkgver=20230915
+pkgrel=0
+_gitrev='0d2c745d7ef023bccd63cf79e98556f0b5a39024'
 pkgdesc='Driver for Realtek 8821CE, an 802.11ac device'
 arch="x86_64"
 url='https://github.com/tomaspinho/rtl8821ce'
@@ -28,5 +28,5 @@ package() {
 }
 
 sha512sums="
-8904d0d331d83b280f32c26e6d1f1bccf38d9933d58f9c9c7ee2d1b67e2e5a5c706b22cc224805f1572ccaa0dc8c7b650c77e710b51dc0a00596383b1356c413  a3e2f7c1f91e92f2dc788e8fcd7f2986af3d19b6.zip
+48b0ce599f580275aa836c9dd046721e65733831608104fde4b7a533defd533b124a9d28a1080473556723fb29eb38595e035c65098740f077c9900943a79e22  0d2c745d7ef023bccd63cf79e98556f0b5a39024.zip
 "
diff --git a/aports/rtw88/APKBUILD b/aports/rtw88/APKBUILD
new file mode 100644
index 0000000..86b6863
--- /dev/null
+++ b/aports/rtw88/APKBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Gabor Pali <pali.gabor@gmail.com>
+
+pkgname='rtw88'
+pkgver=20230913
+pkgrel=0
+_gitrev='d0f932dba10827bae07cb7044854651565591b87'
+pkgdesc='Backport of the Realtek Wifi 5 drivers from the wireless-next repo'
+arch="x86_64"
+url='https://github.com/lwfinger/rtw88'
+license="GPL-2.0"
+makedepends="linux-lts-dev xz"
+depends="linux-lts"
+install=
+options="!check !strip"
+source="Makefile.patch
+	https://github.com/lwfinger/rtw88/archive/${_gitrev}.zip"
+
+_kver=$(cd /usr/src/ && find . -mindepth 1 -maxdepth 1 -type d -name '*-lts' | sed 's!./linux-headers-!!')
+_kbase="/lib/modules/${_kver}"
+_srcdir="$srcdir/rtw88-$_gitrev"
+builddir="$_srcdir"
+
+prepare() {
+	default_prepare
+}
+
+build() {
+	make -C "$_srcdir" -j8 KVER="$_kver"
+}
+
+package() {
+	xz "$_srcdir"/*.ko
+	install -p -D -m 644 "$_srcdir"/*.ko.xz -t "$pkgdir"/lib/modules/"$_kver"/kernel/drivers/net/wireless/realtek/rtw88 
+}
+
+sha512sums="
+4a33c7cace66437d422816c74810bd637f846be5d7935ef8aaae70971e35cf04640e10d71b3c62e6e951809188bd6c6846f2ebf1d90dd9bb45aedcfdf833bc8b  Makefile.patch
+8d1aaaa1942230cb5f1ca82123fda020760ff71a281be3826b4bafacee442c0b647928a4bccab1c70fe559d91550962b23998710ac7ab8b995f335230519281c  d0f932dba10827bae07cb7044854651565591b87.zip
+"
diff --git a/aports/rtw88/Makefile.patch b/aports/rtw88/Makefile.patch
new file mode 100644
index 0000000..284bc95
--- /dev/null
+++ b/aports/rtw88/Makefile.patch
@@ -0,0 +1,62 @@
+--- a/Makefile
++++ b/Makefile
+@@ -57,59 +57,26 @@
+ obj-m      += rtw_8822be.o
+ rtw_8822be-objs               := rtw8822be.o
+ 
+-obj-m      += rtw_8822bu.o
+-rtw_8822bu-objs		:= rtw8822bu.o
+-
+-obj-m	   += rtw_8822bs.o
+-rtw_8822bs-objs		:= rtw8822bs.o
+-
+ obj-m       += rtw_8822c.o
+ rtw_8822c-objs                := rtw8822c.o rtw8822c_table.o
+ 
+ obj-m      += rtw_8822ce.o
+ rtw_8822ce-objs               := rtw8822ce.o
+ 
+-obj-m      += rtw_8822cu.o
+-rtw_8822cu-objs		:= rtw8822cu.o
+-
+-obj-m	   += rtw_8822cs.o
+-rtw_8822cs-objs		:= rtw8822cs.o
+-
+ obj-m       += rtw_8723d.o
+ rtw_8723d-objs          := rtw8723d.o rtw8723d_table.o
+ 
+ obj-m      += rtw_8723de.o
+ rtw_8723de-objs               := rtw8723de.o
+ 
+-obj-m      += rtw_8723du.o
+-rtw_8723du-objs		:= rtw8723du.o
+-
+-obj-m      += rtw_8723ds.o
+-rtw_8723ds-objs		:= rtw8723ds.o
+-
+ obj-m	+= rtw_8821c.o
+ rtw_8821c-objs		:= rtw8821c.o rtw8821c_table.o
+ 
+ obj-m	+= rtw_8821ce.o
+ rtw_8821ce-objs		:= rtw8821ce.o
+ 
+-obj-m	   += rtw_8821cs.o
+-rtw_8821cs-objs		:= rtw8821cs.o
+-
+-obj-m	+= rtw_8821cu.o
+-rtw_8821cu-objs		:= rtw8821cu.o
+-
+ obj-m			+= rtw_pci.o
+ rtw_pci-objs		:= pci.o
+-
+-obj-m			+= rtw_sdio.o
+-rtw_sdio-objs		:= sdio.o
+-
+-obj-m			+= rtw_usb.o
+-rtw_usb-objs		:= usb.o
+-
+-obj-m         += rtw_usb.o
+-rtw_usb-objs                := usb.o
+ 
+ ccflags-y += -D__CHECK_ENDIAN__
+ 
diff --git a/aports/rtw89/APKBUILD b/aports/rtw89/APKBUILD
index 0922319..693716c 100644
--- a/aports/rtw89/APKBUILD
+++ b/aports/rtw89/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Gabor Pali <pali.gabor@gmail.com>
 
 pkgname='rtw89'
-pkgver=20230325
+pkgver=20230913
 pkgrel=0
-_gitrev='61e1f9228c0e730b372d38a42154a515e1318862'
+_gitrev='12837647e34f07e117d90b25708a4f8baa772f50'
 pkgdesc='Driver for Realtek 8852AE, an 802.11ax device'
 arch="x86_64"
 url='https://github.com/lwfinger/rtw89'
@@ -14,7 +14,7 @@ install=
 options="!check !strip"
 source="https://github.com/lwfinger/rtw89/archive/${_gitrev}.zip"
 
-_kver=$(cd /usr/src/ && find . -mindepth 1 -maxdepth 1 -type d | sed 's!./linux-headers-!!')
+_kver=$(cd /usr/src/ && find . -mindepth 1 -maxdepth 1 -type d -name '*-lts' | sed 's!./linux-headers-!!')
 _kbase="/lib/modules/${_kver}"
 _srcdir="$srcdir/rtw89-$_gitrev"
 
@@ -28,5 +28,5 @@ package() {
 }
 
 sha512sums="
-aef394107e125d9e872f87a9f1d57bee15a67ec82a27dc0b6e9dc11f271705193e6c2cfa60d3e788f1faac2b5f9108982bab7993e1bc33b71bcf8a76890e41c8  61e1f9228c0e730b372d38a42154a515e1318862.zip
+7a5318149da92925736cc5fa7746940c83c60ada07442c5e362fe7ee2bb67c3b5de1905f39a7e08be8c752aef23b0807f5e0202d665ed8dcc66149a4983fdb52  12837647e34f07e117d90b25708a4f8baa772f50.zip
 "
diff --git a/aports/socat/APKBUILD b/aports/socat/APKBUILD
index 53e0c4f..5fd3a09 100644
--- a/aports/socat/APKBUILD
+++ b/aports/socat/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=socat
 pkgver=1.7.4.4
-pkgrel=0 # base: 0
+pkgrel=1 # base: 1
 pkgdesc="Multipurpose relay for binary protocols (stripped)"
 options="!check"
 url="http://www.dest-unreach.org/socat/"
diff --git a/aports/uds_passthru/APKBUILD b/aports/uds_passthru/APKBUILD
index 5bc327c..76e087b 100644
--- a/aports/uds_passthru/APKBUILD
+++ b/aports/uds_passthru/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=uds_passthru
 pkgver=0.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Unix Domain Socket pass-through for Wifibox"
 url="https://github.com/pgj/freebsd-wifibox-alpine"
 arch="all"
diff --git a/aports/wpa_supplicant/0002-AP-guard-FT-SAE-code-with-CONFIG_IEEE80211R_AP.patch b/aports/wpa_supplicant/0002-AP-guard-FT-SAE-code-with-CONFIG_IEEE80211R_AP.patch
new file mode 100644
index 0000000..6509bcd
--- /dev/null
+++ b/aports/wpa_supplicant/0002-AP-guard-FT-SAE-code-with-CONFIG_IEEE80211R_AP.patch
@@ -0,0 +1,56 @@
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Mon, 4 Apr 2022 09:13:12 +0200
+Subject: AP: guard FT-SAE code with CONFIG_IEEE80211R_AP
+
+wpa_supplicant doesn't support FT in AP mode, but it still negotiates
+FT-SAE. This can lead to an authentication failure when the AP is
+started with key_mgmt="SAE FT-SAE" and the STA supports both.
+
+Ensure that FT-SAE is not negotiated when CONFIG_IEEE80211R_AP is not
+defined.
+
+Signed-off-by: Beniamino Galvani <bgalvani@redhat.com>
+---
+ src/ap/wpa_auth_ie.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/ap/wpa_auth_ie.c b/src/ap/wpa_auth_ie.c
+index 524922e..d63cbeb 100644
+--- a/src/ap/wpa_auth_ie.c
++++ b/src/ap/wpa_auth_ie.c
+@@ -228,11 +228,13 @@ int wpa_write_rsn_ie(struct wpa_auth_config *conf, u8 *buf, size_t len,
+ 		pos += RSN_SELECTOR_LEN;
+ 		num_suites++;
+ 	}
++#ifdef CONFIG_IEEE80211R_AP
+ 	if (conf->wpa_key_mgmt & WPA_KEY_MGMT_FT_SAE) {
+ 		RSN_SELECTOR_PUT(pos, RSN_AUTH_KEY_MGMT_FT_SAE);
+ 		pos += RSN_SELECTOR_LEN;
+ 		num_suites++;
+ 	}
++#endif /* CONFIG_IEEE80211R_AP */
+ #endif /* CONFIG_SAE */
+ 	if (conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B) {
+ 		RSN_SELECTOR_PUT(pos, RSN_AUTH_KEY_MGMT_802_1X_SUITE_B);
+@@ -670,8 +672,10 @@ wpa_validate_wpa_ie(struct wpa_authenticator *wpa_auth,
+ #ifdef CONFIG_SAE
+ 		else if (data.key_mgmt & WPA_KEY_MGMT_SAE)
+ 			selector = RSN_AUTH_KEY_MGMT_SAE;
++#ifdef CONFIG_IEEE80211R_AP
+ 		else if (data.key_mgmt & WPA_KEY_MGMT_FT_SAE)
+ 			selector = RSN_AUTH_KEY_MGMT_FT_SAE;
++#endif /* CONFIG_IEEE80211R_AP */
+ #endif /* CONFIG_SAE */
+ 		else if (data.key_mgmt & WPA_KEY_MGMT_IEEE8021X)
+ 			selector = RSN_AUTH_KEY_MGMT_UNSPEC_802_1X;
+@@ -778,8 +782,10 @@ wpa_validate_wpa_ie(struct wpa_authenticator *wpa_auth,
+ #ifdef CONFIG_SAE
+ 	else if (key_mgmt & WPA_KEY_MGMT_SAE)
+ 		sm->wpa_key_mgmt = WPA_KEY_MGMT_SAE;
++#ifdef CONFIG_IEEE80211R_AP
+ 	else if (key_mgmt & WPA_KEY_MGMT_FT_SAE)
+ 		sm->wpa_key_mgmt = WPA_KEY_MGMT_FT_SAE;
++#endif /* CONFIG_IEEE80211R_AP */
+ #endif /* CONFIG_SAE */
+ 	else if (key_mgmt & WPA_KEY_MGMT_IEEE8021X)
+ 		sm->wpa_key_mgmt = WPA_KEY_MGMT_IEEE8021X;
diff --git a/aports/wpa_supplicant/APKBUILD b/aports/wpa_supplicant/APKBUILD
index 749ba5a..dff5eed 100644
--- a/aports/wpa_supplicant/APKBUILD
+++ b/aports/wpa_supplicant/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=wpa_supplicant
 pkgver=2.10
-pkgrel=4 # base: 5
+pkgrel=5 # base: 7
 pkgdesc="utility providing key negotiation for WPA wireless networks"
 url="https://w1.fi/wpa_supplicant/"
 arch="all"
@@ -11,15 +11,19 @@ license="BSD-3-Clause"
 subpackages=
 makedepends="linux-headers openssl-dev>3 dbus-dev libnl3-dev pcsc-lite-dev"
 source="https://w1.fi/releases/wpa_supplicant-$pkgver.tar.gz
-	0001-nl80211-add-extra-ies-only-if-allowed-by-driver.patch
 	wpa_supplicant.initd
 	wpa_supplicant.confd
+
 	eloop.patch
 	unsafe-renegotiation-1.patch
 	unsafe-renegotiation-2.patch
+
+	0001-nl80211-add-extra-ies-only-if-allowed-by-driver.patch
+	0002-AP-guard-FT-SAE-code-with-CONFIG_IEEE80211R_AP.patch
 	lower-security-level-for-tls-1.patch
 	no-tools.patch
-	config"
+	config
+	"
 
 # secfixes:
 #   2.9-r13:
@@ -77,12 +81,13 @@ package() {
 
 sha512sums="
 021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1  wpa_supplicant-2.10.tar.gz
-fb328872087268056b035802f71df2f7af8d11699822fe68611201a07dc693c4fdb8c50dd4fd509ed6db4cca89f6003ce3303770951686a35633977f466f4fb5  0001-nl80211-add-extra-ies-only-if-allowed-by-driver.patch
 92c4cbaa9776a354275640c9411d2f547f4c0e00415af4ab30039f1a0be6a11082d49e2514905010f0abcc4a9276353276da9864e3d5f7264a0f0767c8cc9d78  wpa_supplicant.initd
 c7e4041fe41743c5e63a07edc9234d0c44c4c0f193a180b27342b43f3be45fb87b42ee0f9e4a20614cf6ad58cf64d25f74d1e75e2e1d521c2f6d45cdc5737eae  wpa_supplicant.confd
 2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232  eloop.patch
 9528735924faf876a7094de46760605e5e66e265187421a668be06dbf03d7b4db6b84cbad793fcd6bd614e3ba540f82f1f80660d75e8a6070eeb7e9abb54ed28  unsafe-renegotiation-1.patch
 a92ba3ed3f41022a8af9396d2b703ee47f78aa05c1fddb42919a7fe6a6fad71e3515c63457e97e252ae0a32c6c34d67ea6efe0278df1e141cf36e650237e5295  unsafe-renegotiation-2.patch
+fb328872087268056b035802f71df2f7af8d11699822fe68611201a07dc693c4fdb8c50dd4fd509ed6db4cca89f6003ce3303770951686a35633977f466f4fb5  0001-nl80211-add-extra-ies-only-if-allowed-by-driver.patch
+f8a5f5e18509b61ad6fb7ce78207c039fccfca6b71f494cbe9853bcb1b09025364554a45b6129a5b992f6327f72c8a97b660088d9c542f0e62a1c370a3c628a8  0002-AP-guard-FT-SAE-code-with-CONFIG_IEEE80211R_AP.patch
 b1217eff6fbdba5a4c7302ea33bec64290d26745967b24e825c100de9b0e9b6400f0769c3cfac3c761596bb01079c31b632f14bd3374735200385f38557d8cad  lower-security-level-for-tls-1.patch
 3278eff7118f9dc9e177adc3ed91cad562a8edde396af8619321ac8552a86e9c7de25212d5578ea17cbe4b6dc928d83cd6e9a7f0d41e07576656e6e9274107d6  no-tools.patch
 310ee960c3d8beab80169bedf43ff9dfbf49f808c5a32accac2f41e54fff6d047a6136488de72cbcfa66c5205a3b68019dff6e7f2ebb87e00bbcdc509fca95ee  config
diff --git a/man/wifibox-alpine.5 b/man/wifibox-alpine.5
index 3160124..7ee7815 100644
--- a/man/wifibox-alpine.5
+++ b/man/wifibox-alpine.5
@@ -1,4 +1,4 @@
-.Dd July 26, 2023
+.Dd July 31, 2023
 .Dt WIFIBOX-ALPINE 5
 .Os
 .Sh NAME
@@ -301,7 +301,7 @@ Further components of the guest that are not directly configurable or
 visible to the outside:
 .Bl -bullet
 .It
-Version 5.15 (LTS) of the Linux kernel and its wireless drivers are
+Version 6.1 (LTS) of the Linux kernel and its wireless drivers are
 used to communicate with exposed hardware.  It does not always work
 with the latest ones, see the section on supported hardware for the
 exact details.
author	PÁLI Gábor János <pali.gabor@gmail.com>	2023-08-03 10:10:44 +0200
committer	PÁLI Gábor János <pali.gabor@gmail.com>	2023-09-16 17:58:03 +0200
commit	89279d87c5d3e0ea330be1f927e3f3bc59dbc2a7 (patch)
tree	353bc9a026d0140151e760efbc4f6a6a6b24a020
parent	084335e136581edc28137b152cc559778224570e (diff)
download	freebsd-wifibox-alpine-89279d87c5d3e0ea330be1f927e3f3bc59dbc2a7.zip