Pullup ticket #5059 - requested by taca

www/apache24: security update

Revisions pulled up:
- www/apache24/Makefile                                         1.46
- www/apache24/PLIST                                            1.22
- www/apache24/distinfo                                         1.25

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Jul  5 16:13:53 UTC 2016

   Modified Files:
   	pkgsrc/www/apache24: Makefile PLIST distinfo

   Log Message:
   Update apache24 to 2.4.23.

   (NOTE: Versions 2.4.22 and 2.4.21 were not released.)

   Changes from 2.4.20 are too many to write here, please refer CHANGES file.

   And Apache 2.4.23 fixes CVE-2016-4979; X509 Client certificate based
   authentication can be bypassed when HTTP/2 is used.


   To generate a diff of this commit:
   cvs rdiff -u -r1.45 -r1.46 pkgsrc/www/apache24/Makefile
   cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/apache24/PLIST
   cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/apache24/distinfo

3 files changed, 17 insertions, 8 deletions

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 8250a4d0b2e..fc0bfe51bb3 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.45 2016/04/14 12:38:23 wiz Exp $
+# $NetBSD: Makefile,v 1.45.2.1 2016/07/20 04:59:21 spz Exp $
 #
 # When updating this package, make sure that no strings like
 # "PR 12345" are in the commit message. Upstream likes
 # to reference their own PRs this way, but this ends up
 # in NetBSD GNATS.
 
-DISTNAME=	httpd-2.4.20
+DISTNAME=	httpd-2.4.23
 PKGNAME=	${DISTNAME:S/httpd/apache/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
@@ -48,6 +48,7 @@ BUILDLINK_API_DEPENDS.apr-util+=	apr-util>=1.5.3
 
 CONFIGURE_ARGS+=	--disable-xml2enc
 CONFIGURE_ARGS+=	--disable-proxy-html
+CONFIGURE_ARGS+=	--enable-proxy-fdpass
 
 DFLT_APACHE_MODULES+=	all
 APACHE_MODULES?=	${DFLT_APACHE_MODULES}
diff --git a/www/apache24/PLIST b/www/apache24/PLIST
index bbb9b7a1efd..c546f2a99b7 100644
--- a/www/apache24/PLIST
+++ b/www/apache24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2016/04/14 12:16:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.21.2.1 2016/07/20 04:59:21 spz Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -149,6 +149,7 @@ lib/httpd/mod_proxy_express.so
 lib/httpd/mod_proxy_fcgi.so
 lib/httpd/mod_proxy_fdpass.so
 lib/httpd/mod_proxy_ftp.so
+lib/httpd/mod_proxy_hcheck.so
 lib/httpd/mod_proxy_http.so
 lib/httpd/mod_proxy_scgi.so
 lib/httpd/mod_proxy_wstunnel.so
@@ -580,6 +581,7 @@ share/httpd/manual/expr.html.en
 share/httpd/manual/expr.html.fr
 share/httpd/manual/faq/index.html
 share/httpd/manual/faq/index.html.en
+share/httpd/manual/faq/index.html.es
 share/httpd/manual/faq/index.html.fr
 share/httpd/manual/faq/index.html.tr.utf8
 share/httpd/manual/faq/index.html.zh-cn.utf8
@@ -629,6 +631,8 @@ share/httpd/manual/howto/htaccess.html.fr
 share/httpd/manual/howto/htaccess.html.ja.utf8
 share/httpd/manual/howto/htaccess.html.ko.euc-kr
 share/httpd/manual/howto/htaccess.html.pt-br
+share/httpd/manual/howto/http2.html
+share/httpd/manual/howto/http2.html.en
 share/httpd/manual/howto/index.html
 share/httpd/manual/howto/index.html.en
 share/httpd/manual/howto/index.html.fr
@@ -1109,12 +1113,16 @@ share/httpd/manual/mod/mod_proxy_fdpass.html.fr
 share/httpd/manual/mod/mod_proxy_ftp.html
 share/httpd/manual/mod/mod_proxy_ftp.html.en
 share/httpd/manual/mod/mod_proxy_ftp.html.fr
+share/httpd/manual/mod/mod_proxy_hcheck.html
+share/httpd/manual/mod/mod_proxy_hcheck.html.en
 share/httpd/manual/mod/mod_proxy_html.html
 share/httpd/manual/mod/mod_proxy_html.html.en
 share/httpd/manual/mod/mod_proxy_html.html.fr
 share/httpd/manual/mod/mod_proxy_http.html
 share/httpd/manual/mod/mod_proxy_http.html.en
 share/httpd/manual/mod/mod_proxy_http.html.fr
+share/httpd/manual/mod/mod_proxy_http2.html
+share/httpd/manual/mod/mod_proxy_http2.html.en
 share/httpd/manual/mod/mod_proxy_scgi.html
 share/httpd/manual/mod/mod_proxy_scgi.html.en
 share/httpd/manual/mod/mod_proxy_scgi.html.fr
diff --git a/www/apache24/distinfo b/www/apache24/distinfo
index f2d9ecaf38c..71a9d68ddde 100644
--- a/www/apache24/distinfo
+++ b/www/apache24/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2016/04/14 12:16:10 adam Exp $
+$NetBSD: distinfo,v 1.24.2.1 2016/07/20 04:59:21 spz Exp $
 
-SHA1 (httpd-2.4.20.tar.bz2) = cefe8ea4a3f81c7a08e36c80ebbd792c67ab361b
-RMD160 (httpd-2.4.20.tar.bz2) = 6dc7254363d7de5027604c7604ed6c96b96b1fa4
-SHA512 (httpd-2.4.20.tar.bz2) = 8591e0ca8f1c4755d670f1a8780bb656c62b30635cff1f7d4434f7c5017b99f1b14bbb296da5cdb63cd3bcfa4908b8b5f99a0c036e9e0f0c9514acd2a3cb7e53
-Size (httpd-2.4.20.tar.bz2) = 6331344 bytes
+SHA1 (httpd-2.4.23.tar.bz2) = 5101be34ac4a509b245adb70a56690a84fcc4e7f
+RMD160 (httpd-2.4.23.tar.bz2) = 01a485281ededaaf932c9478ad078879a63254bc
+SHA512 (httpd-2.4.23.tar.bz2) = c520de5be748c0a785ef0dc77102749eb4f47e224968b8d4bed2ae644faa0964623a0e960b64486a0888446790d050b52a6ae34fe61717fab95b37384b4825b1
+Size (httpd-2.4.23.tar.bz2) = 6351875 bytes
 SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839
 SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
 SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d