lighttpd: Update to 1.4.54.

pkgsrc changes:

Replace use of legacy GeoIP library with libmaxminddb.
Uses a different module.

Changes:

Highlights
behavior change: strict URL parsing and normalization (configurable)
behavior change: mod_webdav now rejects partial PUT (configurable)
mod_auth: HTTP Auth Digest algorithm=SHA-256
mod_webdav: major rewrite: robustness, performance, RFC compliance
mod_maxminddb: new; obsoletes discontinued mod_geoip

Changes from 1.4.53
[mod_evhost] handle IPv6 literal addr; add tests
[core] separate server_main_loop() func, mark hot
[core] mark startup/shutdown funcs cold
[core] some server_main_loop() cleanup
[core] fdevent_process()
[core] srv→max_fds_lowat and srv→max_fds_hiwat
[core] remove server.h
[mod_staticfile] search ext array if not empty
[core] store joblist pointer on stack
[core] quickly clear request buffer for reuse
[core] helper funcs for connection_state_machine()
[core] perf: optimize connection_read_header()
[core] parse request in connection_read_header()
[core] log_request_header_on_error in one place
[core] copy request only if might need for logging
[core] make parse_request,request.request same buf
[core] prefer buffer_caseless_compare()
[core] pass req hdrs buffer to http_request_parse
[core] replace con→response.keep_alive
[core] mark log_error_write*() funcs cold
[core] http_request_parse() mark error paths cold
[core] lift code out of request line parse loop
[core] get_http_method_key() match by strlen first
[core] RFC7230 HTTP-version parse
[mod_accesslog] attempt to reconstruct req line
[multiple] minor: remove duplicated conditions
[mod_deflate] honor request for x-gzip, x-bzip2
[mod_auth] minor: adjust config validation
[core] discard oversized trailers
[core] no keep-alive if POLLRDHUP,empty read queue
[core] fix gw_backend spelling of directive in err
[multiple] reduce code dup in list resizing
[core] con→is_ssl_sock
[core] connection_handle_write() updates con state
[core] skip plugins_call_cleanup if not init’ed
[core] simpler loops to run plugin hooks
[core] fix mixed use of srv→split_vals array (fixes #2932)
[core] dispatch events from within event framework
[core] don’t call fd event handlers more than once, they might already be gone (fixes segfault)
[core] poll: fdarray uses fd as index, not fde_ndx
[core] map FDEVENT_* to OS system event frameworks
[core] prefer memchr() over strchr()
[core] use openssl to read,discard request body
[mod_openssl] inherit cipherlist from global scope
[mod_openssl] default: ssl.cipher-list = “HIGH”
[mod_proxy] pass Content-Length to backend if > 0
[core] config option to allow GET w/ request body
[core] some fdevent code streamlining
[core] remove fde_ndx member outside fdevents
[core] remove redundant check for allow_http11
[mod_openssl] use 16k static buffer instead of 64k
[core] pull server load checks out of main loop
[core] isolate fdevent processing
[core] release empty chunk buf when nothing read
[core] perf: pass (fdnode *) to epoll and kqueue
[core] modify config parser to handle multiple }
[core] pass (fdnode *) for registered fdevent fd
[mod_auth] http_auth_digest_hex2bin()
[mod_auth] http_auth_info_t digest abstraction
[mod_auth] pass http_auth_require_t for 401 Unauth
[core] no SOCK_NONBLOCK on QNX 7.0
[mod_auth] HTTP Auth Digest algorithm=SHA-256
[core] silence coverity warning
[mod_magnet] fix invalid script return-type crash (fixes #2938)
[build] remove -Wdeclaration-after-statement
[core] pass conf.follow_symlink in more places
[core] fix assertion with server.error-handler (fixes #2941)
[core] extend dir redirection to take HTTP status
[doc] minor adjust create-mime.conf.pl regex match (#2942)
[core] attribute((fallthrough)) for GCC 7.0
[core] fdevent_mkstemp_append() (shared)
[core] off_t upload_temp_file_size
[core] clear FDEVENT_RDHUP if no POLLRDHUP
[mod_wstunnel] fix ping-interval for big-endian (fixes #2944)
[core] fix abort in http-parseopts (fixes #2945)
[core] remove repeated slashes in http-parseopts
[core] fix 1.4.52 regression in mem use with POST (fixes #2948)
[multiple] cleaner calloc use in SETDEFAULTS_FUNC
[core] add const to some etag prototypes
[core] attribute((format …))
[core] struct log_error_st for error logging
[core] log_error, log_perror using printf-like fmt
[core] new worker_init hook to follow parent fork
[core] replace open() with fdevent_open_cloexec()
[mod_webdav] major rewrite (fixes #1818)
[core] 200 for OPTIONS /non-existent/path HTTP/1.1 (fixes #2939)
[mod_webdav] surround Lock-Token with “<…>”
[mod_webdav] fix uuid detection macro
[mod_webdav] fix misbehavior on blank nodes in PROPPATCH
[mod_webdav] clean up resources after do{}while(0)
[mod_webdav] check If-Match, If-Unmodified-Since (#1818)
[mod_webdav] deprecated unsafe partial PUT compat
[mod_webdav] provide ETag in more responses
[mod_webdav] platform portability fixes
[mod_webdav] disable elftc_copyfile() on FreeBSD
[mod_webdav] special-case If: ()
[mod_webdav] check If-None-Match (#1818)
[stat_cache] separate func for symlink policy chk
[stat_cache] separate symlink pol from data struct
[stat_cache] store entries without trailing slash
[stat_cache] pass age param for stat cache cleanup
[stat_cache] remove splaytree ins/del debug code
[stat_cache] FAM: reduce string copying
[stat_cache] FAM: check FAMNextEvent() return code
[stat_cache] FAM: use entry hash index as userdata
[stat_cache] FAM: improve handling modified file
[stat_cache] FAM: ignore follow-symlink config
[stat_cache] FAM: check hash collision before add
[stat_cache] FAM: ignore event with no valid match
[stat_cache] FAM: funcs to invalidate entries
[stat_cache] interfaces to invalidate entries
[mod_webdav] update stat_cache after file mod
[core] use high precision stat timestamp in etag
[scons] adjustment for static build under CentOS
[core] emit trace using path before clearing path
[core] http_chunk_append_file_fd()
[multiple] open target file earlier in some cases
[stat_cache] no longer stat() and open() for stat
[stat_cache] FAM: improve monitoring, cache 16 sec
[stat_cache] FAM: separate routine for FDEVENT_IN
[stat_cache] FAM: whitespace-only change
[mod_webdav] quiet coverity warnings
[doc] highlight relevance of module load order (fixes #2946)
[core] behavior change: stricter URL normalization
[stat_cache] fix compilation error for cmake
[cmake] help cmake on FreeBSD find sys/event.h
[scons] help scons on FreeBSD find sys/event.h
[build] detect FreeBSD elftc_copyfile()
[mod_openssl] use SSL_CTX_set_client_hello_cb()
[core] support weak etags with If-None-Match
[core] store log_state_handling flag on stack
[core] check if splay_tree NULL before invalidate
[mod_webdav] workaround Microsoft-WebDAV-MiniRedir
[mod_webdav] doc Microsoft-WebDAV-MiniRedir bugs
[mod_webdav] invalidate parent dir in stat_cache
[doc] systemd socket activation config example
[core] chunkqueue perf: code reuse
[core] chunkqueue perf: specialized buffer.h funcs
[core] chunkqueue perf: skip opening 0-length file
[core] chunkqueue perf: read small files into mem
[core] buffer_reset() should not be passed NULL
[tests] has_feature() helper func
[tests] skip mod-secdownload HMAC-SHA1,HMAC-SHA256
[core] use high precision stat timestamp on OS X
[mod_magnet] expose server addr (local IP) to lua
[core] adjust http_chunk read() retry loop
[mod_maxminddb] MaxMind GeoIP2 support
[mod_authn_ldap] ldap_set_option LDAP_OPT_RESTART (fixes #2940)

5 files changed, 22 insertions, 21 deletions

diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 76186ab6d59..707f28a6c2a 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.82 2019/04/03 00:33:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.83 2019/05/29 10:01:28 nia Exp $
 
-DISTNAME=	lighttpd-1.4.53
-PKGREVISION=	1
+DISTNAME=	lighttpd-1.4.54
 CATEGORIES=	www
 MASTER_SITES=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 EXTRACT_SUFX=	.tar.xz
diff --git a/www/lighttpd/PLIST b/www/lighttpd/PLIST
index e9211d6c84f..bfd42ee56dd 100644
--- a/www/lighttpd/PLIST
+++ b/www/lighttpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2018/08/14 06:24:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2019/05/29 10:01:28 nia Exp $
 lib/lighttpd/mod_access.la
 lib/lighttpd/mod_accesslog.la
 lib/lighttpd/mod_alias.la
@@ -18,9 +18,9 @@ lib/lighttpd/mod_expire.la
 lib/lighttpd/mod_extforward.la
 lib/lighttpd/mod_fastcgi.la
 lib/lighttpd/mod_flv_streaming.la
-${PLIST.geoip}lib/lighttpd/mod_geoip.la
 lib/lighttpd/mod_indexfile.la
 ${PLIST.lua}lib/lighttpd/mod_magnet.la
+${PLIST.geoip}lib/lighttpd/mod_maxminddb.la
 ${PLIST.mysql}lib/lighttpd/mod_mysql_vhost.la
 ${PLIST.ssl}lib/lighttpd/mod_openssl.la
 lib/lighttpd/mod_proxy.la
@@ -44,6 +44,8 @@ lib/lighttpd/mod_usertrack.la
 lib/lighttpd/mod_vhostdb.la
 ${PLIST.ldap}lib/lighttpd/mod_vhostdb_ldap.la
 ${PLIST.ldap}lib/lighttpd/mod_vhostdb_ldap.so
+${PLIST.mysql}lib/lighttpd/mod_vhostdb_mysql.la
+${PLIST.mysql}lib/lighttpd/mod_vhostdb_mysql.la
 lib/lighttpd/mod_webdav.la
 lib/lighttpd/mod_wstunnel.la
 man/man8/lighttpd-angel.8
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index 3f92b1b1f2d..22be8bc2a7e 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.52 2019/01/28 22:39:52 schmonz Exp $
+$NetBSD: distinfo,v 1.53 2019/05/29 10:01:28 nia Exp $
 
-SHA1 (lighttpd-1.4.53.tar.xz) = 3e3fef1742b3fe5a7ff5f0428620c76d37c075a4
-RMD160 (lighttpd-1.4.53.tar.xz) = f55640884f6767b41143070c40995ae333b5016a
-SHA512 (lighttpd-1.4.53.tar.xz) = bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76
-Size (lighttpd-1.4.53.tar.xz) = 732160 bytes
-SHA1 (patch-doc_config_lighttpd.conf) = aa1ee77f3fdce7ffd6968c4b09e6977f671495d3
+SHA1 (lighttpd-1.4.54.tar.xz) = 31c6df437d90f4bceb41f6d758e0fbcd0f854a37
+RMD160 (lighttpd-1.4.54.tar.xz) = 24ac7d816918e1c87aaaa1e6ae8f775a464527fc
+SHA512 (lighttpd-1.4.54.tar.xz) = aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37
+Size (lighttpd-1.4.54.tar.xz) = 763248 bytes
+SHA1 (patch-doc_config_lighttpd.conf) = 9b249155aa29d7d068d48a601f314aa4b62491ef
 SHA1 (patch-doc_lighttpd.8) = 81b7606752312227b142975d4e781496442e9ed8
diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk
index 0f123637696..eb7b6c7952b 100644
--- a/www/lighttpd/options.mk
+++ b/www/lighttpd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2019/01/29 12:31:46 wiz Exp $
+# $NetBSD: options.mk,v 1.21 2019/05/29 10:01:28 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lighttpd
 PKG_SUPPORTED_OPTIONS=	bzip2 fam gdbm inet6 ldap lua mysql ssl memcached geoip gssapi webdav
@@ -97,8 +97,8 @@ PLIST.ssl=		yes
 ### GeoIP support
 ###
 .if !empty(PKG_OPTIONS:Mgeoip)
-.  include "../../net/GeoIP/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-geoip
+.  include "../../geography/libmaxminddb/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-maxminddb
 PLIST.geoip=		yes
 .endif
 
diff --git a/www/lighttpd/patches/patch-doc_config_lighttpd.conf b/www/lighttpd/patches/patch-doc_config_lighttpd.conf
index b0b3a2283a3..ee0010ffae4 100644
--- a/www/lighttpd/patches/patch-doc_config_lighttpd.conf
+++ b/www/lighttpd/patches/patch-doc_config_lighttpd.conf
@@ -1,8 +1,8 @@
-$NetBSD: patch-doc_config_lighttpd.conf,v 1.4 2018/04/17 10:22:00 triaxx Exp $
+$NetBSD: patch-doc_config_lighttpd.conf,v 1.5 2019/05/29 10:01:28 nia Exp $
 
 Sane defaults.
 
---- doc/config/lighttpd.conf.orig	2018-03-12 00:52:20.000000000 +0000
+--- doc/config/lighttpd.conf.orig	2019-05-27 21:03:50.000000000 +0000
 +++ doc/config/lighttpd.conf
 @@ -13,11 +13,11 @@
  ## if you add a variable here. Add the corresponding variable in the
@@ -38,9 +38,9 @@ Sane defaults.
 +server.username  = "@LIGHTTPD_USER@"
 +server.groupname = "@LIGHTTPD_GROUP@"
  
- ## 
- ## enable core files.
-@@ -178,7 +178,7 @@ include "conf.d/debug.conf"
+ ##
+ ## Enable lighttpd to serve requests on sockets received from systemd
+@@ -184,7 +184,7 @@ include "conf.d/debug.conf"
  ##
  ## linux-sysepoll is recommended on kernel 2.6.
  ##
@@ -49,7 +49,7 @@ Sane defaults.
  
  ##
  ## The basic network interface for all platforms at the syscalls read()
-@@ -188,7 +188,7 @@ server.event-handler = "linux-sysepoll"
+@@ -194,7 +194,7 @@ server.event-handler = "linux-sysepoll"
  ## sendfile       - is recommended for small files.
  ## writev         - is recommended for sending many large files
  ##
@@ -58,7 +58,7 @@ Sane defaults.
  
  ##
  ## As lighttpd is a single-threaded server, its main resource limit is
-@@ -405,7 +405,7 @@ server.follow-symlink = "enable"
+@@ -411,7 +411,7 @@ server.follow-symlink = "enable"
  ##
  ## defaults to /var/tmp as we assume it is a local harddisk
  ##