Re: [ptxdist] [PATCH] updates lighttpd version 1.4.39 -> 1.4.42

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

On Fri, Oct 21, 2016 at 10:26:37AM +0200, Andreas Geisenhainer wrote:
>  * update dependency from "memcache" to "memcached"
>  * add menuconfig entry for proxy module
>  * update configure switches
>  ** remove no longer valid "--runstatdir=<dir>"
>  ** update kerberos5 to krb5
>  ** explicitly disable openssl support (default is: no)
>  ** update webdav_props and webdav_locks options and
>     and make them depend on their respective parent (props or locks)
> 
> Signed-off-by: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
> ---
>  rules/lighttpd.in   | 12 +++++++++---
>  rules/lighttpd.make | 16 +++++++++++-----
>  2 files changed, 20 insertions(+), 8 deletions(-)
> 
> diff --git a/rules/lighttpd.in b/rules/lighttpd.in
> index d535394..60c5ff5 100644
> --- a/rules/lighttpd.in
> +++ b/rules/lighttpd.in
> @@ -16,7 +16,7 @@ menuconfig LIGHTTPD
>  	select SQLITE			if LIGHTTPD_WEBDAV_PROPS
>  	select LIBUUID			if LIGHTTPD_WEBDAV_LOCKS
>  	select OPENSSL			if LIGHTTPD_OPENSSL
> -	select LIBMEMCACHE		if LIGHTTPD_MEMCACHE
> +	select LIBMEMCACHED		if LIGHTTPD_MEMCACHED
>  	select LUA			if LIGHTTPD_LUA
>  	select LUA_INSTALL_LIBLUA	if LIGHTTPD_LUA
>  	select PHP5			if LIGHTTPD_MOD_FASTCGI_PHP && RUNTIME
> @@ -60,7 +60,7 @@ config LIGHTTPD_LUA
>  	help
>  	  lua engine for mod_cml and mod_magnet
>  
> -config LIGHTTPD_MEMCACHE
> +config LIGHTTPD_MEMCACHED

This deserves entry in scripts/migrate/migrate_ptx to help migration. There
should be enough examples show how it works if you are unfamiliar with sed
scripts.

>  	bool
>  	prompt "memcached storage"
>  	help
> @@ -171,7 +171,7 @@ config LIGHTTPD_MOD_REWRITE
>  
>  config LIGHTTPD_MOD_TRIGGER_B4_DL
>  	bool
> -	select LIGHTTPD_MEMCACHE
> +	select LIGHTTPD_MEMCACHED
>  	select LIGHTTPD_PCRE
>  	prompt "mod_trigger_b4_dl"
>  	help
> @@ -200,6 +200,12 @@ config LIGHTTPD_WEBDAV_LOCKS
>  	  locks in mod_webdav
>  endif
>  
> +config LIGHTTPD_MOD_PROXY
> +	bool
> +	prompt "mod_proxy"
> +	help
> +	  Proxy support

We only have explicit module options for modules with extra dependencies.
Use LIGHTTPD_MOD_EXTRA for everything else. So remove this please.

> +
>  config LIGHTTPD_MOD_EXTRA
>  	string
>  	prompt "extra modules"
> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> index 31217f4..523cda2 100644
> --- a/rules/lighttpd.make
> +++ b/rules/lighttpd.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
>  #
>  # Paths and names
>  #
> -LIGHTTPD_VERSION	:= 1.4.39
> -LIGHTTPD_MD5		:= 63c7563be1c7a7a9819a51f07f1af8b2
> +LIGHTTPD_VERSION	:= 1.4.42
> +LIGHTTPD_MD5		:= 53c55d7e1dac7adec161cd5490491f6d
>  LIGHTTPD		:= lighttpd-$(LIGHTTPD_VERSION)
>  LIGHTTPD_SUFFIX		:= tar.xz
>  LIGHTTPD_URL		:= http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
> @@ -36,7 +36,6 @@ LIGHTTPD_LICENSE	:= BSD-3-Clause
>  LIGHTTPD_CONF_TOOL	:= autoconf
>  LIGHTTPD_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> -	--runstatedir=/run \

Are you sure this option is gone?

>  	--libdir=/usr/lib/lighttpd \
>  	--$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-lfs \
>  	$(GLOBAL_IPV6_OPTION) \
> @@ -48,15 +47,21 @@ LIGHTTPD_CONF_OPT	:= \
>  	--without-valgrind \
>  	--without-libunwind \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_OPENSSL)-openssl \
> -	--without-kerberos5 \
> +	--without-krb5 \
> +	--without-aix-soname \

Leave this one out. It's just ignored anyways on Linux.

> +	--without-openssl \

This is wrong. It's already set based on PTXCONF_LIGHTTPD_OPENSSL above.
You might want to move that line if the order in './configure --help'
changed.

>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_PCRE)-pcre \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_ZLIB)-zlib \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_BZ2LIB)-bzip2 \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_FAM)-fam \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-webdav-props \
> +	--$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-libxml \
> +	--$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-sqlite \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-webdav-locks \
> +	--$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-uuid \
>  	--without-gdbm \
> -	--$(call ptx/wwo, PTXCONF_LIGHTTPD_MEMCACHE)-memcache \
> +	--without-geoip \
> +	--$(call ptx/wwo, PTXCONF_LIGHTTPD_MEMCACHED)-memcached \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
>  
>  # ----------------------------------------------------------------------------
> @@ -75,6 +80,7 @@ LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_MAGNET)		+= mod_magnet
>  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-$(PTXCONF_LIGHTTPD_MOD_PROXY)		+= mod_proxy

remove this (see above).

Michael

>  LIGHTTPD_MODULES-y += $(call remove_quotes,$(PTXCONF_LIGHTTPD_MOD_EXTRA))
>  
>  LIGHTTPD_MODULE_STRING := $(subst $(space),$(comma),$(addsuffix \",$(addprefix \",$(LIGHTTPD_MODULES-y))))
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de