From: Nick Hainke <vincent@systemli.org>
Date: Mon, 10 Oct 2022 06:31:29 +0000 (+0200)
Subject: wget: update to 1.21.3
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f9bbda2e4cc4d102cdab2c0aaebd3e8974540ff5;p=feed%2Fpackages.git

wget: update to 1.21.3

Release Notes:
https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00017.html

Remove the patch "100-fix-sts-time". This patch was replaced upstream by
several other fixes, see:
https://git.savannah.gnu.org/cgit/wget.git/log/src/hsts.c

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 5075f5b7010617ba916f251b418ef7c79b760b0a)
---

diff --git a/net/wget/Makefile b/net/wget/Makefile
index f6b0881211..915942f988 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wget
-PKG_VERSION:=1.21.2
+PKG_VERSION:=1.21.3
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=e6d4c76be82c676dd7e8c61a29b2ac8510ae108a810b5d1d18fc9a1d2c9a2497
+PKG_HASH:=5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5
 
 PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
 PKG_LICENSE:=GPL-3.0-or-later
diff --git a/net/wget/patches/100-fix-hsts-time.patch b/net/wget/patches/100-fix-hsts-time.patch
deleted file mode 100644
index 964d2957b0..0000000000
--- a/net/wget/patches/100-fix-hsts-time.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Huangbin Zhan <zhanhb88@gmail.com>
-Date: Tue, 9 Nov 2021 23:05:55 +0800
-Subject: [PATCH] hsts.c: fix timestamp reading and writing.
-
-Always get zero time on big endian 32bit OS with 64bit time_t such as mips_24kc_musl.
----
- src/hsts.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
---- a/src/hsts.c
-+++ b/src/hsts.c
-@@ -280,7 +280,7 @@ hsts_read_database (hsts_store_t store,
- 
-   char host[256];
-   int port;
--  time_t created, max_age;
-+  uintmax_t created, max_age;
-   int include_subdomains;
- 
-   func = (merge_with_existing_entries ? hsts_store_merge : hsts_new_entry);
-@@ -293,15 +293,15 @@ hsts_read_database (hsts_store_t store,
-       if (*p == '#')
-         continue;
- 
--      items_read = sscanf (p, "%255s %d %d %lu %lu",
-+      items_read = sscanf (p, "%255s %d %d %"SCNuMAX" %"SCNuMAX,
-                            host,
-                            &port,
-                            &include_subdomains,
--                           (unsigned long *) &created,
--                           (unsigned long *) &max_age);
-+                           &created,
-+                           &max_age);
- 
-       if (items_read == 5)
--        func (store, host, port, created, max_age, !!include_subdomains);
-+        func (store, host, port, (time_t) created, (time_t) max_age, !!include_subdomains);
-     }
- 
-   xfree (line);
-@@ -326,10 +326,10 @@ hsts_store_dump (hsts_store_t store, FIL
-       struct hsts_kh *kh = (struct hsts_kh *) it.key;
-       struct hsts_kh_info *khi = (struct hsts_kh_info *) it.value;
- 
--      if (fprintf (fp, "%s\t%d\t%d\t%lu\t%lu\n",
-+      if (fprintf (fp, "%s\t%d\t%d\t%"PRIuMAX"\t%"PRIuMAX"\n",
-                    kh->host, kh->explicit_port, khi->include_subdomains,
--                   (unsigned long) khi->created,
--                   (unsigned long) khi->max_age) < 0)
-+                   (uintmax_t) khi->created,
-+                   (uintmax_t) khi->max_age) < 0)
-         {
-           logprintf (LOG_ALWAYS, "Could not write the HSTS database correctly.\n");
-           break;