package/lighttpd: reorder alphabetically options
PATCH v2 1/6 package/lighttpd: reorder alphabetically options
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/lighttpd/Config.in | 32 ++++++++++++++++---------------- package/lighttpd/lighttpd.mk | 36 ++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 34 deletions(-)
package/lighttpd/Config.in +16 -16
@@ -21,6 +21,18 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BZIP2 + bool "bzip2 support" + select BR2_PACKAGE_BZIP2 + help + Enable bzip2 support for lighttpd mod_deflate. + +config BR2_PACKAGE_LIGHTTPD_LUA + bool "lua support" + depends on BR2_PACKAGE_LUA + help + Enable Lua support. Needed to support mod_magnet + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL
@@ -34,18 +46,6 @@ config BR2_PACKAGE_LIGHTTPD_PAM help Enable PAM authentication support for lighttpd. -config BR2_PACKAGE_LIGHTTPD_ZLIB - bool "zlib support" - select BR2_PACKAGE_ZLIB - help - Enable zlib support for lighttpd mod_deflate. - -config BR2_PACKAGE_LIGHTTPD_BZIP2 - bool "bzip2 support" - select BR2_PACKAGE_BZIP2 - help - Enable bzip2 support for lighttpd mod_deflate. - config BR2_PACKAGE_LIGHTTPD_PCRE bool "pcre support" select BR2_PACKAGE_PCRE2
@@ -59,10 +59,10 @@ config BR2_PACKAGE_LIGHTTPD_WEBDAV help Enable webdav support. Needed to support mod_webdav -config BR2_PACKAGE_LIGHTTPD_LUA - bool "lua support" - depends on BR2_PACKAGE_LUA +config BR2_PACKAGE_LIGHTTPD_ZLIB + bool "zlib support" + select BR2_PACKAGE_ZLIB help - Enable Lua support. Needed to support mod_magnet + Enable zlib support for lighttpd mod_deflate. endif
package/lighttpd/lighttpd.mk +18 -18
@@ -37,6 +37,20 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) +LIGHTTPD_DEPENDENCIES += bzip2 +LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +else +LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +endif + +ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) +LIGHTTPD_DEPENDENCIES += lua +LIGHTTPD_CONF_OPTS += -Dwith_lua=true +else +LIGHTTPD_CONF_OPTS += -Dwith_lua=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true
@@ -51,20 +65,6 @@ else LIGHTTPD_CONF_OPTS += -Dwith_pam=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) -LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true -else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) -LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true -else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false -endif - ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) LIGHTTPD_DEPENDENCIES += pcre2 LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true
@@ -85,11 +85,11 @@ else LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false endif -ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) -LIGHTTPD_DEPENDENCIES += lua -LIGHTTPD_CONF_OPTS += -Dwith_lua=true +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) +LIGHTTPD_DEPENDENCIES += zlib +LIGHTTPD_CONF_OPTS += -Dwith_zlib=true else -LIGHTTPD_CONF_OPTS += -Dwith_lua=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif define LIGHTTPD_INSTALL_CONFIG
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 2/6 package/lighttpd: add zstd support
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-)
package/lighttpd/Config.in +6 -0
@@ -65,4 +65,10 @@ config BR2_PACKAGE_LIGHTTPD_ZLIB help Enable zlib support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_ZSTD + bool "zstd support" + select BR2_PACKAGE_ZSTD + help + Enable zstd support for lighttpd mod_deflate. + endif
package/lighttpd/lighttpd.mk +7 -1
@@ -32,7 +32,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ -Dwith_xxhash=true \ - -Dwith_zstd=false \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd
@@ -92,6 +91,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) +LIGHTTPD_DEPENDENCIES += zstd +LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +else +LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +endif + define LIGHTTPD_INSTALL_CONFIG $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 3/6 package/lighttpd: add brotli support
In reply to Fabrice FontaineSigned-off-by Fabrice Fontaine <[email protected]>
--- ...uild-meson-fix-typo-in-variable-name.patch | 25 +++++++++++++++++++ package/lighttpd/Config.in | 6 +++++ package/lighttpd/lighttpd.mk | 8 +++++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch
package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 876a1e1b2cc21282a0df5245004197cdffe1d380 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss <[email protected]> +Date: Thu, 20 Jan 2022 07:04:51 -0500 +Subject: [PATCH] [build] meson: fix typo in variable name + +[Retrieved from: +https://github.com/lighttpd/lighttpd1.4/commit/876a1e1b2cc21282a0df5245004197cdffe1d380] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 4ee163468..b35c1037f 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -266,7 +266,7 @@ endif + libbrotli = [] + if get_option('with_brotli') + libbrotli = [ compiler.find_library('brotlienc') ] +- if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotlienc, prefix: '#include <brotli/encode.h>') ++ if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotli, prefix: '#include <brotli/encode.h>') + conf_data.set('HAVE_BROTLI_ENCODE_H', true) + conf_data.set('HAVE_BROTLI', true) + else
package/lighttpd/Config.in +6 -0
@@ -21,6 +21,12 @@ config BR2_PACKAGE_LIGHTTPD if BR2_PACKAGE_LIGHTTPD +config BR2_PACKAGE_LIGHTTPD_BROTLI + bool "brotli support" + select BR2_PACKAGE_BROTLI + help + Enable brotli support for lighttpd mod_deflate. + config BR2_PACKAGE_LIGHTTPD_BZIP2 bool "bzip2 support" select BR2_PACKAGE_BZIP2
package/lighttpd/lighttpd.mk +7 -1
@@ -13,7 +13,6 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_brotli=false \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \
@@ -36,6 +35,13 @@ LIGHTTPD_CONF_OPTS = \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd +ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) +LIGHTTPD_DEPENDENCIES += brotli +LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +else +LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 LIGHTTPD_CONF_OPTS += -Dwith_bzip=true
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 4/6 package/lighttpd: add maxminddb support
In reply to Fabrice FontaineSigned-off-by Fabrice Fontaine <[email protected]>
--- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-)
package/lighttpd/Config.in +6 -0
@@ -39,6 +39,12 @@ config BR2_PACKAGE_LIGHTTPD_LUA help Enable Lua support. Needed to support mod_magnet +config BR2_PACKAGE_LIGHTTPD_MAXMINDDB + bool "maxminddb support" + select BR2_PACKAGE_LIBMAXMINDDB + help + Enable MaxMind GeoIP2 support. Needed to support mod_maxminddb + config BR2_PACKAGE_LIGHTTPD_OPENSSL bool "openssl support" select BR2_PACKAGE_OPENSSL
package/lighttpd/lighttpd.mk +7 -1
@@ -20,7 +20,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ - -Dwith_maxminddb=false \ -Dwith_mbedtls=false \ -Dwith_mysql=false \ -Dwith_nettle=false \
@@ -56,6 +55,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_lua=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) +LIGHTTPD_DEPENDENCIES += libmaxminddb +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +else +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl LIGHTTPD_CONF_OPTS += -Dwith_openssl=true
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 5/6 package/lighttpd: add krb5 support
In reply to Fabrice FontaineSigned-off-by Fabrice Fontaine <[email protected]>
--- package/lighttpd/Config.in | 6 ++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-)
package/lighttpd/Config.in +6 -0
@@ -33,6 +33,12 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2 help Enable bzip2 support for lighttpd mod_deflate. +config BR2_PACKAGE_LIGHTTPD_KRB5 + bool "krb5 support" + select BR2_PACKAGE_LIBKRB5 + help + Enable Kerberos5 support for lighttpd mod_auth. + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA
package/lighttpd/lighttpd.mk +7 -1
@@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_krb5=false \ -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \
@@ -48,6 +47,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) +LIGHTTPD_DEPENDENCIES += libkrb5 +LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +else +LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 6/6 package/lighttpd: add ldap support
In reply to Fabrice FontaineSigned-off-by Fabrice Fontaine <[email protected]>
---
Changes v1 -> v2:
- Fix openldap dependency
package/lighttpd/Config.in | 10 ++++++++++ package/lighttpd/lighttpd.mk | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-)
package/lighttpd/Config.in +10 -0
@@ -39,6 +39,16 @@ config BR2_PACKAGE_LIGHTTPD_KRB5 help Enable Kerberos5 support for lighttpd mod_auth. +config BR2_PACKAGE_LIGHTTPD_LDAP + bool "ldap support" + depends on BR2_USE_WCHAR # openldap + select BR2_PACKAGE_OPENLDAP + help + Enable LDAP support for lighttpd mod_auth mod_vhostdb_ldap. + +comment "ldap support needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_LIGHTTPD_LUA bool "lua support" depends on BR2_PACKAGE_LUA
package/lighttpd/lighttpd.mk +7 -1
@@ -16,7 +16,6 @@ LIGHTTPD_CONF_OPTS = \ -Dwith_dbi=false \ -Dwith_fam=false \ -Dwith_gnutls=false \ - -Dwith_ldap=false \ -Dwith_libev=false \ -Dwith_libunwind=false \ -Dwith_mbedtls=false \
@@ -54,6 +53,13 @@ else LIGHTTPD_CONF_OPTS += -Dwith_krb5=false endif +ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) +LIGHTTPD_DEPENDENCIES += openldap +LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +else +LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +endif + ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua LIGHTTPD_CONF_OPTS += -Dwith_lua=true
Signature · 6 lines
2.34.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 5 lines · On Sun, 23 Jan 2022 10:59:52 +0100 Fabrice Fontaine…
Signed-off-by Fabrice Fontaine <[email protected]>--- package/lighttpd/Config.in | 32 ++++++++++++++++---------------- package/lighttpd/lighttpd.mk | 36 ++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 34 deletions(-)
Series applied. Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot