Tue Jul 5 16:13:53 2016 UTC ()
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.


(taca)
diff -r1.45 -r1.46 pkgsrc/www/apache24/Makefile
diff -r1.21 -r1.22 pkgsrc/www/apache24/PLIST
diff -r1.24 -r1.25 pkgsrc/www/apache24/distinfo
cvs diff -r1.45 -r1.46 pkgsrc/www/apache24/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache24/Makefile 2016/04/14 12:38:23 1.45
+++ pkgsrc/www/apache24/Makefile 2016/07/05 16:13:53 1.46
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.45 2016/04/14 12:38:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.46 2016/07/05 16:13:53 taca Exp $
2# 2#
3# When updating this package, make sure that no strings like 3# When updating this package, make sure that no strings like
4# "PR 12345" are in the commit message. Upstream likes 4# "PR 12345" are in the commit message. Upstream likes
5# to reference their own PRs this way, but this ends up 5# to reference their own PRs this way, but this ends up
6# in NetBSD GNATS. 6# in NetBSD GNATS.
7 7
8DISTNAME= httpd-2.4.20 8DISTNAME= httpd-2.4.23
9PKGNAME= ${DISTNAME:S/httpd/apache/} 9PKGNAME= ${DISTNAME:S/httpd/apache/}
10CATEGORIES= www 10CATEGORIES= www
11MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ 11MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
12 http://archive.apache.org/dist/httpd/ \ 12 http://archive.apache.org/dist/httpd/ \
13 http://archive.eu.apache.org/dist/httpd/ 13 http://archive.eu.apache.org/dist/httpd/
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= ryoon@NetBSD.org 16MAINTAINER= ryoon@NetBSD.org
17HOMEPAGE= http://httpd.apache.org/ 17HOMEPAGE= http://httpd.apache.org/
18COMMENT= Apache HTTP (Web) server, version 2.4 18COMMENT= Apache HTTP (Web) server, version 2.4
19LICENSE= apache-2.0 19LICENSE= apache-2.0
20 20
21BUILD_DEFS+= IPV6_READY 21BUILD_DEFS+= IPV6_READY
@@ -38,26 +38,27 @@ CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_ @@ -38,26 +38,27 @@ CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_
38.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
39BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0 39BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0
40.include "../../devel/apr/buildlink3.mk" 40.include "../../devel/apr/buildlink3.mk"
41BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3 41BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3
42.include "../../devel/apr-util/buildlink3.mk" 42.include "../../devel/apr-util/buildlink3.mk"
43.include "../../devel/pcre/buildlink3.mk" 43.include "../../devel/pcre/buildlink3.mk"
44.include "../../security/openssl/buildlink3.mk" 44.include "../../security/openssl/buildlink3.mk"
45.include "../../textproc/expat/buildlink3.mk" 45.include "../../textproc/expat/buildlink3.mk"
46.include "../../mk/dlopen.buildlink3.mk" 46.include "../../mk/dlopen.buildlink3.mk"
47.include "../../mk/pthread.buildlink3.mk" 47.include "../../mk/pthread.buildlink3.mk"
48 48
49CONFIGURE_ARGS+= --disable-xml2enc 49CONFIGURE_ARGS+= --disable-xml2enc
50CONFIGURE_ARGS+= --disable-proxy-html 50CONFIGURE_ARGS+= --disable-proxy-html
 51CONFIGURE_ARGS+= --enable-proxy-fdpass
51 52
52DFLT_APACHE_MODULES+= all 53DFLT_APACHE_MODULES+= all
53APACHE_MODULES?= ${DFLT_APACHE_MODULES} 54APACHE_MODULES?= ${DFLT_APACHE_MODULES}
54 55
55.include "options.mk" 56.include "options.mk"
56 57
57# LDAP support 58# LDAP support
58PLIST_VARS+= ldap 59PLIST_VARS+= ldap
59.if exists(${LOCALBASE}/lib/apr-util-1/apr_ldap.la) 60.if exists(${LOCALBASE}/lib/apr-util-1/apr_ldap.la)
60DFLT_APACHE_MODULES+= ldap authnz_ldap 61DFLT_APACHE_MODULES+= ldap authnz_ldap
61PLIST.ldap= yes 62PLIST.ldap= yes
62.endif 63.endif
63 64
cvs diff -r1.21 -r1.22 pkgsrc/www/apache24/PLIST (expand / switch to unified diff)

--- pkgsrc/www/apache24/PLIST 2016/04/14 12:16:10 1.21
+++ pkgsrc/www/apache24/PLIST 2016/07/05 16:13:53 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.21 2016/04/14 12:16:10 adam Exp $ 1@comment $NetBSD: PLIST,v 1.22 2016/07/05 16:13:53 taca Exp $
2bin/ab 2bin/ab
3bin/apxs 3bin/apxs
4bin/dbmmanage 4bin/dbmmanage
5bin/htdbm 5bin/htdbm
6bin/htdigest 6bin/htdigest
7bin/htpasswd 7bin/htpasswd
8bin/httxt2dbm 8bin/httxt2dbm
9bin/logresolve 9bin/logresolve
10bin/mkcert 10bin/mkcert
11include/httpd/ap_compat.h 11include/httpd/ap_compat.h
12include/httpd/ap_config.h 12include/httpd/ap_config.h
13include/httpd/ap_config_auto.h 13include/httpd/ap_config_auto.h
14include/httpd/ap_config_layout.h 14include/httpd/ap_config_layout.h
@@ -139,26 +139,27 @@ lib/httpd/mod_mime_magic.so @@ -139,26 +139,27 @@ lib/httpd/mod_mime_magic.so
139${PLIST.event}lib/httpd/mod_mpm_event.so 139${PLIST.event}lib/httpd/mod_mpm_event.so
140${PLIST.prefork}lib/httpd/mod_mpm_prefork.so 140${PLIST.prefork}lib/httpd/mod_mpm_prefork.so
141${PLIST.worker}lib/httpd/mod_mpm_worker.so 141${PLIST.worker}lib/httpd/mod_mpm_worker.so
142lib/httpd/mod_negotiation.so 142lib/httpd/mod_negotiation.so
143${PLIST.privileges}lib/httpd/mod_privileges.so 143${PLIST.privileges}lib/httpd/mod_privileges.so
144lib/httpd/mod_proxy.so 144lib/httpd/mod_proxy.so
145lib/httpd/mod_proxy_ajp.so 145lib/httpd/mod_proxy_ajp.so
146lib/httpd/mod_proxy_balancer.so 146lib/httpd/mod_proxy_balancer.so
147lib/httpd/mod_proxy_connect.so 147lib/httpd/mod_proxy_connect.so
148lib/httpd/mod_proxy_express.so 148lib/httpd/mod_proxy_express.so
149lib/httpd/mod_proxy_fcgi.so 149lib/httpd/mod_proxy_fcgi.so
150lib/httpd/mod_proxy_fdpass.so 150lib/httpd/mod_proxy_fdpass.so
151lib/httpd/mod_proxy_ftp.so 151lib/httpd/mod_proxy_ftp.so
 152lib/httpd/mod_proxy_hcheck.so
152lib/httpd/mod_proxy_http.so 153lib/httpd/mod_proxy_http.so
153lib/httpd/mod_proxy_scgi.so 154lib/httpd/mod_proxy_scgi.so
154lib/httpd/mod_proxy_wstunnel.so 155lib/httpd/mod_proxy_wstunnel.so
155lib/httpd/mod_ratelimit.so 156lib/httpd/mod_ratelimit.so
156lib/httpd/mod_reflector.so 157lib/httpd/mod_reflector.so
157lib/httpd/mod_remoteip.so 158lib/httpd/mod_remoteip.so
158lib/httpd/mod_reqtimeout.so 159lib/httpd/mod_reqtimeout.so
159lib/httpd/mod_request.so 160lib/httpd/mod_request.so
160lib/httpd/mod_rewrite.so 161lib/httpd/mod_rewrite.so
161lib/httpd/mod_sed.so 162lib/httpd/mod_sed.so
162lib/httpd/mod_session.so 163lib/httpd/mod_session.so
163lib/httpd/mod_session_cookie.so 164lib/httpd/mod_session_cookie.so
164${PLIST.ssl}lib/httpd/mod_session_crypto.so 165${PLIST.ssl}lib/httpd/mod_session_crypto.so
@@ -570,26 +571,27 @@ share/httpd/manual/dso.html.ja.utf8 @@ -570,26 +571,27 @@ share/httpd/manual/dso.html.ja.utf8
570share/httpd/manual/dso.html.ko.euc-kr 571share/httpd/manual/dso.html.ko.euc-kr
571share/httpd/manual/dso.html.tr.utf8 572share/httpd/manual/dso.html.tr.utf8
572share/httpd/manual/env.html 573share/httpd/manual/env.html
573share/httpd/manual/env.html.en 574share/httpd/manual/env.html.en
574share/httpd/manual/env.html.fr 575share/httpd/manual/env.html.fr
575share/httpd/manual/env.html.ja.utf8 576share/httpd/manual/env.html.ja.utf8
576share/httpd/manual/env.html.ko.euc-kr 577share/httpd/manual/env.html.ko.euc-kr
577share/httpd/manual/env.html.tr.utf8 578share/httpd/manual/env.html.tr.utf8
578share/httpd/manual/expr.html 579share/httpd/manual/expr.html
579share/httpd/manual/expr.html.en 580share/httpd/manual/expr.html.en
580share/httpd/manual/expr.html.fr 581share/httpd/manual/expr.html.fr
581share/httpd/manual/faq/index.html 582share/httpd/manual/faq/index.html
582share/httpd/manual/faq/index.html.en 583share/httpd/manual/faq/index.html.en
 584share/httpd/manual/faq/index.html.es
583share/httpd/manual/faq/index.html.fr 585share/httpd/manual/faq/index.html.fr
584share/httpd/manual/faq/index.html.tr.utf8 586share/httpd/manual/faq/index.html.tr.utf8
585share/httpd/manual/faq/index.html.zh-cn.utf8 587share/httpd/manual/faq/index.html.zh-cn.utf8
586share/httpd/manual/filter.html 588share/httpd/manual/filter.html
587share/httpd/manual/filter.html.en 589share/httpd/manual/filter.html.en
588share/httpd/manual/filter.html.es 590share/httpd/manual/filter.html.es
589share/httpd/manual/filter.html.fr 591share/httpd/manual/filter.html.fr
590share/httpd/manual/filter.html.ja.utf8 592share/httpd/manual/filter.html.ja.utf8
591share/httpd/manual/filter.html.ko.euc-kr 593share/httpd/manual/filter.html.ko.euc-kr
592share/httpd/manual/filter.html.tr.utf8 594share/httpd/manual/filter.html.tr.utf8
593share/httpd/manual/getting-started.html 595share/httpd/manual/getting-started.html
594share/httpd/manual/getting-started.html.en 596share/httpd/manual/getting-started.html.en
595share/httpd/manual/getting-started.html.fr 597share/httpd/manual/getting-started.html.fr
@@ -619,26 +621,28 @@ share/httpd/manual/howto/auth.html.ja.ut @@ -619,26 +621,28 @@ share/httpd/manual/howto/auth.html.ja.ut
619share/httpd/manual/howto/auth.html.ko.euc-kr 621share/httpd/manual/howto/auth.html.ko.euc-kr
620share/httpd/manual/howto/auth.html.tr.utf8 622share/httpd/manual/howto/auth.html.tr.utf8
621share/httpd/manual/howto/cgi.html 623share/httpd/manual/howto/cgi.html
622share/httpd/manual/howto/cgi.html.en 624share/httpd/manual/howto/cgi.html.en
623share/httpd/manual/howto/cgi.html.fr 625share/httpd/manual/howto/cgi.html.fr
624share/httpd/manual/howto/cgi.html.ja.utf8 626share/httpd/manual/howto/cgi.html.ja.utf8
625share/httpd/manual/howto/cgi.html.ko.euc-kr 627share/httpd/manual/howto/cgi.html.ko.euc-kr
626share/httpd/manual/howto/htaccess.html 628share/httpd/manual/howto/htaccess.html
627share/httpd/manual/howto/htaccess.html.en 629share/httpd/manual/howto/htaccess.html.en
628share/httpd/manual/howto/htaccess.html.fr 630share/httpd/manual/howto/htaccess.html.fr
629share/httpd/manual/howto/htaccess.html.ja.utf8 631share/httpd/manual/howto/htaccess.html.ja.utf8
630share/httpd/manual/howto/htaccess.html.ko.euc-kr 632share/httpd/manual/howto/htaccess.html.ko.euc-kr
631share/httpd/manual/howto/htaccess.html.pt-br 633share/httpd/manual/howto/htaccess.html.pt-br
 634share/httpd/manual/howto/http2.html
 635share/httpd/manual/howto/http2.html.en
632share/httpd/manual/howto/index.html 636share/httpd/manual/howto/index.html
633share/httpd/manual/howto/index.html.en 637share/httpd/manual/howto/index.html.en
634share/httpd/manual/howto/index.html.fr 638share/httpd/manual/howto/index.html.fr
635share/httpd/manual/howto/index.html.ja.utf8 639share/httpd/manual/howto/index.html.ja.utf8
636share/httpd/manual/howto/index.html.ko.euc-kr 640share/httpd/manual/howto/index.html.ko.euc-kr
637share/httpd/manual/howto/index.html.zh-cn.utf8 641share/httpd/manual/howto/index.html.zh-cn.utf8
638share/httpd/manual/howto/public_html.html 642share/httpd/manual/howto/public_html.html
639share/httpd/manual/howto/public_html.html.en 643share/httpd/manual/howto/public_html.html.en
640share/httpd/manual/howto/public_html.html.fr 644share/httpd/manual/howto/public_html.html.fr
641share/httpd/manual/howto/public_html.html.ja.utf8 645share/httpd/manual/howto/public_html.html.ja.utf8
642share/httpd/manual/howto/public_html.html.ko.euc-kr 646share/httpd/manual/howto/public_html.html.ko.euc-kr
643share/httpd/manual/howto/public_html.html.tr.utf8 647share/httpd/manual/howto/public_html.html.tr.utf8
644share/httpd/manual/howto/reverse_proxy.html 648share/httpd/manual/howto/reverse_proxy.html
@@ -1099,32 +1103,36 @@ share/httpd/manual/mod/mod_proxy_connect @@ -1099,32 +1103,36 @@ share/httpd/manual/mod/mod_proxy_connect
1099share/httpd/manual/mod/mod_proxy_connect.html.ja.utf8 1103share/httpd/manual/mod/mod_proxy_connect.html.ja.utf8
1100share/httpd/manual/mod/mod_proxy_express.html 1104share/httpd/manual/mod/mod_proxy_express.html
1101share/httpd/manual/mod/mod_proxy_express.html.en 1105share/httpd/manual/mod/mod_proxy_express.html.en
1102share/httpd/manual/mod/mod_proxy_express.html.fr 1106share/httpd/manual/mod/mod_proxy_express.html.fr
1103share/httpd/manual/mod/mod_proxy_fcgi.html 1107share/httpd/manual/mod/mod_proxy_fcgi.html
1104share/httpd/manual/mod/mod_proxy_fcgi.html.en 1108share/httpd/manual/mod/mod_proxy_fcgi.html.en
1105share/httpd/manual/mod/mod_proxy_fcgi.html.fr 1109share/httpd/manual/mod/mod_proxy_fcgi.html.fr
1106share/httpd/manual/mod/mod_proxy_fdpass.html 1110share/httpd/manual/mod/mod_proxy_fdpass.html
1107share/httpd/manual/mod/mod_proxy_fdpass.html.en 1111share/httpd/manual/mod/mod_proxy_fdpass.html.en
1108share/httpd/manual/mod/mod_proxy_fdpass.html.fr 1112share/httpd/manual/mod/mod_proxy_fdpass.html.fr
1109share/httpd/manual/mod/mod_proxy_ftp.html 1113share/httpd/manual/mod/mod_proxy_ftp.html
1110share/httpd/manual/mod/mod_proxy_ftp.html.en 1114share/httpd/manual/mod/mod_proxy_ftp.html.en
1111share/httpd/manual/mod/mod_proxy_ftp.html.fr 1115share/httpd/manual/mod/mod_proxy_ftp.html.fr
 1116share/httpd/manual/mod/mod_proxy_hcheck.html
 1117share/httpd/manual/mod/mod_proxy_hcheck.html.en
1112share/httpd/manual/mod/mod_proxy_html.html 1118share/httpd/manual/mod/mod_proxy_html.html
1113share/httpd/manual/mod/mod_proxy_html.html.en 1119share/httpd/manual/mod/mod_proxy_html.html.en
1114share/httpd/manual/mod/mod_proxy_html.html.fr 1120share/httpd/manual/mod/mod_proxy_html.html.fr
1115share/httpd/manual/mod/mod_proxy_http.html 1121share/httpd/manual/mod/mod_proxy_http.html
1116share/httpd/manual/mod/mod_proxy_http.html.en 1122share/httpd/manual/mod/mod_proxy_http.html.en
1117share/httpd/manual/mod/mod_proxy_http.html.fr 1123share/httpd/manual/mod/mod_proxy_http.html.fr
 1124share/httpd/manual/mod/mod_proxy_http2.html
 1125share/httpd/manual/mod/mod_proxy_http2.html.en
1118share/httpd/manual/mod/mod_proxy_scgi.html 1126share/httpd/manual/mod/mod_proxy_scgi.html
1119share/httpd/manual/mod/mod_proxy_scgi.html.en 1127share/httpd/manual/mod/mod_proxy_scgi.html.en
1120share/httpd/manual/mod/mod_proxy_scgi.html.fr 1128share/httpd/manual/mod/mod_proxy_scgi.html.fr
1121share/httpd/manual/mod/mod_proxy_wstunnel.html 1129share/httpd/manual/mod/mod_proxy_wstunnel.html
1122share/httpd/manual/mod/mod_proxy_wstunnel.html.en 1130share/httpd/manual/mod/mod_proxy_wstunnel.html.en
1123share/httpd/manual/mod/mod_ratelimit.html 1131share/httpd/manual/mod/mod_ratelimit.html
1124share/httpd/manual/mod/mod_ratelimit.html.en 1132share/httpd/manual/mod/mod_ratelimit.html.en
1125share/httpd/manual/mod/mod_ratelimit.html.fr 1133share/httpd/manual/mod/mod_ratelimit.html.fr
1126share/httpd/manual/mod/mod_reflector.html 1134share/httpd/manual/mod/mod_reflector.html
1127share/httpd/manual/mod/mod_reflector.html.en 1135share/httpd/manual/mod/mod_reflector.html.en
1128share/httpd/manual/mod/mod_reflector.html.fr 1136share/httpd/manual/mod/mod_reflector.html.fr
1129share/httpd/manual/mod/mod_remoteip.html 1137share/httpd/manual/mod/mod_remoteip.html
1130share/httpd/manual/mod/mod_remoteip.html.en 1138share/httpd/manual/mod/mod_remoteip.html.en
cvs diff -r1.24 -r1.25 pkgsrc/www/apache24/distinfo (expand / switch to unified diff)

--- pkgsrc/www/apache24/distinfo 2016/04/14 12:16:10 1.24
+++ pkgsrc/www/apache24/distinfo 2016/07/05 16:13:53 1.25
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.24 2016/04/14 12:16:10 adam Exp $ 1$NetBSD: distinfo,v 1.25 2016/07/05 16:13:53 taca Exp $
2 2
3SHA1 (httpd-2.4.20.tar.bz2) = cefe8ea4a3f81c7a08e36c80ebbd792c67ab361b 3SHA1 (httpd-2.4.23.tar.bz2) = 5101be34ac4a509b245adb70a56690a84fcc4e7f
4RMD160 (httpd-2.4.20.tar.bz2) = 6dc7254363d7de5027604c7604ed6c96b96b1fa4 4RMD160 (httpd-2.4.23.tar.bz2) = 01a485281ededaaf932c9478ad078879a63254bc
5SHA512 (httpd-2.4.20.tar.bz2) = 8591e0ca8f1c4755d670f1a8780bb656c62b30635cff1f7d4434f7c5017b99f1b14bbb296da5cdb63cd3bcfa4908b8b5f99a0c036e9e0f0c9514acd2a3cb7e53 5SHA512 (httpd-2.4.23.tar.bz2) = c520de5be748c0a785ef0dc77102749eb4f47e224968b8d4bed2ae644faa0964623a0e960b64486a0888446790d050b52a6ae34fe61717fab95b37384b4825b1
6Size (httpd-2.4.20.tar.bz2) = 6331344 bytes 6Size (httpd-2.4.23.tar.bz2) = 6351875 bytes
7SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839 7SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839
8SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324 8SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
9SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d 9SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d
10SHA1 (patch-ad) = 4ba4a9c812951f533fa316e5dbf17eaab5494157 10SHA1 (patch-ad) = 4ba4a9c812951f533fa316e5dbf17eaab5494157
11SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903 11SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903
12SHA1 (patch-ag) = 50c7f0fab1cb90ac573f1c47f2d37f9c2a6247e1 12SHA1 (patch-ag) = 50c7f0fab1cb90ac573f1c47f2d37f9c2a6247e1
13SHA1 (patch-ai) = 867ac81fd14b1bd6af048ec57390d915956e9568 13SHA1 (patch-ai) = 867ac81fd14b1bd6af048ec57390d915956e9568
14SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911 14SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911
15SHA1 (patch-am) = acdf7198ae8b4353cfc70c8015a0f09de036b777 15SHA1 (patch-am) = acdf7198ae8b4353cfc70c8015a0f09de036b777
16SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df 16SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df
17SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96 17SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96