lighttpd: update to lighttpd 1.4.70 release hash

remove patches included upstream

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>

diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile
index a627c88ca6dd8a34aec6c1517ea966fcd2f1eb1d..00616a2377a5250b8c9ac97587bcbbc0da5ccea2 100644 (file)
--- a/net/lighttpd/Makefile
+++ b/net/lighttpd/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lighttpd
-PKG_VERSION:=1.4.69
-PKG_RELEASE:=3
+PKG_VERSION:=1.4.70
+PKG_RELEASE:=1
 # release candidate ~rcX testing; remove for release
 #PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://download.lighttpd.net/lighttpd/releases-1.4.x
-PKG_HASH:=16ac8db95e719629ba61949b99f8a26feba946a81d185215b28379bb4116b0b4
+PKG_HASH:=921ebe1cf4b6b9897e03779ab7a23a31f4ba40a1abe2067525c33cd3ce61fe85
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=BSD-3-Clause

diff --git a/net/lighttpd/patches/020-meson-mod_webdav_min.patch b/net/lighttpd/patches/020-meson-mod_webdav_min.patch
index 6c7ab078ee353245753858b44c7a396cae2c6e26..bef6f2e566b0ea8560fd1fe022dc5bd063cfc826 100644 (file)
--- a/net/lighttpd/patches/020-meson-mod_webdav_min.patch
+++ b/net/lighttpd/patches/020-meson-mod_webdav_min.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] [meson] mod_webdav_min w/o deps: xml2 sqlite3 uuid
 
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -865,6 +865,16 @@ if libsasl.found()
+@@ -879,6 +879,16 @@ if libsasl.found()
        ]
  endif
  

diff --git a/net/lighttpd/patches/030-meson-check-FORCE_._CRYPTO.patch b/net/lighttpd/patches/030-meson-check-FORCE_._CRYPTO.patch
deleted file mode 100644 (file)
index 6db2895..0000000
--- a/net/lighttpd/patches/030-meson-check-FORCE_._CRYPTO.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e91ad65e4aacde815679c06cb687931dd7beb9b3 Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Thu, 20 Apr 2023 21:27:36 -0400
-Subject: [PATCH] [meson] check FORCE_{WOLFSSL,MBEDTLS}_CRYPTO
-
----
- src/meson.build | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -358,15 +358,19 @@ if get_option('with_mbedtls')
-       libmbedtls = [ compiler.find_library('mbedtls') ]
-       libmbedx509 = [ compiler.find_library('mbedx509') ]
-       libmbedcrypto = [ compiler.find_library('mbedcrypto') ]
--      libcrypto = [ compiler.find_library('mbedcrypto') ]
-+      if compiler.get_define('FORCE_WOLFSSL_CRYPTO') == ''
-+        libcrypto = [ compiler.find_library('mbedcrypto') ]
-+      endif
-       conf_data.set('HAVE_LIBMBEDCRYPTO', true)
- endif
- if get_option('with_nettle')
-       # manual search:
-       # header: nettle/nettle-types.h
-       # function: nettle_md5_init (-lnettle)
--      libcrypto = [ dependency('nettle') ]
--      conf_data.set('HAVE_NETTLE_NETTLE_TYPES_H', true)
-+      if compiler.get_define('FORCE_WOLFSSL_CRYPTO') == '' and compiler.get_define('FORCE_MBEDTLS_CRYPTO') == ''
-+        libcrypto = [ dependency('nettle') ]
-+        conf_data.set('HAVE_NETTLE_NETTLE_TYPES_H', true)
-+      endif
- endif
- if get_option('with_gnutls')
-       # manual search:

diff --git a/net/lighttpd/patches/031-mod_mbedtls-check-MBEDTLS_DEBUG_C.patch b/net/lighttpd/patches/031-mod_mbedtls-check-MBEDTLS_DEBUG_C.patch
deleted file mode 100644 (file)
index d50b2e9..0000000
--- a/net/lighttpd/patches/031-mod_mbedtls-check-MBEDTLS_DEBUG_C.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 37cbdacda78f9df4aba4c39e60472025d93bb7ba Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Fri, 28 Apr 2023 03:17:16 -0400
-Subject: [PATCH] [mod_mbedtls] check MBEDTLS_DEBUG_C for debug func
-
----
- src/mod_mbedtls.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/src/mod_mbedtls.c
-+++ b/src/mod_mbedtls.c
-@@ -2357,9 +2357,11 @@ CONNECTION_FUNC(mod_mbedtls_handle_con_a
-      * overlap, and so this debug setting is not reset upon connection close.
-      * Once enabled, debug hook will remain so for this mbedtls_ssl_config */
-     if (hctx->conf.ssl_log_noise) {/* volume level for debug message callback */
-+      #ifdef MBEDTLS_DEBUG_C
-       #if MBEDTLS_VERSION_NUMBER >= 0x02000000 /* mbedtls 2.0.0 */
-         mbedtls_debug_set_threshold(hctx->conf.ssl_log_noise);
-       #endif
-+      #endif
-         mbedtls_ssl_conf_dbg(hctx->ssl_ctx, mod_mbedtls_debug_cb,
-                              (void *)(intptr_t)hctx->conf.ssl_log_noise);
-     }

diff --git a/net/lighttpd/patches/032-meson-build-fix-for-builtin_mods.patch b/net/lighttpd/patches/032-meson-build-fix-for-builtin_mods.patch
deleted file mode 100644 (file)
index 2375f8a..0000000
--- a/net/lighttpd/patches/032-meson-build-fix-for-builtin_mods.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 2fc157f37ea4644ba9ac776de1926b9e518ec42b Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <gstrauss@gluelogic.com>
-Date: Sat, 29 Apr 2023 00:43:55 -0400
-Subject: [PATCH] [meson] build fix for builtin_mods
-
----
- src/meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -656,7 +656,7 @@ executable('lighttpd-angel',
- )
- 
- executable('lighttpd', configparser,
--      sources: common_src + main_src,
-+      sources: common_src + main_src + builtin_mods,
-       dependencies: [ common_flags, lighttpd_flags
-               , libattr
-               , libcrypto