Updated lighttpd to version 1.4.42.

Added geoip build option.

Changelog:
  * [TLS] SSL_shutdown() only if handshake finished
  * [mod_proxy,mod_scgi] shutdown remote only if local (#2743)
  * [core] check if client half-closed TCP if POLLHUP (#2743)
  * [core] enforce wait for POLLWR after EINPROGRESS (fixes #2744)
  * [core] do not enter handler twice after read body
  * [core] proxy,scgi omit shutdown() to backend (fixes #2743)
  * [mod_dirlisting] dirlist does not handle POST
  * [mod_dirlisting] js column sort for dirlist table (fixes #613, fixes #2315)
  * [mod_auth] Digest auth fails after rewrite (fixes #2745)
  * [mod_auth] refactor out auth backend code
  * [mod_auth] extensible interface for auth backends
  * [core] better DragonFlyBSD support (fixes #2746)
  * [mod_auth] include base.h for USE_OPENSSL def
  * [mod_auth] support CRYPT-MD5-NTLM algorithm (fixes #1743)
  * [mod_auth] terminate salt for CRYPT-MD5-NTLM
  * [core] fix crash if ready events on abandoned fd (fixes #2748)
  * [mod_auth] http_auth_md5_hex2bin()
  * [mod_auth] remove empty mod_auth.h
  * [mod_auth] mod_authn_mysql.c MySQL auth backend (fixes #752, fixes #1845)
  * [mod_cgi] permit CGI exec of unreadable files (fixes #2374)
  * [mod_uploadprogress] add to default build
  * [mod_geoip] add to default build (fixes #2705, fixes #2101, fixes #2092,
    fixes #2025, fixes #1962, fixes #1938)
  * [mod_fastcgi] Authorizer support with Responder (fixes #321, fixes #322)
  * [tests] test coverage for issues (#321, #322)
  * dynamic handlers store debug flag in handler_ctx
  * [mod_fastcgi] allow authorizer, responder for same path/ext (#321)
  * backport mod_deflate to lighttpd 1.4 (fixes #1824, fixes #2753)
  * [autobuild] test_configfile might need vector.c (fixes #2752)
  * [mod_deflate] fix longjmp clobber compiler warning
  * remove unused array type TYPE_COUNT data_count
  * [mod_auth] structured data, register auth schemes
  * [mod_auth] mod_authn_gssapi Kerberos auth backend (fixes #1899)
  * [autobuild] skip two new tests if no fcgi-auth
  * [SCons] define with_krb5 for SCons build
  * [SCons] fix syntax error in SConstruct
  * [SCons] define with_geoip for SCons build
  * [CMake] fix clang -Wcast-align warnings in lemon.c
  * remove excess initializers (fix compiler warnings)
  * fix errors detected by Coverity Scan
  * performance: use Linux extended syscalls and flags
  * [mod_scgi] add uwsgi protocol support
  * [mod_auth] refactor LDAP code into smaller funcs
  * [mod_auth] HTTP Basic auth backends also do authz (#1817)
  * [mod_auth] ldap filter subst user for multiple '$' (fixes #1508)
  * [mod_auth] permit specifying ldap DN; skip search (fixes #1248)
  * [autobuild] update module/feature report
  * [cmake] build mod_authn_gssapi if WITH_KRB5
  * [mod_auth] fix printing of IP in error trace
  * [mod_mysql_vhost] support multiple '?' replacement (fixes #2163)
  * [core] make server.max-request-size scopeable (#1901)
  * [core] server.max-request-field-size (fixes #2130)
  * [core] optional condition in config "else" clause (fixes #1268)
  * [core] restrict where config "else" clauses occur (#1268)
  * silence warnings from clang ccc-analyzer
  * consistent, shared code to create CGI env
  * [TLS] replace env entries in https_add_ssl_entries
  * [TLS] set SSL_CLIENT_M_SERIAL w/ client cert SN (fixes #2268)
  * [TLS] set SSL_CLIENT_VERIFY w/ client cert (#1288, #2693)
  * [TLS] set SSL_PROTOCOL, SSL_CIPHER* (fixes #2511)
  * [core] rand.[ch] to use better RNGs when available
  * [mod_cgi] fix pipe_cloexec() when no O_CLOEXEC
  * ignore return value from fcntl() FD_CLOEXEC
  * build w/o compiler warnings if no zlib or bz2lib

5 files changed, 42 insertions, 10 deletions

diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 2e98f52f28e..415431a6540 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2016/08/01 09:25:20 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2016/10/17 22:00:22 nros Exp $
 
-DISTNAME=	lighttpd-1.4.41
+DISTNAME=	lighttpd-1.4.42
 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 3c195b0e97c..7caf712aaef 100644
--- a/www/lighttpd/PLIST
+++ b/www/lighttpd/PLIST
@@ -1,11 +1,16 @@
-@comment $NetBSD: PLIST,v 1.11 2014/03/11 14:05:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/10/17 22:00:22 nros Exp $
 lib/lighttpd/mod_access.la
 lib/lighttpd/mod_accesslog.la
 lib/lighttpd/mod_alias.la
 lib/lighttpd/mod_auth.la
+lib/lighttpd/mod_authn_file.la
+lib/lighttpd/mod_authn_gssapi.la
+lib/lighttpd/mod_authn_ldap.la
+lib/lighttpd/mod_authn_mysql.la
 lib/lighttpd/mod_cgi.la
 lib/lighttpd/mod_cml.la
 lib/lighttpd/mod_compress.la
+lib/lighttpd/mod_deflate.la
 lib/lighttpd/mod_dirlisting.la
 lib/lighttpd/mod_evasive.la
 lib/lighttpd/mod_evhost.la
@@ -13,6 +18,7 @@ lib/lighttpd/mod_expire.la
 lib/lighttpd/mod_extforward.la
 lib/lighttpd/mod_fastcgi.la
 lib/lighttpd/mod_flv_streaming.la
+lib/lighttpd/mod_geoip.la
 lib/lighttpd/mod_indexfile.la
 lib/lighttpd/mod_magnet.la
 lib/lighttpd/mod_mysql_vhost.la
@@ -28,6 +34,7 @@ lib/lighttpd/mod_ssi.la
 lib/lighttpd/mod_staticfile.la
 lib/lighttpd/mod_status.la
 lib/lighttpd/mod_trigger_b4_dl.la
+lib/lighttpd/mod_uploadprogress.la
 lib/lighttpd/mod_userdir.la
 lib/lighttpd/mod_usertrack.la
 lib/lighttpd/mod_webdav.la
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index 6ba7898e5c2..48fbca68215 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.34 2016/08/01 09:25:20 wiz Exp $
+$NetBSD: distinfo,v 1.35 2016/10/17 22:00:22 nros Exp $
 
-SHA1 (lighttpd-1.4.41.tar.xz) = c6cec4e6421e9130b837d115d247ea1f79f6d59d
-RMD160 (lighttpd-1.4.41.tar.xz) = 2d5272eab59bc3973ef307b8ceb02f997eda31ff
-SHA512 (lighttpd-1.4.41.tar.xz) = 8ceb8da7bcd91988e285c9b62e141b93a0cf3d6a1c65c09400414ff8250571ee94b0a764145b3613cca2675ad27170c744b35e98d5e9bcd5d0ee6ac4da57c084
-Size (lighttpd-1.4.41.tar.xz) = 623480 bytes
+SHA1 (lighttpd-1.4.42.tar.xz) = a434a92d5a2d6cb11922484cba59e684b2c94167
+RMD160 (lighttpd-1.4.42.tar.xz) = 6d8a21f6936c856a1217c7594426a31b77d0eb15
+SHA512 (lighttpd-1.4.42.tar.xz) = eb43a53f1fe7a115d0cf60ed8b79a22472a4fef939937401a475bdfd7244e53efa3aae1f66cd709989e77064aadd40004455b167ea3c4efc07ced261c18bd773
+Size (lighttpd-1.4.42.tar.xz) = 652140 bytes
 SHA1 (patch-doc_config_lighttpd.conf) = de14fd0aa0ed2cac5846d810b5c89af4036f1b70
+SHA1 (patch-src_connections.c) = 5f108e714903b68f11fff19a59ca4cf523a406de
diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk
index 424b3fdf13d..eca72672f9d 100644
--- a/www/lighttpd/options.mk
+++ b/www/lighttpd/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.11 2016/08/01 09:25:20 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2016/10/17 22:00:22 nros Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lighttpd
-PKG_SUPPORTED_OPTIONS=	bzip2 fam gdbm inet6 ldap lua mysql ssl memcache
+PKG_SUPPORTED_OPTIONS=	bzip2 fam gdbm inet6 ldap lua mysql ssl memcache geoip
 PKG_SUGGESTED_OPTIONS=	inet6 ssl
 
 .include "../../mk/bsd.options.mk"
@@ -84,3 +84,11 @@ CONFIGURE_ARGS+=	--with-mysql=${MYSQL_CONFIG:Q}
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 .endif
+
+###
+### GeoIP support
+###
+.if !empty(PKG_OPTIONS:Mgeoip)
+.  include "../../net/GeoIP/buildlink3.mk"
+CONFIGURE_ARGS+=        --with-geoip
+.endif
diff --git a/www/lighttpd/patches/patch-src_connections.c b/www/lighttpd/patches/patch-src_connections.c
new file mode 100644
index 00000000000..48dc0d76244
--- /dev/null
+++ b/www/lighttpd/patches/patch-src_connections.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_connections.c,v 1.1 2016/10/17 22:00:22 nros Exp $
+* NetBSD does not have accept4 but uses paccept.
+--- src/connections.c.orig	2016-10-17 18:54:19.000000000 +0000
++++ src/connections.c
+@@ -1027,7 +1027,11 @@ connection *connection_accept(server *sr
+ 	cnt_len = sizeof(cnt_addr);
+ 
+ #if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK)
++#if defined(__NetBSD__)
++	cnt = paccept(srv_socket->fd, (struct sockaddr *) &cnt_addr, &cnt_len, NULL, SOCK_CLOEXEC | SOCK_NONBLOCK);
++#else
+ 	cnt = accept4(srv_socket->fd, (struct sockaddr *) &cnt_addr, &cnt_len, SOCK_CLOEXEC | SOCK_NONBLOCK);
++#endif
+ #else
+ 	cnt = accept(srv_socket->fd, (struct sockaddr *) &cnt_addr, &cnt_len);
+ #endif