Re: [ptxdist] [APPLIED] lighttpd: version bump 1.4.63 -> 1.4.64

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 6dc97732b573d0bf9c3a9ded4522592178a3d16d.

Michael

[sent from post-receive hook]

On Sun, 30 Jan 2022 16:49:29 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> Main change is "remove long-deprecated modules", but some bugfixes went
> in that release as well.
> 
> Note: The ptxdist package still uses the no longer maintained pcre
> instead of pcre2.
> 
> Three lines were inserted into src/algo_md5.c outside of the license
> text area, the license text itself stays the same, moved only.
> 
> Link: https://redmine.lighttpd.net/projects/lighttpd/wiki/Release-1_4_64
> Link: https://www.lighttpd.net/2022/1/19/1.4.64/
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220127133159.47672-1-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/lighttpd.in b/rules/lighttpd.in
> index 1f853c7fd9a5..18827467f73c 100644
> --- a/rules/lighttpd.in
> +++ b/rules/lighttpd.in
> @@ -15,7 +15,6 @@ menuconfig LIGHTTPD
>  	select SQLITE			if LIGHTTPD_WEBDAV_PROPS
>  	select LIBUUID			if LIGHTTPD_WEBDAV_LOCKS
>  	select OPENSSL			if LIGHTTPD_OPENSSL
> -	select LIBMEMCACHED		if LIGHTTPD_MEMCACHED
>  	select LUA			if LIGHTTPD_LUA
>  	select LUA_INSTALL_LIBLUA	if LIGHTTPD_LUA
>  	select BUSYBOX_START_STOP_DAEMON			if LIGHTTPD_STARTSCRIPT
> @@ -52,14 +51,6 @@ config LIGHTTPD_LUA
>  	help
>  	  lua engine for mod_cml and mod_magnet
>  
> -config LIGHTTPD_MEMCACHED
> -	bool
> -	prompt "memcached storage"
> -	# fails to build with current libmemcached version
> -	depends on BROKEN
> -	help
> -	  memcached storage for mod_trigger_b4_dl and mod_cml
> -
>  config LIGHTTPD_OPENSSL
>  	bool
>  	prompt "openssl support"
> @@ -72,6 +63,8 @@ config LIGHTTPD_PCRE
>  	prompt "pcre support"
>  	help
>  	  Enable pcre support.
> +	  
> +	  WARNING: pcre is no longer maintained. Please move to pcre2 instead!
>  
>  endmenu
>  
> @@ -104,13 +97,6 @@ config LIGHTTPD_MOD_AUTH
>  	help
>  	  User authentication
>  
> -config LIGHTTPD_MOD_CML
> -	bool
> -	select LIGHTTPD_LUA
> -	prompt "mod_cml"
> -	help
> -	  Cache Meta Language
> -
>  config LIGHTTPD_MOD_DEFLATE
>  	bool
>  	prompt "mod_deflate"
> @@ -167,16 +153,6 @@ config LIGHTTPD_MOD_REWRITE
>  	help
>  	  Module for URL rewriting
>  
> -config LIGHTTPD_MOD_TRIGGER_B4_DL
> -	bool
> -	select LIGHTTPD_MEMCACHED
> -	select LIGHTTPD_PCRE
> -	# needs (currently broken) LIGHTTPD_MEMCACHED
> -	depends on BROKEN
> -	prompt "mod_trigger_b4_dl"
> -	help
> -	  Module for Anti Hotlinking
> -
>  config LIGHTTPD_MOD_WEBDAV
>  	bool
>  	prompt "mod_webdav"
> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> index 58a311404501..98b80fea1e3e 100644
> --- a/rules/lighttpd.make
> +++ b/rules/lighttpd.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
>  #
>  # Paths and names
>  #
> -LIGHTTPD_VERSION	:= 1.4.63
> -LIGHTTPD_MD5		:= f4ad032b4b861f42a5df5f900ec6457b
> +LIGHTTPD_VERSION	:= 1.4.64
> +LIGHTTPD_MD5		:= 02762422b074d0609db3d099d9d9e05c
>  LIGHTTPD		:= lighttpd-$(LIGHTTPD_VERSION)
>  LIGHTTPD_SUFFIX		:= tar.xz
>  LIGHTTPD_URL		:= http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
> @@ -26,7 +26,7 @@ LIGHTTPD_LICENSE	:= BSD-3-Clause AND OML AND RSA-MD
>  LIGHTTPD_LICENSE_FILES	:= \
>  	file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579 \
>  	file://src/compat/fastcgi.h;startline=7;endline=15;md5=fe9ffe753772839aace9c90e814bc356 \
> -	file://src/algo_md5.c;startline=9;endline=29;md5=b5be3b6afd4afa7bb89b16361244f9b6
> +	file://src/algo_md5.c;startline=12;endline=32;md5=b5be3b6afd4afa7bb89b16361244f9b6
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -57,8 +57,12 @@ LIGHTTPD_CONF_OPT	:= \
>  	--without-krb5 \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_OPENSSL)-openssl \
>  	--without-wolfssl \
> -	--without-pcre2 \
> +	--without-mbedtls \
> +	--without-nettle \
> +	--without-gnutls \
> +	--without-nss \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_PCRE)-pcre \
> +	--without-pcre2 \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_ZLIB)-zlib \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_ZSTD)-zstd \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_BZ2LIB)-bzip2 \
> @@ -70,10 +74,7 @@ LIGHTTPD_CONF_OPT	:= \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-webdav-locks \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-uuid \
>  	--without-xxhash \
> -	--without-gdbm \
> -	--without-geoip \
>  	--without-maxminddb \
> -	--$(call ptx/wwo, PTXCONF_LIGHTTPD_MEMCACHED)-memcached \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
>  
>  # ----------------------------------------------------------------------------
> @@ -96,13 +97,11 @@ 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_CML)		+= mod_cml
>  LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DEFLATE)	+= mod_deflate
>  LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_FASTCGI)	+= mod_fastcgi
>  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_TRIGGER_B4_DL)	+= mod_trigger_b4_dl
>  LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_WEBDAV)		+= mod_webdav
>  LIGHTTPD_MODULES-y += $(call remove_quotes,$(PTXCONF_LIGHTTPD_MOD_EXTRA))
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de