From: Jianhui Zhao <zhaojh329@gmail.com>
Date: Sat, 26 Oct 2024 03:18:27 +0000 (+0800)
Subject: libuhttpd: update to 3.14.2
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=da42d2f1ba1e2a28b4058d24434468590b83e62c;p=feed%2Fpackages.git

libuhttpd: update to 3.14.2

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
---

diff --git a/libs/libuhttpd/Makefile b/libs/libuhttpd/Makefile
index fabe63b895..460eaaaaa6 100644
--- a/libs/libuhttpd/Makefile
+++ b/libs/libuhttpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libuhttpd
-PKG_VERSION:=3.14.1
-PKG_RELEASE:=2
+PKG_VERSION:=3.14.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL=https://github.com/zhaojh329/libuhttpd/releases/download/v$(PKG_VERSION)
-PKG_HASH:=512d4abfced0ec916d985d3d1eac7528e6676eecae6aca27fdaf313374e29f16
+PKG_HASH:=ce2abbc599a922c4bac12f1cdf3e9c9740f387f819a54ca01e9fed60905baa40
 
 PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
 PKG_LICENSE:=MIT
diff --git a/libs/libuhttpd/patches/100-wolfssl_5_support.patch b/libs/libuhttpd/patches/100-wolfssl_5_support.patch
deleted file mode 100644
index 096a32ef00..0000000000
--- a/libs/libuhttpd/patches/100-wolfssl_5_support.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 91b66a6b402b790f3c8cebb0420ef549744ee197
-Author: Sergey V. Lobanov <sergey@lobanov.in>
-Date:   Mon Jan 3 19:25:45 2022 +0300
-
-    add compatibility for wolfssl >= 5.0
-    
-    NTRU support has been removed in wolfssl 5.0 so it is required to
-    mask NTRU specific code if wolfssl >= 5.0
-
---- a/src/ssl/openssl.c
-+++ b/src/ssl/openssl.c
-@@ -336,7 +336,9 @@ static bool handle_wolfssl_asn_error(voi
-     case ASN_SIG_HASH_E:
-     case ASN_SIG_KEY_E:
-     case ASN_DH_KEY_E:
-+#if LIBWOLFSSL_VERSION_HEX < 0x05000000
-     case ASN_NTRU_KEY_E:
-+#endif
-     case ASN_CRIT_EXT_E:
-     case ASN_ALT_NAME_E:
-     case ASN_NO_PEM_HEADER: