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

1 files changed, 0 insertions, 176 deletions

diff --git a/aports/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch b/aports/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
deleted file mode 100644
index ab3421e..0000000
--- a/aports/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From cc005e48ebd831199789d9dfb1a9307e743ecdaa 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
-Subject: [PATCH] fbsplash: support image and bar alignment and positioning
-
-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
---- a/miscutils/fbsplash.c
-+++ b/miscutils/fbsplash.c
-@@ -54,7 +54,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"
--//usage:     "\n			BAR_R,BAR_G,BAR_B,IMG_LEFT,IMG_TOP"
-+//usage:     "\n			BAR_R,BAR_G,BAR_B,IMG_LEFT,IMG_TOP,IMG_ALIGN"
- //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 @@
- 
- #define ESC "\033"
- 
-+enum {
-+	bar_width,
-+	bar_height,
-+	bar_posx,
-+	bar_posy,
-+	bar_colr,
-+	bar_colg,
-+	bar_colb,
-+	nimg_posx,
-+	nimg_posy,
-+	nimg_align,
-+	num_ns_opts,
-+	debug = num_ns_opts,
-+};
-+
-+#define nbar_width	ns[bar_width]
-+#define nbar_height	ns[bar_height]
-+#define nbar_posx	ns[bar_posx]
-+#define nbar_posy	ns[bar_posy]
-+#define nbar_colr	ns[bar_colr]
-+#define nbar_colg	ns[bar_colg]
-+#define nbar_colb	ns[bar_colb]
-+#define img_posx	ns[nimg_posx]
-+#define img_posy	ns[nimg_posy]
-+#define img_align	ns[nimg_align]
-+
- struct globals {
- #if DEBUG
- 	bool bdebug_messages;	// enable/disable logging
- 	FILE *logfile_fd;	// log file
- #endif
- 	unsigned char *addr;	// pointer to framebuffer memory
--	unsigned ns[9];		// n-parameters
-+	unsigned ns[num_ns_opts];	// n-parameters
- 	const char *image_filename;
- 	int silent_tty, fd_tty_s;
- 	bool do_not_draw;
-@@ -96,16 +122,6 @@ struct globals {
- 	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
- } while (0)
- 
--#define nbar_width	ns[0]	// progress bar width
--#define nbar_height	ns[1]	// progress bar height
--#define nbar_posx	ns[2]	// progress bar horizontal position
--#define nbar_posy	ns[3]	// progress bar vertical position
--#define nbar_colr	ns[4]	// progress bar color red component
--#define nbar_colg	ns[5]	// progress bar color green component
--#define nbar_colb	ns[6]	// progress bar color blue component
--#define img_posx	ns[7]	// image horizontal position
--#define img_posy	ns[8]	// image vertical position
--
- #if DEBUG
- #define DEBUG_MESSAGE(strMessage, args...) \
- 	if (G.bdebug_messages) { \
-@@ -386,7 +402,7 @@ static void fb_drawimage(void)
- 	FILE *theme_file;
- 	char *read_ptr;
- 	unsigned char *pixline;
--	unsigned i, j, width, height, line_size;
-+	int i, j, width, height, line_size, xoffs, yoffs, xstart;
- 
- 	if (LONE_DASH(G.image_filename)) {
- 		theme_file = stdin;
-@@ -436,18 +452,39 @@ static void fb_drawimage(void)
- 	line_size = width*3;
- 	pixline = xmalloc(line_size);
- 
--	if ((width + G.img_posx) > G.scr_var.xres)
--		width = G.scr_var.xres - G.img_posx;
--	if ((height + G.img_posy) > G.scr_var.yres)
--		height = G.scr_var.yres - G.img_posy;
--	for (j = 0; j < height; j++) {
-+	xoffs = G.img_posx;
-+	switch (G.img_align % 3) {
-+	case 1: xoffs += (G.scr_var.xres - width) / 2; break;
-+	case 2: xoffs += G.scr_var.xres - width; break;
-+	}
-+	xstart = 0;
-+	if (xoffs < 0) {
-+		xstart = -xoffs;
-+		xoffs = 0;
-+	}
-+	if ((width + xoffs) > G.scr_var.xres)
-+		width = G.scr_var.xres - xoffs;
-+
-+	yoffs = G.img_posy;
-+	switch (G.img_align / 3) {
-+	case 1: yoffs += (G.scr_var.yres - height) / 2; break;
-+	case 2: yoffs += G.scr_var.yres - height; break;
-+	}
-+	if ((height + yoffs) > G.scr_var.yres)
-+		height = G.scr_var.yres - yoffs;
-+
-+	for (j = 0; j < height; j++, yoffs++) {
- 		unsigned char *pixel;
- 		unsigned char *src;
- 
- 		if (fread(pixline, 1, line_size, theme_file) != line_size)
- 			bb_error_msg_and_die("bad PPM file '%s'", G.image_filename);
--		pixel = pixline;
--		src = G.addr + (G.img_posy + j) * G.scr_fix.line_length + G.img_posx * G.bytes_per_pixel;
-+
-+		if (yoffs < 0)
-+			continue;
-+
-+		pixel = pixline + xstart * 3;
-+		src = G.addr + yoffs * G.scr_fix.line_length + xoffs * G.bytes_per_pixel;
- 		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)
-  */
- static void init(const char *cfg_filename)
- {
-+	static const char align_names[] ALIGN1 =
-+		"LT\0" "CT\0" "RT\0"
-+		"LM\0" "CM\0" "RM\0"
-+		"LB\0" "CB\0" "RB\0";
- 	static const char param_names[] ALIGN1 =
- 		"BAR_WIDTH\0" "BAR_HEIGHT\0"
- 		"BAR_LEFT\0" "BAR_TOP\0"
- 		"BAR_R\0" "BAR_G\0" "BAR_B\0"
--		"IMG_LEFT\0" "IMG_TOP\0"
-+		"IMG_LEFT\0" "IMG_TOP\0" "IMG_ALIGN\0"
- #if DEBUG
- 		"DEBUG\0"
- #endif
-@@ -479,14 +520,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))) {
--		unsigned val = xatoi_positive(token[1]);
-+		unsigned val;
- 		int i = index_in_strings(param_names, token[0]);
- 		if (i < 0)
- 			bb_error_msg_and_die("syntax error: %s", token[0]);
--		if (i >= 0 && i < 9)
-+		if (i == nimg_align)
-+			val = index_in_strings(align_names, token[1]);
-+		else
-+			val = xatoi_positive(token[1]);
-+		if (i < num_ns_opts)
- 			G.ns[i] = val;
- #if DEBUG
--		if (i == 9) {
-+		if (i == debug) {
- 			G.bdebug_messages = val;
- 			if (G.bdebug_messages)
- 				G.logfile_fd = xfopen_for_write("/tmp/fbsplash.log");