- Update lighttpd to 1.4.43

- Add KRB5 option
- Clearify some option descriptions

PR:		213977
Submitted by:  Piotr Kubaj <pkubaj@anongoth.pl> (maintainer)

4 files changed, 24 insertions, 36 deletions

diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 0c85ce3d1be4..3912c0b2dab3 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	lighttpd
-PORTVERSION=	1.4.42
-PORTREVISION=	1
+PORTVERSION=	1.4.43
 CATEGORIES?=	www
 MASTER_SITES?=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 
@@ -31,19 +30,21 @@ INSTALL_TARGET=	install-strip
 .if !defined(_BUILDING_LIGHTTPD_MODULE)
 USE_RC_SUBR=	lighttpd
 
-OPTIONS_DEFINE=	ATTR BZIP2 DOCS FAM GDBM GEOIP IPV6 LIBEV LUA MEMCACHED MYSQL \
-		LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV
+OPTIONS_DEFINE=	ATTR BZIP2 DOCS FAM GDBM GEOIP IPV6 KRB5 LIBEV LUA MEMCACHED \
+		MYSQL LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV
 
 OPTIONS_DEFAULT=	OPENSSL
+OPTIONS_SUB=	yes
 
 ATTR_DESC=	extended attributes support
 BZIP2_DESC=	bzip2 support (mod_compress)
 GDBM_DESC=	gdbm storage (mod_trigger_b4_dl)
-LDAP_DESC=	LDAP authentication
+KRB5_DESC=	Kerberos authentication (mod_authn_gssapi)
+LDAP_DESC=	LDAP authentication (mod_authn_ldap)
 LIBEV_DESC=	Fast events support via libev (disables kqueue)
 LUA_DESC=	lua support (mod_cml, mod_magnet)
 MEMCACHED_DESC=	memcached storage (mod_trigger_b4_dl)
-MYSQL_DESC=	MySQL support (mod_mysql_vhost)
+MYSQL_DESC=	MySQL support (mod_authn_mysql, mod_mysql_vhost)
 SPAWNFCGI_DESC=	Depend on spawn-fcgi utility
 VALGRIND_DESC=	valgrind support
 WEBDAV_DESC=	WebDAV support
@@ -58,6 +59,11 @@ GDBM_CONFIGURE_WITH=	gdbm
 GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 GEOIP_CONFIGURE_WITH=	geoip
 IPV6_CONFIGURE_OFF=	--disable-ipv6
+KRB5_CONFIGURE_WITH=	krb5
+KRB5_CPPFLAGS=		${GSSAPICPPFLAGS}
+KRB5_LDFLAGS=		${GSSAPILDFLAGS}
+KRB5_LIBS=		${GSSAPILIBS}
+KRB5_USES=		gssapi:mit
 LIBEV_CONFIGURE_WITH=	libev=${LOCALBASE}
 LIBEV_LIB_DEPENDS=	libev.so:devel/libev
 LUA_USES=		lua
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index fdba756e6eba..42ef63be8933 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1476712210
-SHA256 (lighttpd-1.4.42.tar.xz) = b2c9069ed0bade9362c27b469a9b884641786aea1c3d686f9fd9f01d15e2a15f
-SIZE (lighttpd-1.4.42.tar.xz) = 652140
+TIMESTAMP = 1477993209
+SHA256 (lighttpd-1.4.43.tar.xz) = fe0c4a06dd2408a83ee7a2bfedc45e09597f3313cbda82485507573ae8fa948a
+SIZE (lighttpd-1.4.43.tar.xz) = 656248
 SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 716cd4f8d371e12c115a2204e649aafe2ebad42d0099777b1361c0e2cc8a1612
 SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch) = 242456
diff --git a/www/lighttpd/files/patch-src_mod__cgi.c b/www/lighttpd/files/patch-src_mod__cgi.c
deleted file mode 100644
index cb5e96cb8d57..000000000000
--- a/www/lighttpd/files/patch-src_mod__cgi.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/mod_cgi.c.orig	2016-10-16 10:48:26 UTC
-+++ src/mod_cgi.c
-@@ -32,13 +32,14 @@
- #include <signal.h>
- #include <ctype.h>
- #include <assert.h>
-+#include <sys/param.h>
- 
- #include <stdio.h>
- #include <fcntl.h>
- 
--#ifdef O_CLOEXEC
-+#if defined(O_CLOEXEC) && __FreeBSD_version >= 1000032
- #define pipe_cloexec(pipefd) pipe2((pipefd), O_CLOEXEC)
--#elif defined FD_CLOEXEC
-+#elif defined(FD_CLOEXEC)
- #define pipe_cloexec(pipefd) \
-   (   0 == pipe(pipefd) \
-    && 0 == fcntl(pipefd[0], F_SETFD, FD_CLOEXEC) \
diff --git a/www/lighttpd/pkg-plist b/www/lighttpd/pkg-plist
index ffa1689294b4..c5d3824363a1 100644
--- a/www/lighttpd/pkg-plist
+++ b/www/lighttpd/pkg-plist
@@ -29,11 +29,11 @@ lib/lighttpd/mod_accesslog.so
 lib/lighttpd/mod_alias.so
 lib/lighttpd/mod_auth.so
 lib/lighttpd/mod_authn_file.so
-lib/lighttpd/mod_authn_gssapi.so
-lib/lighttpd/mod_authn_ldap.so
-lib/lighttpd/mod_authn_mysql.so
+%%KRB5%%lib/lighttpd/mod_authn_gssapi.so
+%%LDAP%%lib/lighttpd/mod_authn_ldap.so
+%%MYSQL%%lib/lighttpd/mod_authn_mysql.so
 lib/lighttpd/mod_cgi.so
-lib/lighttpd/mod_cml.so
+%%LUA%%lib/lighttpd/mod_cml.so
 lib/lighttpd/mod_compress.so
 lib/lighttpd/mod_deflate.so
 lib/lighttpd/mod_dirlisting.so
@@ -43,10 +43,10 @@ lib/lighttpd/mod_expire.so
 lib/lighttpd/mod_extforward.so
 lib/lighttpd/mod_fastcgi.so
 lib/lighttpd/mod_flv_streaming.so
-lib/lighttpd/mod_geoip.so
+%%GEOIP%%lib/lighttpd/mod_geoip.so
 lib/lighttpd/mod_indexfile.so
-lib/lighttpd/mod_magnet.so
-lib/lighttpd/mod_mysql_vhost.so
+%%LUA%%lib/lighttpd/mod_magnet.so
+%%MYSQL%%lib/lighttpd/mod_mysql_vhost.so
 lib/lighttpd/mod_proxy.so
 lib/lighttpd/mod_redirect.so
 lib/lighttpd/mod_rewrite.so
@@ -58,12 +58,13 @@ lib/lighttpd/mod_simple_vhost.so
 lib/lighttpd/mod_ssi.so
 lib/lighttpd/mod_staticfile.so
 lib/lighttpd/mod_status.so
-lib/lighttpd/mod_trigger_b4_dl.so
+%%MEMCACHED%%lib/lighttpd/mod_trigger_b4_dl.so
 lib/lighttpd/mod_uploadprogress.so
 lib/lighttpd/mod_userdir.so
 lib/lighttpd/mod_usertrack.so
 lib/lighttpd/mod_webdav.so
 man/man8/lighttpd.8.gz
+%%KRB5%%man/man8/lighttpd-angel.8.gz
 sbin/lighttpd
 sbin/lighttpd-angel
 @dir(%%USER%%,%%GROUP%%,700) %%LOGROOT%%