- update to 2.4.20

- use ${OPTION}_IMPLIES and remove some IGNORES
- turn on proxy_html and xml2enc as default [1]

[1] Often requested by users. The modules are not enabled in
    the default configuration.

Full changelog for apache version 2.4.19/2.4.20:
 http://www.apache.org/dist/httpd/CHANGES_2.4.20

Note: Apache httpd 2.4.19 was not released.

MFH:	2016Q2

7 files changed, 31 insertions, 77 deletions

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 60a5c24efc5c..a88edc2d4fac 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	apache24
-PORTVERSION=	2.4.18
+PORTVERSION=	2.4.20
 CATEGORIES=	www ipv6
 MASTER_SITES=	APACHE_HTTPD
 DISTNAME=	httpd-${PORTVERSION}
@@ -52,6 +52,17 @@ WITH_SSL_PORT?=		443
 .include "${APACHEDIR}/Makefile.options"
 .include "${APACHEDIR}/Makefile.options.desc"
 
+# IMPLIES
+AUTHN_DBD_IMPLIES=		DBD
+HEARTBEAT_IMPLIES=		WATCHDOG STATUS
+HEARTMONITOR_IMPLIES=		WATCHDOG STATUS
+LBMETHOD_HEARTBEAT_IMPLIES=	WATCHDOG STATUS HEARTMONITOR
+
+# MPM
+MPM_PREFORK_CONFIGURE_ON=	--with-mpm=prefork
+MPM_WORKER_CONFIGURE_ON=	--with-mpm=worker
+MPM_EVENT_CONFIGURE_ON=		--with-mpm=event
+
 AUTHNZ_LDAP_CONFIGURE_ON=	--enable-authnz-ldap
 
 # http://httpd.apache.org/docs/2.4/bind.html
@@ -184,7 +195,7 @@ post-install-LOG_FORENSIC-on:
 modlist: extract
 	@${AWK} '/: checking whether to enable mod_/ \
 		{printf "%%%%%s%%%%libexec/apache24/%s.so\n", \
-		toupper($$8), $$8}' ${WRKSRC}/configure \
+		toupper($$8), $$8}' ${WRKSRC}/configure.upstream \
 		| ${TR} -d '"' \
 		| ${SORT} -u \
 		| ${GREP} -E -v '^%%MOD_(HTTP|ISAPI|LOG_CONFIG|PRIVILEGES|SO|UNIXD)%%'
diff --git a/www/apache24/Makefile.modules b/www/apache24/Makefile.modules
index 051ffd6e4e37..68694c02d57c 100644
--- a/www/apache24/Makefile.modules
+++ b/www/apache24/Makefile.modules
@@ -1,20 +1,11 @@
 # $FreeBSD$
 #
-# Note by Clement Laforet: (to generate PLIST_SUB entries for modules)
-#	gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist > tmp
-#	mv tmp pkg-plist
-#
-
 # =============================================
 # Maintainer note for OPTION handling:
 # To set additional option use
 #    PORT_OPTIONS+=
-# To unset an OPTION, even the OPTION is set in OPTIONS_FILE use
-#    WITHOUT_MODULES+=
-#  Using OPTIONS_EXCLUDE and OPTIONS_OVERRIDE do not work as expected
-#  if the OPTION is enabled by the user, therefore we calculate
-#  them in bsd.apache.mk with help of WITHOUT_MODULES
-#  The other methode is to set IGNORE's and force the user to adjust OPTIONS
+# To set / unset an OPTION, even the OPTION is set / unset in OPTIONS_FILE use
+#    WITH="MODULE1 MODULE2 ..." or WITHOUT="MODULE1 MODULE2 ..."
 
 .if defined(_PREMKINCLUDED)
 
@@ -37,11 +28,6 @@ IGNORE=	SESSION_CRYPTO requires APR-util to have crypto openssl support build in
 .endif	# exists APU_CONFIG
 
 # =============================================
-# if build with shared MPM the last module will be activated
-# see apache issue 53882
-
-# XXX in case we use OPTIONS for MPM
-# we do not have a WITH_MPM variable
 .if ${PORT_OPTIONS:MMPM_SHARED}
 SUB_LIST+=		MPM_FALLBACK_CHECK=""
 PLIST_SUB+=		MPM_SHARED=""
@@ -51,17 +37,7 @@ SUB_LIST+=		MPM_FALLBACK_CHECK="\#"
 PLIST_SUB+=		MPM_SHARED="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MMPM_PREFORK}
-CONFIGURE_ARGS+=	--with-mpm=prefork
-.elif ${PORT_OPTIONS:MMPM_WORKER}
-CONFIGURE_ARGS+=	--with-mpm=worker
-.elif ${PORT_OPTIONS:MMPM_EVENT}
-CONFIGURE_ARGS+=	--with-mpm=event
-.else
-IGNORE=	Unknown MPM:
-.endif
 # =============================================
-
 # build develop/example modules only with additional confirmation
 .for DEVMOD in ${EXAMPLE_MODULES}
 .  if ${PORT_OPTIONS:M${DEVMOD}}
@@ -92,28 +68,12 @@ WITH_EXCEPTION_HOOK=	yes
 CONFIGURE_ARGS+=	--enable-exception-hook
 .endif
 
-# watchdog modules
-.if ! ${PORT_OPTIONS:MWATCHDOG} || ! ${PORT_OPTIONS:MSTATUS}
-.  if ${PORT_OPTIONS:MHEARTBEAT}
-IGNORE=	HEARTBEAT requires WATCHDOG and STATUS
-.  elif ${PORT_OPTIONS:MHEARTMONITOR}
-IGNORE=	HEARTMONITOR requires WATCHDOG and STATUS
-.  endif
-.endif
-.if ${PORT_OPTIONS:MLBMETHOD_HEARTBEAT} && ! ${PORT_OPTIONS:MHEARTMONITOR}
-IGNORE=	LBMETHOD_HEARTBEAT requires WATCHDOG, STATUS and HEARTMONITOR
-.endif
-
 .if ${PORT_OPTIONS:MAUTH_BASIC} || ${PORT_OPTIONS:MAUTH_DIGEST}
 .  if !${APACHE_MODULES:MAUTHN*}
 IGNORE=	AUTH_BASIC and AUTH_DIGEST need at least one AUTHN provider
 .  endif
 .endif
 
-.  if ${PORT_OPTIONS:MAUTHN_DBD} && ! ${PORT_OPTIONS:MDBD}
-IGNORE=	AUTHN_DBD requires DBD
-.  endif
-
 .if ${PORT_OPTIONS:MAUTH_BASIC}
 .  if !${APACHE_MODULES:MAUTHZ*}
 IGNORE=	AUTH_BASIC need at least one AUTHZ provider
diff --git a/www/apache24/Makefile.options b/www/apache24/Makefile.options
index 7023de9fabcd..53e7080b563c 100644
--- a/www/apache24/Makefile.options
+++ b/www/apache24/Makefile.options
@@ -9,13 +9,12 @@
 #   UNIXD LOG_CONFIG
 
 
+# mod_proxy_html and xml2enc depending on libxml2
 PROXY_ENABLED_MODULES= \
 	PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI \
-	PROXY_FDPASS PROXY_FTP PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL
+	PROXY_FDPASS PROXY_FTP PROXY_HTTP PROXY_HTML PROXY_SCGI PROXY_WSTUNNEL
 
-# mod_proxy_html depends on libxml2
-PROXY_DISABLED_MODULES= \
-	PROXY_HTML
+PROXY_DISABLED_MODULES=
 
 # SESSION_CRYPTO need APR build with crypto (EVP support in APR)
 SESSION_ENABLED_MODULES= \
@@ -52,10 +51,10 @@ MOST_ENABLED_MODULES= \
 	SPELING SSL STATUS SUBSTITUTE \
 	UNIQUE_ID USERDIR USERTRACK \
 	VERSION VHOST_ALIAS \
-	WATCHDOG 
+	WATCHDOG XML2ENC
 
 MOST_DISABLED_MODULES:= \
-	AUTHNZ_LDAP IDENT LDAP LUA SOCACHE_DC SUEXEC XML2ENC HTTP2
+	AUTHNZ_LDAP IDENT LDAP LUA SOCACHE_DC SUEXEC HTTP2
 
 # XXX PROXY and SESSION are modules but also used to
 #     enable/disable additional PROXY/SESSION modules
diff --git a/www/apache24/distinfo b/www/apache24/distinfo
index f8ec62a79d8e..6b5307fd45e4 100644
--- a/www/apache24/distinfo
+++ b/www/apache24/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache24/httpd-2.4.18.tar.bz2) = 0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c
-SIZE (apache24/httpd-2.4.18.tar.bz2) = 5181291
+SHA256 (apache24/httpd-2.4.20.tar.bz2) = 0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da
+SIZE (apache24/httpd-2.4.20.tar.bz2) = 6331344
diff --git a/www/apache24/files/patch-Makefile.in b/www/apache24/files/patch-Makefile.in
index 7dcfab1dab67..e749f55fc75a 100644
--- a/www/apache24/files/patch-Makefile.in
+++ b/www/apache24/files/patch-Makefile.in
@@ -1,4 +1,4 @@
---- Makefile.in.orig	2015-04-15 18:06:04 UTC
+--- Makefile.in.orig	2016-03-20 15:51:49 UTC
 +++ Makefile.in
 @@ -32,12 +32,9 @@ include $(top_srcdir)/build/program.mk
  install-conf:
@@ -90,7 +90,7 @@
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
-@@ -251,12 +222,7 @@ install-man:
+@@ -252,12 +223,7 @@ install-man:
  	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
  	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
  	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
diff --git a/www/apache24/files/patch-modules_ssl_ssl__engine__io.c b/www/apache24/files/patch-modules_ssl_ssl__engine__io.c
deleted file mode 100644
index 9f067f84d896..000000000000
--- a/www/apache24/files/patch-modules_ssl_ssl__engine__io.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Backport openssl 0.9.8x patch:
-http://svn.apache.org/r1719967
-
-For discussion see:
-http://marc.info/?t=145011265700003&r=1&w=2
-===============================================================
---- modules/ssl/ssl_engine_io.c.orig	2015-11-19 19:55:25 UTC
-+++ modules/ssl/ssl_engine_io.c
-@@ -217,7 +217,7 @@ static int bio_filter_out_write(BIO *bio
-      * so limit the performance impact to handshake time.
-      */
- #if OPENSSL_VERSION_NUMBER < 0x0009080df
--     need_flush = !SSL_is_init_finished(outctx->filter_ctx->pssl)
-+     need_flush = !SSL_is_init_finished(outctx->filter_ctx->pssl);
- #else
-      need_flush = SSL_in_connect_init(outctx->filter_ctx->pssl);
- #endif
diff --git a/www/apache24/pkg-plist b/www/apache24/pkg-plist
index d2ef5a017722..cca954861d33 100644
--- a/www/apache24/pkg-plist
+++ b/www/apache24/pkg-plist
@@ -62,6 +62,7 @@ include/apache24/mod_rewrite.h
 include/apache24/mod_session.h
 include/apache24/mod_so.h
 include/apache24/mod_ssl.h
+include/apache24/mod_ssl_openssl.h
 include/apache24/mod_status.h
 include/apache24/mod_unixd.h
 include/apache24/mod_watchdog.h
@@ -89,14 +90,17 @@ libexec/apache24/httpd.exp
 %%MOD_ALIAS%%libexec/apache24/mod_alias.so
 %%MOD_ALLOWMETHODS%%libexec/apache24/mod_allowmethods.so
 %%MOD_ASIS%%libexec/apache24/mod_asis.so
-%%MOD_AUTHNZ_FCGI%%libexec/apache24/mod_authnz_fcgi.so
-%%MOD_AUTHNZ_LDAP%%libexec/apache24/mod_authnz_ldap.so
+%%MOD_AUTH_BASIC%%libexec/apache24/mod_auth_basic.so
+%%MOD_AUTH_DIGEST%%libexec/apache24/mod_auth_digest.so
+%%MOD_AUTH_FORM%%libexec/apache24/mod_auth_form.so
 %%MOD_AUTHN_ANON%%libexec/apache24/mod_authn_anon.so
 %%MOD_AUTHN_CORE%%libexec/apache24/mod_authn_core.so
 %%MOD_AUTHN_DBD%%libexec/apache24/mod_authn_dbd.so
 %%MOD_AUTHN_DBM%%libexec/apache24/mod_authn_dbm.so
 %%MOD_AUTHN_FILE%%libexec/apache24/mod_authn_file.so
 %%MOD_AUTHN_SOCACHE%%libexec/apache24/mod_authn_socache.so
+%%MOD_AUTHNZ_FCGI%%libexec/apache24/mod_authnz_fcgi.so
+%%MOD_AUTHNZ_LDAP%%libexec/apache24/mod_authnz_ldap.so
 %%MOD_AUTHZ_CORE%%libexec/apache24/mod_authz_core.so
 %%MOD_AUTHZ_DBD%%libexec/apache24/mod_authz_dbd.so
 %%MOD_AUTHZ_DBM%%libexec/apache24/mod_authz_dbm.so
@@ -104,9 +108,6 @@ libexec/apache24/httpd.exp
 %%MOD_AUTHZ_HOST%%libexec/apache24/mod_authz_host.so
 %%MOD_AUTHZ_OWNER%%libexec/apache24/mod_authz_owner.so
 %%MOD_AUTHZ_USER%%libexec/apache24/mod_authz_user.so
-%%MOD_AUTH_BASIC%%libexec/apache24/mod_auth_basic.so
-%%MOD_AUTH_DIGEST%%libexec/apache24/mod_auth_digest.so
-%%MOD_AUTH_FORM%%libexec/apache24/mod_auth_form.so
 %%MOD_AUTOINDEX%%libexec/apache24/mod_autoindex.so
 %%MOD_BUCKETEER%%libexec/apache24/mod_bucketeer.so
 %%MOD_BUFFER%%libexec/apache24/mod_buffer.so
@@ -149,10 +150,10 @@ libexec/apache24/httpd.exp
 %%MOD_LBMETHOD_BYTRAFFIC%%libexec/apache24/mod_lbmethod_bytraffic.so
 %%MOD_LBMETHOD_HEARTBEAT%%libexec/apache24/mod_lbmethod_heartbeat.so
 %%MOD_LDAP%%libexec/apache24/mod_ldap.so
-%%MOD_LOGIO%%libexec/apache24/mod_logio.so
 libexec/apache24/mod_log_config.so
 %%MOD_LOG_DEBUG%%libexec/apache24/mod_log_debug.so
 %%MOD_LOG_FORENSIC%%libexec/apache24/mod_log_forensic.so
+%%MOD_LOGIO%%libexec/apache24/mod_logio.so
 %%MOD_LUA%%libexec/apache24/mod_lua.so
 %%MOD_MACRO%%libexec/apache24/mod_macro.so
 %%MOD_MIME%%libexec/apache24/mod_mime.so