Skip to contentSkip to conversation

package/lighttpd: bump to 1.4.77

PATCH In review Thomas Devoogdt 2 participants 3 messages Jan 18, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/lighttpd: bump to 1.4.77

News:
- https://www.lighttpd.net/2025/1/10/1.4.77/

---
 ...lt-lighttpd-configuration-file-to-ha.patch | 30 ++++---
 ...ial-value-for-Linux-POLLRDHUP-on-SPA.patch | 34 --------
 ...ue-for-Linux-POLLRDHUP-on-SPARC-fixe.patch | 85 -------------------
 package/lighttpd/lighttpd.hash                |  8 +-
 package/lighttpd/lighttpd.mk                  |  2 +-
 5 files changed, 21 insertions(+), 138 deletions(-)
 delete mode 100644 package/lighttpd/0002-Revert-core-special-value-for-Linux-POLLRDHUP-on-SPA.patch
 delete mode 100644 package/lighttpd/0003-core-special-value-for-Linux-POLLRDHUP-on-SPARC-fixe.patch
package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +16 -14
index 2eab2a84e5..61f58c609f 100644
@@ -1,4 +1,4 @@
-From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001
+From bb0a1cc656b2df4184a0794fb67ae74c634c1ecd Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <[email protected]>
 Date: Mon, 13 Dec 2021 22:07:17 +0100
 Subject: [PATCH] Modify the default lighttpd configuration file to have one a
@@ -15,16 +15,18 @@ Signed-off-by: Simon Dawson <[email protected]>
 Signed-off-by: Gustavo Zacarias <[email protected]>
 [Thomas: update for 1.4.69 - drop server.use-ipv6]
 Signed-off-by: Thomas Devoogdt <[email protected]>
+[Thomas: update for 1.4.77 - move lighttpd.conf to lighttpd.annotated.conf]
+Signed-off-by: Thomas Devoogdt <[email protected]>
 ---
- doc/config/conf.d/access_log.conf |  2 +-
- doc/config/lighttpd.conf          | 14 +++++++-------
+ doc/config/conf.d/access_log.conf  |  2 +-
+ doc/config/lighttpd.annotated.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 e685d437..92cff4f0 100644
+index f8294802..9886cddf 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" )
+@@ -7,7 +7,7 @@ server.modules += ( "mod_accesslog" )
  ##
  ## Default access log.
  ##
@@ -33,10 +35,10 @@ index e685d437..92cff4f0 100644
  
  ##
  ## The default format produces CLF compatible output.
-diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf
-index d45a284d..4e926d5a 100644
---- a/doc/config/lighttpd.conf
-+++ b/doc/config/lighttpd.conf
+diff --git a/doc/config/lighttpd.annotated.conf b/doc/config/lighttpd.annotated.conf
+index c94f703b..35263a1e 100644
+--- a/doc/config/lighttpd.annotated.conf
++++ b/doc/config/lighttpd.annotated.conf
 @@ -13,8 +13,8 @@
  ## if you add a variable here. Add the corresponding variable in the
  ## chroot example as well.
@@ -48,9 +50,9 @@ index d45a284d..4e926d5a 100644
  var.state_dir   = "/run"
  var.home_dir    = "/var/lib/lighttpd"
  var.conf_dir    = "/etc/lighttpd"
-@@ -97,8 +97,8 @@ server.port = 80
+@@ -97,8 +97,8 @@ include conf_dir + "/modules.conf"
  ## Run as a different username/groupname.
- ## This requires root permissions during startup. 
+ ## This requires root permissions during startup.
  ##
 -server.username  = "lighttpd"
 -server.groupname = "lighttpd"
@@ -76,10 +78,10 @@ index d45a284d..4e926d5a 100644
 +server.errorlog             = log_root + "/lighttpd-error.log"
  
  ##
- ## If you want to log to syslog you have to unset the 
+ ## If you want to log to syslog you have to unset the
 @@ -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 
+ ## servers transfer files as fast as possible
  ##
 -#server.network-backend = "sendfile"
 +server.network-backend = "writev"
@@ -87,5 +89,5 @@ index d45a284d..4e926d5a 100644
  ##
  ## As lighttpd is a single-threaded server, its main resource limit is
 -- 
-2.39.0
+2.43.0
 
package/lighttpd/0002-Revert-core-special-value-for-Linux-POLLRDHUP-on-SPA.patch deleted +0 -34
deleted file mode 100644
index eebfa3a113..0000000000
@@ -1,34 +0,0 @@
-From 88ff3763dae65371eab9f8a22ac1c95c96fe4490 Mon Sep 17 00:00:00 2001
-From: Glenn Strauss <[email protected]>
-Date: Tue, 23 Apr 2024 00:16:29 -0400
-Subject: [PATCH] Revert "[core] special value for Linux POLLRDHUP on SPARC"
- (fixes #3251)
-
-This reverts commit f14f9142f4487704e2ce0f196263c091accdb12c.
-
-x-ref:
-  "[1.4.76] buildroot compile error with bootlin-sparc{64-g,-uc}libc"
-  https://redmine.lighttpd.net/issues/3251
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
-Upstream: https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/88ff3763dae65371eab9f8a22ac1c95c96fe4490
----
- src/fdevent.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/fdevent.h b/src/fdevent.h
-index e9c380b0..1b0a062f 100644
---- a/src/fdevent.h
-+++ b/src/fdevent.h
-@@ -40,8 +40,6 @@ struct fdnode_st {
- #if (defined(__sun) && defined(__SVR4)) /* Solaris */ \
-  || defined(__FreeBSD__)
- #define FDEVENT_RDHUP  0x4000
--#elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc)))
--#define FDEVENT_RDHUP  0x0800
- #else
- #define FDEVENT_RDHUP  0x2000
- #endif
--- 
-2.30.2
-
package/lighttpd/0003-core-special-value-for-Linux-POLLRDHUP-on-SPARC-fixe.patch deleted +0 -85

85 lines not on this page · raw message

package/lighttpd/lighttpd.hash +4 -4
index c5545150b0..d4742b5746 100644
@@ -1,6 +1,6 @@
-# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.76.sha512sum
-sha512  940f00f2d84e3424c389108d09756a0af41db3559474135b6c502deccd08ad051b5184f3f7907436384964d2b05045e27dca463af98c889cee69b0ae6e202782  lighttpd-1.4.76.tar.xz
-# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.76.sha256sum
-sha256  8cbf4296e373cfd0cedfe9d978760b5b05c58fdc4048b4e2bcaf0a61ac8f5011  lighttpd-1.4.76.tar.xz
+# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.77.sha512sum
+sha512  696fd4fd8486a6c3fd1131c7e8a935a02b5384882b74ddc19bf79d085e2a0abed9184a30f97e3a7aafb816d3589e110e8d70115daa15cdc52cf61aa4129e3565  lighttpd-1.4.77.tar.xz
+# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.77.sha256sum
+sha256  acafabdbfa2267d8b6452d03d85fdd2a66525f3f05a36a79b6645c017f1562ce  lighttpd-1.4.77.tar.xz
 # Locally calculated
 sha256  5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13  COPYING
package/lighttpd/lighttpd.mk +1 -1
index b54f5dd213..3f97e84585 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIGHTTPD_VERSION_MAJOR = 1.4
-LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).76
+LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).77
 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x
 LIGHTTPD_LICENSE = BSD-3-Clause
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 package/lighttpd: add more compile options

Added dbi, gnutls, libev, libunwind, mbedtls, nettle, and wolfssl.

---

$ cat lighttpd.config
BR2_PACKAGE_LIGHTTPD=y
BR2_PACKAGE_LIGHTTPD_BROTLI=y
BR2_PACKAGE_LIGHTTPD_BZIP2=y
BR2_PACKAGE_LIGHTTPD_DBI=y
BR2_PACKAGE_LIGHTTPD_GNUTLS=y
BR2_PACKAGE_LIGHTTPD_KRB5=y
BR2_PACKAGE_LIGHTTPD_LDAP=y
BR2_PACKAGE_LIGHTTPD_LIBEV=y
BR2_PACKAGE_LIGHTTPD_LUA=y
BR2_PACKAGE_LIGHTTPD_MAXMINDDB=y
BR2_PACKAGE_LIGHTTPD_MBEDTLS=y
BR2_PACKAGE_LIGHTTPD_MYSQL=y
BR2_PACKAGE_LIGHTTPD_NETTLE=y
BR2_PACKAGE_LIGHTTPD_OPENSSL=y
BR2_PACKAGE_LIGHTTPD_PAM=y
BR2_PACKAGE_LIGHTTPD_PCRE=y
BR2_PACKAGE_LIGHTTPD_PGSQL=y
BR2_PACKAGE_LIGHTTPD_WEBDAV=y
BR2_PACKAGE_LIGHTTPD_WOLFSSL=y
BR2_PACKAGE_LIGHTTPD_ZLIB=y
BR2_PACKAGE_LIGHTTPD_ZSTD=y
BR2_PACKAGE_MARIADB=y
BR2_PACKAGE_LINUX_PAM=y
BR2_PACKAGE_LUA=y
$ ./utils/test-pkg -c lighttpd.config -p lighttpd
                    bootlin-armv5-uclibc [1/6]: OK
                     bootlin-armv7-glibc [2/6]: OK
                   bootlin-armv7m-uclibc [3/6]: SKIPPED
                     bootlin-x86-64-musl [4/6]: OK
                      br-arm-full-static [5/6]: SKIPPED
                             arm-aarch64 [6/6]: OK
6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
---
---
 package/lighttpd/Config.in   | 46 +++++++++++++++++++++++++++++
 package/lighttpd/lighttpd.mk | 56 +++++++++++++++++++++++++++++++-----
 2 files changed, 95 insertions(+), 7 deletions(-)
package/lighttpd/Config.in +46 -0
index 5311f37ae1..1a9a9a277d 100644
@@ -34,6 +34,23 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2
 	help
 	  Enable bzip2 support for lighttpd mod_deflate.
 
+config BR2_PACKAGE_LIGHTTPD_DBI
+	bool "dbi support"
+	select BR2_PACKAGE_LIBDBI
+	help
+	  Enable dbi support for lighttpd mod_auth mod_vhostdb_dbi.
+
+config BR2_PACKAGE_LIGHTTPD_GNUTLS
+	bool "gnutls support"
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_GNUTLS
+	help
+	  Enable gnutls support for lighttpd mod_auth.
+
+comment "gnutls support needs a toolchain w/ wchar, dynamic library"
+	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
+
 config BR2_PACKAGE_LIGHTTPD_KRB5
 	bool "krb5 support"
 	select BR2_PACKAGE_LIBKRB5
@@ -50,6 +67,12 @@ config BR2_PACKAGE_LIGHTTPD_LDAP
 comment "ldap support needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
 
+config BR2_PACKAGE_LIGHTTPD_LIBEV
+	bool "libev support"
+	select BR2_PACKAGE_LIBEV
+	help
+	  Enable libev support for lighttpd fdevent handlers.
+
 config BR2_PACKAGE_LIGHTTPD_LUA
 	bool "lua support"
 	depends on BR2_PACKAGE_LUA
@@ -62,6 +85,12 @@ config BR2_PACKAGE_LIGHTTPD_MAXMINDDB
 	help
 	  Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb
 
+config BR2_PACKAGE_LIGHTTPD_MBEDTLS
+	bool "mbedtls support"
+	select BR2_PACKAGE_MBEDTLS
+	help
+	  Enable mbedtls support for lighttpd mod_auth.
+
 config BR2_PACKAGE_LIGHTTPD_MYSQL
 	bool "mysql support"
 	depends on BR2_PACKAGE_MARIADB
@@ -71,6 +100,12 @@ config BR2_PACKAGE_LIGHTTPD_MYSQL
 comment "mysql support needs mariadb"
 	depends on !BR2_PACKAGE_MARIADB
 
+config BR2_PACKAGE_LIGHTTPD_NETTLE
+	bool "nettle support"
+	select BR2_PACKAGE_NETTLE
+	help
+	  Enable nettle support for lighttpd.
+
 config BR2_PACKAGE_LIGHTTPD_OPENSSL
 	bool "openssl support"
 	select BR2_PACKAGE_OPENSSL
@@ -116,6 +151,17 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV
 	help
 	  Enable webdav support. Needed to support mod_webdav
 
+config BR2_PACKAGE_LIGHTTPD_WOLFSSL
+	bool "wolfssl support"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_WOLFSSL
+	select BR2_PACKAGE_WOLFSSL_ALL
+	help
+	  Enable wolfssl support for lighttpd mod_auth.
+
+comment "wolfssl support needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_LIGHTTPD_ZLIB
 	bool "zlib support"
 	select BR2_PACKAGE_ZLIB
package/lighttpd/lighttpd.mk +49 -7

102 lines not on this page · raw message

Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot