diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG