[openwrt/openwrt] apk: backport patch fixing broken apk update with wget fetch

[LEDE Commits]

ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/47fed9b61b994c10bfdb9c5dd74576429e42f15b

commit 47fed9b61b994c10bfdb9c5dd74576429e42f15b
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Tue Mar 4 01:03:10 2025 +0100

    apk: backport patch fixing broken apk update with wget fetch
    
    APK update is currently broken if wget is used as a tool. This wasn't
    correctly tested and cause seg fault. Backport the patch fixing this to
    restore original functionality.
    
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 package/system/apk/Makefile                        |  2 +-
 ...-correctly-init-wget_out-on-apk_io_url_in.patch | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile
index b1b1fd3a40..f753b41f85 100644
--- a/package/system/apk/Makefile
+++ b/package/system/apk/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apk
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git
 PKG_SOURCE_PROTO:=git
diff --git a/package/system/apk/patches/0002-io_url_wget-correctly-init-wget_out-on-apk_io_url_in.patch b/package/system/apk/patches/0002-io_url_wget-correctly-init-wget_out-on-apk_io_url_in.patch
new file mode 100644
index 0000000000..305e367727
--- /dev/null
+++ b/package/system/apk/patches/0002-io_url_wget-correctly-init-wget_out-on-apk_io_url_in.patch
@@ -0,0 +1,27 @@
+From a50f7ea2dd023ef124c5209b487608b37dbeea7c Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth at gmail.com>
+Date: Sat, 1 Mar 2025 19:33:18 +0100
+Subject: [PATCH] io_url_wget: correctly init wget_out on apk_io_url_init call
+
+Commit fc7768c09497 ("io_url_wget: log wget output using apk_process
+api") reworked the implementation but forgot to init the static wget_out
+on calling apk_io_url_init. This cause APK to SIGFAULT on apk update or
+apk add when actually using the WGET method to download remote packages.
+
+Fix this by setting wget_out with the passed out from apk_io_url_init.
+
+Reported-by: John Crispin <john at phrozen.org>
+Fixes: fc7768c09497 ("io_url_wget: log wget output using apk_process api")
+Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
+---
+ src/io_url_wget.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/io_url_wget.c
++++ b/src/io_url_wget.c
+@@ -48,4 +48,5 @@ void apk_io_url_set_redirect_callback(vo
+ 
+ void apk_io_url_init(struct apk_out *out)
+ {
++	wget_out = out;
+ }