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

[Alexander Dahl <post@lespocky.de>]

[-- Attachment #1.1: Type: text/plain, Size: 7307 bytes --]

Hello Roland,

On Tue, Mar 01, 2022 at 11:33:35AM +0100, Roland Hieber wrote:
> On Thu, Jan 27, 2022 at 02:31:59PM +0100, Alexander Dahl 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>
> > ---
> >  rules/lighttpd.in   | 28 ++--------------------------
> >  rules/lighttpd.make | 17 ++++++++---------
> >  2 files changed, 10 insertions(+), 35 deletions(-)
> > 
> > diff --git a/rules/lighttpd.in b/rules/lighttpd.in
> > index 1f853c7fd..18827467f 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!
> 
> Did you mean to add a switch for --enable-pcre2 then, and just forgot? 

pcre2 is not available in ptxdist, someone would have to create a
package for that first.

Greets
Alex

> 
>  - Roland
> >  
> >  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 58a311404..98b80fea1 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))
> >  
> > 
> > base-commit: 7f40b36894327c11eb8738ea6690837c8c737e55
> > -- 
> > 2.20.1
> > 
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> > 
> 
> -- 
> Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
> Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
> 31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

-- 
/"\ ASCII RIBBON | »With the first link, the chain is forged. The first
\ / CAMPAIGN     | speech censured, the first thought forbidden, the
 X  AGAINST      | first freedom denied, chains us all irrevocably.«
/ \ HTML MAIL    | (Jean-Luc Picard, quoting Judge Aaron Satie)

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 181 bytes --]

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