Fri Apr 7 09:38:53 2023 UTC ()
apache24: updated to 2.4.57

Changes with Apache 2.4.57

*) mod_proxy: Check before forwarding that a nocanon path has not been
   rewritten with spaces during processing.

*) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
   double encode encoded slashes in the URL sent by the reverse proxy to the
   backend.

*) mod_http2: fixed a crash during connection termination.

*) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
   in a question mark.

*) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
   characters on redirections without the "NE" flag.

*) mod_proxy: Fix double encoding of the uri-path of the request forwarded
   to the origin server, when using mapping=encoded|servlet.

*) mod_mime: Do not match the extention against possible query string
   parameters in case ProxyPass was used with the nocanon option.


(adam)
diff -r1.116 -r1.117 pkgsrc/www/apache24/Makefile
diff -r1.55 -r1.56 pkgsrc/www/apache24/distinfo
cvs diff -r1.116 -r1.117 pkgsrc/www/apache24/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache24/Makefile 2023/03/08 08:52:02 1.116
+++ pkgsrc/www/apache24/Makefile 2023/04/07 09:38:52 1.117
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.116 2023/03/08 08:52:02 adam Exp $ 1# $NetBSD: Makefile,v 1.117 2023/04/07 09:38:52 adam 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.56 8DISTNAME= httpd-2.4.57
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/}
12EXTRACT_SUFX= .tar.bz2 12EXTRACT_SUFX= .tar.bz2
13 13
14MAINTAINER= ryoon@NetBSD.org 14MAINTAINER= ryoon@NetBSD.org
15HOMEPAGE= https://httpd.apache.org/ 15HOMEPAGE= https://httpd.apache.org/
16COMMENT= Apache HTTP (Web) server, version 2.4 16COMMENT= Apache HTTP (Web) server, version 2.4
17LICENSE= apache-2.0 17LICENSE= apache-2.0
18 18
19BUILD_DEFS+= IPV6_READY 19BUILD_DEFS+= IPV6_READY
20BUILD_DEFS+= VARBASE 20BUILD_DEFS+= VARBASE
21 21
@@ -24,27 +24,27 @@ USE_TOOLS+= pax perl pkg-config @@ -24,27 +24,27 @@ USE_TOOLS+= pax perl pkg-config
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25CONFIGURE_ARGS+= --enable-layout=NetBSD 25CONFIGURE_ARGS+= --enable-layout=NetBSD
26CONFIGURE_ARGS+= --enable-mods-shared=all 26CONFIGURE_ARGS+= --enable-mods-shared=all
27CONFIGURE_ARGS+= --enable-so 27CONFIGURE_ARGS+= --enable-so
28CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} 28CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}
29CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util} 29CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util}
30CONFIGURE_ARGS+= --with-port=80 30CONFIGURE_ARGS+= --with-port=80
31CONFIGURE_ENV+= perlbin=${PERL5:Q} 31CONFIGURE_ENV+= perlbin=${PERL5:Q}
32CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent 32CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent
33 33
34.include "../../mk/compiler.mk" 34.include "../../mk/compiler.mk"
35 35
36CFLAGS.SunOS+= -D__EXTENSIONS__ 36CFLAGS.SunOS+= -D__EXTENSIONS__
37.if !empty(CC_VERSION:Mgcc-[5-9]*) || !empty(CC_VERSION:Mgcc-1[0-9].*) || !empty(PKGSRC_COMPILER:Mclang) 37.if ${CC_VERSION:Mgcc-[5-9]*} || ${CC_VERSION:Mgcc-1[0-9].*} || !empty(PKGSRC_COMPILER:Mclang)
38CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 38CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
39.else 39.else
40CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 40CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1
41.endif 41.endif
42 42
43BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0 43BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0
44.include "../../devel/apr/buildlink3.mk" 44.include "../../devel/apr/buildlink3.mk"
45BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3 45BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3
46.include "../../devel/apr-util/buildlink3.mk" 46.include "../../devel/apr-util/buildlink3.mk"
47.include "../../devel/pcre2/buildlink3.mk" 47.include "../../devel/pcre2/buildlink3.mk"
48.include "../../security/openssl/buildlink3.mk" 48.include "../../security/openssl/buildlink3.mk"
49.include "../../textproc/expat/buildlink3.mk" 49.include "../../textproc/expat/buildlink3.mk"
50.include "../../mk/dlopen.buildlink3.mk" 50.include "../../mk/dlopen.buildlink3.mk"
cvs diff -r1.55 -r1.56 pkgsrc/www/apache24/distinfo (expand / switch to unified diff)

--- pkgsrc/www/apache24/distinfo 2023/03/08 08:52:02 1.55
+++ pkgsrc/www/apache24/distinfo 2023/04/07 09:38:52 1.56
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.55 2023/03/08 08:52:02 adam Exp $ 1$NetBSD: distinfo,v 1.56 2023/04/07 09:38:52 adam Exp $
2 2
3BLAKE2s (httpd-2.4.56.tar.bz2) = 01467c03e62c69f119a46332f77b866a311ee51b5c11c476041b31e082515feb 3BLAKE2s (httpd-2.4.57.tar.bz2) = 195ade9907cdaf79c799fbfef03f23c2344e924a1c07b93f0710c513161c5400
4SHA512 (httpd-2.4.56.tar.bz2) = 5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b2389264387971268145cccc6a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12 4SHA512 (httpd-2.4.57.tar.bz2) = 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
5Size (httpd-2.4.56.tar.bz2) = 7456418 bytes 5Size (httpd-2.4.57.tar.bz2) = 7457022 bytes
6SHA1 (patch-aa) = 9a66685f1d2e4710ab464beda98cbaad632aebf9 6SHA1 (patch-aa) = 9a66685f1d2e4710ab464beda98cbaad632aebf9
7SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324 7SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
8SHA1 (patch-ad) = 4ba4a9c812951f533fa316e5dbf17eaab5494157 8SHA1 (patch-ad) = 4ba4a9c812951f533fa316e5dbf17eaab5494157
9SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903 9SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903
10SHA1 (patch-ag) = 50c7f0fab1cb90ac573f1c47f2d37f9c2a6247e1 10SHA1 (patch-ag) = 50c7f0fab1cb90ac573f1c47f2d37f9c2a6247e1
11SHA1 (patch-ai) = d3870e46e41adc97c3fce86f9ffd224502ad6b0c 11SHA1 (patch-ai) = d3870e46e41adc97c3fce86f9ffd224502ad6b0c
12SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911 12SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911
13SHA1 (patch-am) = acdf7198ae8b4353cfc70c8015a0f09de036b777 13SHA1 (patch-am) = acdf7198ae8b4353cfc70c8015a0f09de036b777
14SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df 14SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df
15SHA1 (patch-configure) = 050119b817b53d72909be1906181434bf18fe3d7 15SHA1 (patch-configure) = 050119b817b53d72909be1906181434bf18fe3d7
16SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96 16SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96
17SHA1 (patch-modules_filters_mod_substitute.c) = 730af0342b78de04fe51b7dcc3ed057b2b0c3a54 17SHA1 (patch-modules_filters_mod_substitute.c) = 730af0342b78de04fe51b7dcc3ed057b2b0c3a54