groups/241.native_packages_inet.group: wget2: bump to v2.0.1

Signed-off-by: Ørjan Malde <red@foxi.me>

3 files changed, 17 insertions, 124 deletions

diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 3e760509..a0f59ba7 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -263,8 +263,8 @@ mutt_cv_regex_broken=no"};
 : ${PKG_WGET_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
 : ${PKG_WGET_PYTHON:=${PREFIX}/bin/python3};
 : ${PKG_WGET2_DEPENDS:="gnutls gpgme libz libidn2 libpsl bzip2 pcre2 xz zstd"};
-: ${PKG_WGET2_SHA256SUM:=4fe2fba0abb653ecc1cc180bea7f04212c17e8fe05c85aaac8baeac4cd241544};
-: ${PKG_WGET2_VERSION:=2.0.0};
+: ${PKG_WGET2_SHA256SUM:=0bb7fa03697bb5b8d05e1b5e15b863440826eb845874c4ffb5e32330f9845db1};
+: ${PKG_WGET2_VERSION:=2.0.1};
 : ${PKG_WGET2_URL:=https://ftp.gnu.org/gnu/wget/wget2-${PKG_WGET2_VERSION}.tar.gz};
 : ${PKG_WHOIS_DEPENDS:="libidn2"};
 : ${PKG_WHOIS_SHA256SUM:=e1ff3ab502f808ee993c49073beb2fa0642ba73922d7523bbb4a4e65802cd210};
diff --git a/patches/wget2-2.0.0_pre.local.patch b/patches/wget2-2.0.0_pre.local.patch
deleted file mode 100644
index 0b67c8b1..00000000
--- a/patches/wget2-2.0.0_pre.local.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -ru wget2-2.0.0.orig/libwget/Makefile.in wget2-2.0.0/libwget/Makefile.in
---- wget2-2.0.0.orig/libwget/Makefile.in	2021-09-12 13:37:52.000000000 +0200
-+++ wget2-2.0.0/libwget/Makefile.in	2021-09-27 01:45:33.013896090 +0200
-@@ -2527,95 +2527,95 @@
- @ENABLE_MANYLIBS_TRUE@libwget_alloc_la_SOURCES = xalloc.c
- @ENABLE_MANYLIBS_TRUE@libwget_alloc_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_alloc_la_LIBADD = ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_alloc_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_alloc_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_ip_la_SOURCES = ip.c
- @ENABLE_MANYLIBS_TRUE@libwget_ip_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_ip_la_LIBADD = $(INET_PTON_LIB) ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_ip_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_ip_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_common_la_SOURCES = buffer.c buffer_printf.c base64.c bitmap.c hashmap.c list.c log.c mem.c printf.c stringmap.c strlcpy.c strscpy.c utils.c vector.c error.c
- @ENABLE_MANYLIBS_TRUE@libwget_common_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_common_la_LIBADD = libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_common_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_common_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_thread_la_SOURCES = thread.c
- @ENABLE_MANYLIBS_TRUE@libwget_thread_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_thread_la_LIBADD = libwget_alloc.la $(LIB_CLOCK_GETTIME) $(LTLIBMULTITHREAD) $(LTLIBTHREAD) ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_thread_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_thread_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_encoding_la_SOURCES = encoding.c
- @ENABLE_MANYLIBS_TRUE@libwget_encoding_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_encoding_la_LIBADD = libwget_common.la libwget_alloc.la $(LIBIDN_LIBS) $(LIBIDN2_LIBS) ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_encoding_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_encoding_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_iri_la_SOURCES = iri.c
- @ENABLE_MANYLIBS_TRUE@libwget_iri_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_iri_la_LIBADD = libwget_encoding.la libwget_ip.la libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_iri_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_iri_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_io_la_SOURCES = io.c
- @ENABLE_MANYLIBS_TRUE@libwget_io_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_io_la_LIBADD = libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_io_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_io_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_hashfile_la_SOURCES = hashfile.c
- @ENABLE_MANYLIBS_TRUE@libwget_hashfile_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_hashfile_la_LIBADD = libwget_common.la libwget_alloc.la $(GNUTLS_LIBS) $(WOLFSSL_LIBS) $(OPENSSL_LIBS) $(NETTLE_LIBS) ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_hashfile_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_hashfile_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_hpkp_db_la_SOURCES = hpkp_db.c hpkp.c hpkp.h
- @ENABLE_MANYLIBS_TRUE@libwget_hpkp_db_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_hpkp_db_la_LIBADD = libwget_hashfile.la libwget_io.la libwget_thread.la libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_hpkp_db_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_hpkp_db_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_hsts_la_SOURCES = hsts.c
- @ENABLE_MANYLIBS_TRUE@libwget_hsts_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_hsts_la_LIBADD = libwget_io.la libwget_thread.la libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_hsts_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_hsts_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_ocsp_la_SOURCES = ocsp.c
- @ENABLE_MANYLIBS_TRUE@libwget_ocsp_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_ocsp_la_LIBADD = libwget_io.la libwget_thread.la libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_ocsp_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_ocsp_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_tls_session_la_SOURCES = tls_session.c
- @ENABLE_MANYLIBS_TRUE@libwget_tls_session_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_tls_session_la_LIBADD = libwget_io.la libwget_thread.la libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_tls_session_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_tls_session_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_http_parse_la_SOURCES = http_parse.c cookie_parse.c cookie.h hpkp.c cookie.h
- @ENABLE_MANYLIBS_TRUE@libwget_http_parse_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_http_parse_la_LIBADD = libwget_encoding.la libwget_common.la libwget_alloc.la $(LIBPSL_LIBS) ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_http_parse_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_http_parse_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_logger_la_SOURCES = logger.c
- @ENABLE_MANYLIBS_TRUE@libwget_logger_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_logger_la_LIBADD = libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_logger_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_logger_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_dnscache_la_SOURCES = dns_cache.c
- @ENABLE_MANYLIBS_TRUE@libwget_dnscache_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_dnscache_la_LIBADD = libwget_thread.la libwget_common.la libwget_alloc.la $(GETADDRINFO_LIB) ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_dnscache_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_dnscache_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_dns_la_SOURCES = dns.c
- @ENABLE_MANYLIBS_TRUE@libwget_dns_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_dns_la_LIBADD = libwget_dnscache.la libwget_ip.la libwget_logger.la libwget_thread.la libwget_common.la libwget_alloc.la $(GETADDRINFO_LIB) ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_dns_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_dns_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_robots_la_SOURCES = robots.c
- @ENABLE_MANYLIBS_TRUE@libwget_robots_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_robots_la_LIBADD = libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_robots_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_robots_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_xml_la_SOURCES = xml.c
- @ENABLE_MANYLIBS_TRUE@libwget_xml_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_xml_la_LIBADD = libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_xml_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_xml_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_metalink_la_SOURCES = metalink.c
- @ENABLE_MANYLIBS_TRUE@libwget_metalink_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_metalink_la_LIBADD = libwget_xml.la libwget_iri.la libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_metalink_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_metalink_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_netrc_la_SOURCES = netrc.c
- @ENABLE_MANYLIBS_TRUE@libwget_netrc_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_netrc_la_LIBADD = libwget_io.la libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_netrc_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_netrc_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_decompress_la_SOURCES = decompressor.c
- @ENABLE_MANYLIBS_TRUE@libwget_decompress_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_decompress_la_LIBADD = libwget_common.la libwget_alloc.la ../lib/libgnu.la $(ZSTD_LIBS) $(BROTLIDEC_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(BZ2_LIBS) $(LZIP_LIBS)
--@ENABLE_MANYLIBS_TRUE@libwget_decompress_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_decompress_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_css_la_SOURCES = css_url.c css.c css_tokenizer.h
- @ENABLE_MANYLIBS_TRUE@libwget_css_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_css_la_LIBADD = libcsstokenizer.la libwget_iri.la libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_css_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_css_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_progress_la_SOURCES = bar.c
- @ENABLE_MANYLIBS_TRUE@libwget_progress_la_CPPFLAGS = $(libwget_la_CPPFLAGS)
- @ENABLE_MANYLIBS_TRUE@libwget_progress_la_LIBADD = libwget_thread.la libwget_common.la libwget_alloc.la ../lib/libgnu.la
--@ENABLE_MANYLIBS_TRUE@libwget_progress_la_LDFLAGS = $(libwget_la_LDFLAGS) -no-whole-archive
-+@ENABLE_MANYLIBS_TRUE@libwget_progress_la_LDFLAGS = $(libwget_la_LDFLAGS)
- @ENABLE_MANYLIBS_TRUE@test_linking_common_SOURCES = test_linking_common.c
- @ENABLE_MANYLIBS_TRUE@test_linking_common_CPPFLAGS = -I$(top_srcdir)/include/wget -I$(top_builddir)/include/wget
- @ENABLE_MANYLIBS_TRUE@test_linking_common_LDADD = libwget_common.la
diff --git a/patches/wget2-2.0.1.local.patch b/patches/wget2-2.0.1.local.patch
new file mode 100644
index 00000000..2e412fd8
--- /dev/null
+++ b/patches/wget2-2.0.1.local.patch
@@ -0,0 +1,15 @@
+diff -ru wget2-2.0.1.orig/libwget/net.c wget2-2.0.1/libwget/net.c
+--- wget2-2.0.1.orig/libwget/net.c	2022-02-27 19:21:11.000000000 +0100
++++ wget2-2.0.1/libwget/net.c	2022-12-21 12:51:40.841232059 +0100
+@@ -608,9 +608,11 @@
+ 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on)) == -1)
+ 		error_printf(_("Failed to set socket option REUSEADDR\n"));
+ 
++#ifndef __midipix__
+ 	on = 1;
+ 	if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (void *)&on, sizeof(on)) == -1)
+ 		error_printf(_("Failed to set socket option NODELAY\n"));
++#endif
+ 
+ #ifdef SO_BINDTODEVICE
+ 	if (tcp->bind_interface) {