mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] updates lighttpd version 1.4.39 -> 1.4.42
@ 2016-10-21  8:26 Andreas Geisenhainer
  2016-10-21  9:28 ` Michael Olbrich
  2016-10-21 10:05 ` Alexander Dahl
  0 siblings, 2 replies; 13+ messages in thread
From: Andreas Geisenhainer @ 2016-10-21  8:26 UTC (permalink / raw)
  To: ptxdist

 * 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

^ permalink raw reply	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2016-11-11  9:23 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-21  8:26 [ptxdist] [PATCH] updates lighttpd version 1.4.39 -> 1.4.42 Andreas Geisenhainer
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox