From 61797c52f5deef2cb67e60cf075ca243078c8855 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 28 Jan 2022 23:07:38 +0100 Subject: [PATCH] package/libuhttpd: bump to version 3.14.1 Drop patch (already in version) https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.1 https://github.com/zhaojh329/libuhttpd/releases/tag/v3.14.0 https://github.com/zhaojh329/libuhttpd/releases/tag/v3.13.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...001-openssl.c-fix-build-with-wolfssl.patch | 47 ------------------- package/libuhttpd/libuhttpd.hash | 2 +- package/libuhttpd/libuhttpd.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch diff --git a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch b/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch deleted file mode 100644 index deb1a0f93b..0000000000 --- a/package/libuhttpd/0001-openssl.c-fix-build-with-wolfssl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e5c5ed1c64cfc715729c9bfbfdcc4be225f344ff Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 4 Aug 2021 11:32:39 +0200 -Subject: [PATCH] openssl.c: fix build with wolfssl - -Fix the following build failure with wolfssl: - -/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new': -/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:174:33: error: 'tls13_ciphersuites' undeclared (first use in this function) - 174 | SSL_CTX_set_ciphersuites(c, tls13_ciphersuites); - | ^~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/d0fb629b40b05ad828775894fabed878692bb222 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zhaojh329/ssl/pull/1] ---- - openssl.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/openssl.c b/openssl.c -index 8f3d8b7..c42638c 100644 ---- a/src/ssl/openssl.c -+++ b/src/ssl/openssl.c -@@ -71,14 +71,14 @@ - "TLS13-AES256-GCM-SHA384:" \ - ecdhe_aead_ciphers - #else --# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \ -- "TLS_AES_128_GCM_SHA256:" \ -- "TLS_AES_256_GCM_SHA384" -- - # define top_ciphers \ - ecdhe_aead_ciphers - #endif - -+# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \ -+ "TLS_AES_128_GCM_SHA256:" \ -+ "TLS_AES_256_GCM_SHA384" -+ - #define ecdhe_aead_ciphers \ - "ECDHE-ECDSA-CHACHA20-POLY1305:" \ - "ECDHE-ECDSA-AES128-GCM-SHA256:" \ --- -2.30.2 - diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash index 98bd6e513b..e4fde4eb64 100644 --- a/package/libuhttpd/libuhttpd.hash +++ b/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c234dd3d491c4daa047e28870c6e740529b2eff2dd027dafb6bf02d8dba286b0 libuhttpd-3.12.1.tar.gz +sha256 512d4abfced0ec916d985d3d1eac7528e6676eecae6aca27fdaf313374e29f16 libuhttpd-3.14.1.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index 3a99fe0613..b8cf935d01 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.12.1 +LIBUHTTPD_VERSION = 3.14.1 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE