From: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] updates lighttpd version 1.4.39 -> 1.4.42
Date: Fri, 21 Oct 2016 10:26:37 +0200 [thread overview]
Message-ID: <20161021082637.2744-1-Andreas.Geisenhainer@atsonline.de> (raw)
* 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
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
+
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 \
--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 \
+ --without-openssl \
--$(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
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
next reply other threads:[~2016-10-21 8:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-21 8:26 Andreas Geisenhainer [this message]
2016-10-21 9:28 ` Michael Olbrich
2016-10-21 10:41 ` Andreas Geisenhainer
2016-10-21 11:59 ` Clemens Gruber
2016-10-21 15:25 ` Michael Olbrich
2016-10-21 15:24 ` Michael Olbrich
2016-10-24 9:33 ` Andreas Geisenhainer
2016-10-24 11:48 ` Michael Olbrich
2016-10-24 13:21 ` Andreas Geisenhainer
2016-10-21 10:05 ` Alexander Dahl
2016-10-31 14:16 ` Alexander Dahl
2016-10-31 15:14 ` Clemens Gruber
2016-11-11 9:23 ` Michael Olbrich
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=20161021082637.2744-1-Andreas.Geisenhainer@atsonline.de \
--to=andreas.geisenhainer@atsonline.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