[ptxdist] [PATCH v4] lighttpd: Version bump, 1.4.67 -> 1.4.72

[Andreas Helmcke <ahelmcke@ela-soft.com>]

Bugfixes and several changes. e.g.
- Stronger TLS defaults
- HTTP/2 Support now as optional module
- Some former modules are now build in

Link: https://www.lighttpd.net/2023/1/3/1.4.68/
Link: https://www.lighttpd.net/2023/2/10/1.4.69/
Link: https://www.lighttpd.net/2023/5/10/1.4.70/
Link: https://www.lighttpd.net/2023/5/27/1.4.71/
Link: https://www.lighttpd.net/2023/10/6/1.4.72/
Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
---
 projectroot/etc/lighttpd/lighttpd.conf |  2 ++
 rules/lighttpd.in                      | 37 +++++++++-----------------
 rules/lighttpd.make                    | 17 +++++-------
 3 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/projectroot/etc/lighttpd/lighttpd.conf b/projectroot/etc/lighttpd/lighttpd.conf
index fa2f60e13..abd4bb66e 100644
--- a/projectroot/etc/lighttpd/lighttpd.conf
+++ b/projectroot/etc/lighttpd/lighttpd.conf
@@ -13,6 +13,8 @@ server.modules		= (
 	@MODULES@
 )
 
+@NOH2@server.feature-flags += ( "server.h2proto" => "disable" )
+
 index-file.names = ( "index.html" )
 
 include "conf.d/*.conf"
diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 910271087..18dd8ab4e 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -69,13 +69,6 @@ endmenu
 
 menu "modules                     "
 
-config LIGHTTPD_MOD_ACCESS
-	bool
-	prompt "mod_access"
-	default y
-	help
-	  Deny access to some files.
-
 config LIGHTTPD_MOD_ACCESSLOG
 	bool
 	prompt "mod_accesslog"
@@ -83,12 +76,6 @@ config LIGHTTPD_MOD_ACCESSLOG
 	help
 	  flexible logging of requests served
 
-config LIGHTTPD_MOD_ALIAS
-	bool
-	prompt "mod_alias"
-	help
-	  Specify a special document-root for a given url-subset.
-
 config LIGHTTPD_MOD_AUTH
 	bool
 	prompt "mod_auth"
@@ -123,11 +110,12 @@ config LIGHTTPD_BZ2LIB
 	  Enable bzip2 support for mod_deflate.
 endif
 
-config LIGHTTPD_MOD_FASTCGI
+config LIGHTTPD_MOD_DIRLISTING
 	bool
-	prompt "mod_fastcgi"
-
-if LIGHTTPD_MOD_FASTCGI
+	prompt "mod_dirlisting"
+	default y
+	help
+	  Creates an HTML page listing the contents of the target directory.
 
 config LIGHTTPD_MOD_FASTCGI_PHP
 	bool
@@ -140,7 +128,14 @@ config LIGHTTPD_MOD_FASTCGI_PHP
 comment "PHP CGI SAPI must be enabled"
 	depends on !PHP8_SAPI_CGI
 
-endif
+config LIGHTTPD_MOD_H2
+	bool
+	prompt "mod_h2"
+	default y
+	help
+	  HTTP/2 support
+	  To use lighttpd without HTTP/2 you need to disable it in the configuration file:
+	     server.feature-flags += ( "server.h2proto" => "disable" )
 
 config LIGHTTPD_MOD_MAGNET
 	bool
@@ -149,12 +144,6 @@ config LIGHTTPD_MOD_MAGNET
 	help
 	  A module to control the request handling
 
-config LIGHTTPD_MOD_REWRITE
-	bool
-	prompt "mod_rewrite"
-	help
-	  Module for URL rewriting
-
 config LIGHTTPD_MOD_WEBDAV
 	bool
 	prompt "mod_webdav"
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index 3aa54a1fb..40d59c346 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
 #
 # Paths and names
 #
-LIGHTTPD_VERSION	:= 1.4.67
-LIGHTTPD_MD5		:= 64822c5061001673162cf9775d91a80b
+LIGHTTPD_VERSION	:= 1.4.72
+LIGHTTPD_MD5		:= 466f9fe131cd7d38d0fe47d2e6a2939d
 LIGHTTPD		:= lighttpd-$(LIGHTTPD_VERSION)
 LIGHTTPD_SUFFIX		:= tar.xz
 LIGHTTPD_URL		:= http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
@@ -93,24 +93,19 @@ $(STATEDIR)/lighttpd.install:
 # ----------------------------------------------------------------------------
 
 LIGHTTPD_MODULES-y :=
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESS)		+= mod_access
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESSLOG)	+= mod_accesslog
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ALIAS)		+= mod_alias
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH)		+= mod_auth
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH)		+= mod_authn_file
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DEFLATE)	+= mod_deflate
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_FASTCGI)	+= mod_fastcgi
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DIRLISTING)	+= mod_dirlisting
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_H2)			+= mod_h2
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_MAGNET)		+= mod_magnet
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_OPENSSL)		+= mod_openssl
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_REWRITE)	+= mod_rewrite
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_WEBDAV)		+= mod_webdav
 LIGHTTPD_MODULES-y += $(call remove_quotes,$(PTXCONF_LIGHTTPD_MOD_EXTRA))
 
 LIGHTTPD_MODULE_STRING := $(subst $(space),$(comma),$(addsuffix \",$(addprefix \",$(LIGHTTPD_MODULES-y))))
 
-# add modules that are always loaded
-LIGHTTPD_MODULES_INSTALL := mod_indexfile mod_dirlisting mod_staticfile $(LIGHTTPD_MODULES-y)
-
 $(STATEDIR)/lighttpd.targetinstall:
 	@$(call targetinfo)
 
@@ -127,7 +122,7 @@ $(STATEDIR)/lighttpd.targetinstall:
 		/usr/sbin/lighttpd-angel)
 
 ifdef PTXCONF_LIGHTTPD_INSTALL_SELECTED_MODULES
-	@$(foreach mod,$(LIGHTTPD_MODULES_INSTALL), \
+	@$(foreach mod,$(LIGHTTPD_MODULES-y), \
 		$(call install_lib, lighttpd, 0, 0, 0644, lighttpd/$(mod))$(ptx/nl))
 else
 #	# modules
@@ -142,6 +137,8 @@ endif
 	@$(call install_copy, lighttpd, 0, 0, 0755, /etc/lighttpd/conf.d)
 	@$(call install_replace, lighttpd, /etc/lighttpd/lighttpd.conf, \
 		@MODULES@, $(LIGHTTPD_MODULE_STRING))
+	@$(call install_replace, lighttpd, /etc/lighttpd/lighttpd.conf, \
+		@NOH2@, $(call ptx/ifdef, PTXCONF_LIGHTTPD_MOD_H2,"#",))
 	@$(call install_alternative, lighttpd, 0, 0, 0644, \
 		/etc/lighttpd/conf.d/mime.conf)
 
-- 
2.40.1