mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH v2 1/4] lighttpd: Ugprade from 1.4.39 to 1.4.45
Date: Fri, 25 Aug 2017 09:38:44 +0200	[thread overview]
Message-ID: <20170825073844.areqwicqxkj422qc@pengutronix.de> (raw)
In-Reply-To: <1503484602-31788-2-git-send-email-ada@thorsis.com>

On Wed, Aug 23, 2017 at 12:36:39PM +0200, Alexander Dahl wrote:
> * webdav support was improved in 1.4.40, we switch on the additional
>     webdav related configure options, if webdav is selected
> * auth framework was rewritten in 1.4.42, while all other auth backends
>     (krb5, ldap, mysql) are disabled in ptxdist by configure, the basic
>     file backend is active and another module has to be loaded for it
> 
> For removal of the runstatedir configure option see the discussion on
> the proposed patch 1.4.39 -> 1.4.42 from October 2016.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/lighttpd.make | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> index aa0849a..fd6e1cf 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.45
> +LIGHTTPD_MD5		:= a128e1eda76899ce3fd115efae5fe631
>  LIGHTTPD		:= lighttpd-$(LIGHTTPD_VERSION)
>  LIGHTTPD_SUFFIX		:= tar.xz
>  LIGHTTPD_URL		:= http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
> @@ -36,27 +36,31 @@ LIGHTTPD_LICENSE	:= BSD-3-Clause
>  LIGHTTPD_CONF_TOOL	:= autoconf
>  LIGHTTPD_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> -	--runstatedir=/run \
>  	--libdir=/usr/lib/lighttpd \
>  	--$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-lfs \
>  	$(GLOBAL_IPV6_OPTION) \
>  	--disable-mmap \
> +	--enable-extra-warnings \
>  	--without-libev \
>  	--without-mysql \
>  	--without-ldap \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_ATTR)-attr \
>  	--without-valgrind \
>  	--without-libunwind \
> +	--without-krb5 \
>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_OPENSSL)-openssl \
> -	--without-kerberos5 \
>  	--$(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_MEMCACHE)-memcached \

This changes the requirement to libmemcached and a newer version than the
one currently in PTXdist (1.0.x I think).
Either update libmemcached or mark LIGHTTPD_MEMCACHE(D) as broken.

Michael

>  	--$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
>  
>  # ----------------------------------------------------------------------------
> @@ -68,6 +72,7 @@ LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESS)		+= mod_access
>  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_COMPRESS)	+= mod_compress
>  LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_FASTCGI)	+= mod_fastcgi
> -- 
> 2.1.4
> 
> 

-- 
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

  reply	other threads:[~2017-08-25  7:38 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-23 10:36 [ptxdist] [PATCH v2 0/4] lighttpd: Update and suggestions from last year Alexander Dahl
2017-08-23 10:36 ` [ptxdist] [PATCH v2 1/4] lighttpd: Ugprade from 1.4.39 to 1.4.45 Alexander Dahl
2017-08-25  7:38   ` Michael Olbrich [this message]
2017-08-25  8:05     ` Alexander Dahl
2017-08-26 15:46       ` Alexander Dahl
2017-08-28  9:34         ` Michael Olbrich
2017-08-23 10:36 ` [ptxdist] [PATCH v2 2/4] lighttpd: Rename memcache option to memcached Alexander Dahl
2017-08-23 10:36 ` [ptxdist] [PATCH v2 3/4] lighttpd: Simplify additional config include Alexander Dahl
2017-08-23 10:36 ` [ptxdist] [PATCH v2 4/4] lighttpd: Install mime.conf and remove hardcoded values Alexander Dahl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170825073844.areqwicqxkj422qc@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox