CVS commit: [pkgsrc-2026Q1] pkgsrc/www/apache24

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Jun  9 22:55:47 UTC 2026

Modified Files:
        pkgsrc/www/apache24 [pkgsrc-2026Q1]: Makefile PLIST distinfo

Log Message:
Pullup ticket #7136 - requested by taca
www/apache24: Security fix

Revisions pulled up:
- www/apache24/Makefile                                         1.145
- www/apache24/PLIST                                            1.40
- www/apache24/distinfo                                         1.72

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Tue Jun  9 01:22:47 UTC 2026

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

   Log Message:
   www/apache24: update to 2.4.68

   Apache 2.4.68 (2026-06-08)

   Changes with Apache 2.4.68

     *) mod_ssl, ab: Add support for OpenSSL 4.0.  [Joe Orton]

     *) mod_ssl: Add SerialNumber as a recognized attribute type for SSL
        distinguished name variables.  [Michael Osipov <michaelo apache.or=
   g>,
        Benjamin Demarteau <benjamin.demarteau liege.be>]

     *) mod_ssl: Set auth type to "ClientCert" when client certificate aut=
   hentication
        has been performed.  [Michael Osipov <michaelo apache.org>]

     *) mod_include: Don't print any of if/elsif/else content when
        a conditional evaluation returns an error. [Eric Covener]

     *) mod_unixd: CoreDumpDirectory requires enabling tracing on FreeBSD =
   11+.
        PR 65819.  [David CARLIER <devnexen gmail.com>]

     *) mod_file_cache: Fix crashes for mmap'ed files under threaded
        MPMs. PR 69901. barr.israel <barr.israel campus.technion.ac.il>

     *) core: Add support for %{m}t in ErrorLogFormat to log milli-second
        time resolution (in addition to existing %{u}t for micro-seconds).=

        [Lubo=A8 Uhliarik <luhliari redhat.com>]

     *) mod_unixd: Drop test that effective user ID is zero in
        a chroot configuration.  PR 69767.
        [Bastien Roucaries <rouca debian.org>]

     *) mod_proxy_balancer: Include nonce in XML output.  PR 63074.
        Federico Mennite <federico.mennite lifeware.ch>

     *) mod_http2: update to version 2.0.42
        Fix excessive file description use for non-TLS frontend connection=
   s when
        sending files. Fixes <https://github.com/icing/mod_h2/issues/325>
        [Stefan Eissing]

     *) mod_http2: update to version 2.0.41
        Fix cookie header accounting against LimitRequestFields.
        [Stefan Eissing]

     *) mod_http2: update to version 2.0.40
        Fix error handling on upload requests when server runs out of file=

        handles that left beam bucket callbacks in place, potentially usin=
   g
        no longer valid references. Only applies on platforms with pipes
        and file descriptor limits not healthy for a network server.
        [Stefan Eissing]

     *) mod_dav_fs: Return a 404 for DELETE if deletion fails because the
        resource no longer exists.  PR 60746.  [Joe Orton]

     *) mod_proxy_hcheck: Fix healthcheck disabled due to child restart wh=
   ile
        updating. [Yann Ylavic]


To generate a diff of this commit:
cvs rdiff -u -r1.142.2.1 -r1.142.2.2 pkgsrc/www/apache24/Makefile
cvs rdiff -u -r1.38.4.1 -r1.38.4.2 pkgsrc/www/apache24/PLIST
cvs rdiff -u -r1.70.4.1 -r1.70.4.2 pkgsrc/www/apache24/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/apache24/Makefile
diff -u pkgsrc/www/apache24/Makefile:1.142.2.1 pkgsrc/www/apache24/Makefile:1.142.2.2
--- pkgsrc/www/apache24/Makefile:1.142.2.1      Thu May  7 22:47:02 2026
+++ pkgsrc/www/apache24/Makefile        Tue Jun  9 22:55:47 2026
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.142.2.1 2026/05/07 22:47:02 maya Exp $
+# $NetBSD: Makefile,v 1.142.2.2 2026/06/09 22:55:47 maya 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.67
+DISTNAME=      httpd-2.4.68
 PKGNAME=       ${DISTNAME:S/httpd/apache/}
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/}

Index: pkgsrc/www/apache24/PLIST
diff -u pkgsrc/www/apache24/PLIST:1.38.4.1 pkgsrc/www/apache24/PLIST:1.38.4.2
--- pkgsrc/www/apache24/PLIST:1.38.4.1  Thu May  7 22:47:02 2026
+++ pkgsrc/www/apache24/PLIST   Tue Jun  9 22:55:47 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38.4.1 2026/05/07 22:47:02 maya Exp $
+@comment $NetBSD: PLIST,v 1.38.4.2 2026/06/09 22:55:47 maya Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -245,6 +245,7 @@ share/httpd/build/special.mk
 share/httpd/error/HTTP_BAD_GATEWAY.html.var
 share/httpd/error/HTTP_BAD_REQUEST.html.var
 share/httpd/error/HTTP_FORBIDDEN.html.var
+share/httpd/error/HTTP_GATEWAY_TIME_OUT.html.var
 share/httpd/error/HTTP_GONE.html.var
 share/httpd/error/HTTP_INTERNAL_SERVER_ERROR.html.var
 share/httpd/error/HTTP_LENGTH_REQUIRED.html.var
@@ -513,6 +514,7 @@ share/httpd/manual/bind.html.en
 share/httpd/manual/bind.html.fr.utf8
 share/httpd/manual/bind.html.ja.utf8
 share/httpd/manual/bind.html.ko.euc-kr
+share/httpd/manual/bind.html.pt-br.utf8
 share/httpd/manual/bind.html.tr.utf8
 share/httpd/manual/caching.html
 share/httpd/manual/caching.html.en
@@ -601,6 +603,7 @@ share/httpd/manual/filter.html.es
 share/httpd/manual/filter.html.fr.utf8
 share/httpd/manual/filter.html.ja.utf8
 share/httpd/manual/filter.html.ko.euc-kr
+share/httpd/manual/filter.html.pt-br.utf8
 share/httpd/manual/filter.html.tr.utf8
 share/httpd/manual/getting-started.html
 share/httpd/manual/getting-started.html.en
@@ -646,6 +649,7 @@ share/httpd/manual/howto/htaccess.html.f
 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/htaccess.html.pt-br.utf8
 share/httpd/manual/howto/http2.html
 share/httpd/manual/howto/http2.html.en
 share/httpd/manual/howto/http2.html.es
@@ -690,24 +694,27 @@ share/httpd/manual/images/favicon.png
 share/httpd/manual/images/feather.gif
 share/httpd/manual/images/feather.png
 share/httpd/manual/images/filter_arch.png
+share/httpd/manual/images/filter_arch.pt-br.png
 share/httpd/manual/images/filter_arch.tr.png
 share/httpd/manual/images/home.gif
 share/httpd/manual/images/index.gif
 share/httpd/manual/images/left.gif
 share/httpd/manual/images/mod_filter_new.gif
 share/httpd/manual/images/mod_filter_new.png
+share/httpd/manual/images/mod_filter_new.pt-br.png
 share/httpd/manual/images/mod_filter_new.tr.png
 share/httpd/manual/images/mod_filter_old.gif
 share/httpd/manual/images/mod_filter_old.png
-share/httpd/manual/images/mod_rewrite_fig1.gif
 share/httpd/manual/images/mod_rewrite_fig1.png
-share/httpd/manual/images/mod_rewrite_fig2.gif
+share/httpd/manual/images/mod_rewrite_fig1.svg
 share/httpd/manual/images/mod_rewrite_fig2.png
+share/httpd/manual/images/mod_rewrite_fig2.svg
 share/httpd/manual/images/pixel.gif
 share/httpd/manual/images/reverse-proxy-arch.png
 share/httpd/manual/images/rewrite_backreferences.png
+share/httpd/manual/images/rewrite_backreferences.svg
 share/httpd/manual/images/rewrite_process_uri.png
-share/httpd/manual/images/rewrite_rule_flow.png
+share/httpd/manual/images/rewrite_process_uri.svg
 share/httpd/manual/images/right.gif
 share/httpd/manual/images/ssl_intro_fig1.gif
 share/httpd/manual/images/ssl_intro_fig1.png
@@ -717,7 +724,9 @@ share/httpd/manual/images/ssl_intro_fig3
 share/httpd/manual/images/ssl_intro_fig3.png
 share/httpd/manual/images/sub.gif
 share/httpd/manual/images/syntax_rewritecond.png
+share/httpd/manual/images/syntax_rewritecond.svg
 share/httpd/manual/images/syntax_rewriterule.png
+share/httpd/manual/images/syntax_rewriterule.svg
 share/httpd/manual/images/up.gif
 share/httpd/manual/index.html
 share/httpd/manual/index.html.da
@@ -728,6 +737,7 @@ share/httpd/manual/index.html.fr.utf8
 share/httpd/manual/index.html.ja.utf8
 share/httpd/manual/index.html.ko.euc-kr
 share/httpd/manual/index.html.pt-br
+share/httpd/manual/index.html.pt-br.utf8
 share/httpd/manual/index.html.ru.utf8
 share/httpd/manual/index.html.tr.utf8
 share/httpd/manual/index.html.zh-cn.utf8
@@ -738,6 +748,7 @@ share/httpd/manual/install.html.es
 share/httpd/manual/install.html.fr.utf8
 share/httpd/manual/install.html.ja.utf8
 share/httpd/manual/install.html.ko.euc-kr
+share/httpd/manual/install.html.pt-br.utf8
 share/httpd/manual/install.html.tr.utf8
 share/httpd/manual/invoking.html
 share/httpd/manual/invoking.html.de
@@ -746,6 +757,7 @@ share/httpd/manual/invoking.html.es
 share/httpd/manual/invoking.html.fr.utf8
 share/httpd/manual/invoking.html.ja.utf8
 share/httpd/manual/invoking.html.ko.euc-kr
+share/httpd/manual/invoking.html.pt-br.utf8
 share/httpd/manual/invoking.html.tr.utf8
 share/httpd/manual/license.html
 share/httpd/manual/license.html.en
@@ -1356,16 +1368,19 @@ share/httpd/manual/new_features_2_0.html
 share/httpd/manual/new_features_2_0.html.ja.utf8
 share/httpd/manual/new_features_2_0.html.ko.euc-kr
 share/httpd/manual/new_features_2_0.html.pt-br
+share/httpd/manual/new_features_2_0.html.pt-br.utf8
 share/httpd/manual/new_features_2_0.html.tr.utf8
 share/httpd/manual/new_features_2_2.html
 share/httpd/manual/new_features_2_2.html.en
 share/httpd/manual/new_features_2_2.html.fr.utf8
 share/httpd/manual/new_features_2_2.html.ko.euc-kr
 share/httpd/manual/new_features_2_2.html.pt-br
+share/httpd/manual/new_features_2_2.html.pt-br.utf8
 share/httpd/manual/new_features_2_2.html.tr.utf8
 share/httpd/manual/new_features_2_4.html
 share/httpd/manual/new_features_2_4.html.en
 share/httpd/manual/new_features_2_4.html.fr.utf8
+share/httpd/manual/new_features_2_4.html.pt-br.utf8
 share/httpd/manual/new_features_2_4.html.tr.utf8
 share/httpd/manual/platform/ebcdic.html
 share/httpd/manual/platform/ebcdic.html.en
@@ -1597,6 +1612,7 @@ share/httpd/manual/suexec.html.tr.utf8
 share/httpd/manual/upgrading.html
 share/httpd/manual/upgrading.html.en
 share/httpd/manual/upgrading.html.fr.utf8
+share/httpd/manual/upgrading.html.pt-br.utf8
 share/httpd/manual/urlmapping.html
 share/httpd/manual/urlmapping.html.en
 share/httpd/manual/urlmapping.html.fr.utf8

Index: pkgsrc/www/apache24/distinfo
diff -u pkgsrc/www/apache24/distinfo:1.70.4.1 pkgsrc/www/apache24/distinfo:1.70.4.2
--- pkgsrc/www/apache24/distinfo:1.70.4.1       Thu May  7 22:47:02 2026
+++ pkgsrc/www/apache24/distinfo        Tue Jun  9 22:55:47 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.70.4.1 2026/05/07 22:47:02 maya Exp $
+$NetBSD: distinfo,v 1.70.4.2 2026/06/09 22:55:47 maya Exp $
 
-BLAKE2s (httpd-2.4.67.tar.bz2) = f7ba66aa40f0c8b494cf526293041219a048ee43be6c8ba42e31fbce2eefd93f
-SHA512 (httpd-2.4.67.tar.bz2) = 5ae29fc8edb253453271613cb18754de0d943d1f82361059c81f8ebe1f057b894675506550bd1341bfa9416226b569a7bac08f497c53e8bb6dede87f4f41eae4
-Size (httpd-2.4.67.tar.bz2) = 7493067 bytes
+BLAKE2s (httpd-2.4.68.tar.bz2) = 6dbab3f7e0fab298ec99450bad0bdc08ee35b814e122485d5e482cc920e96520
+SHA512 (httpd-2.4.68.tar.bz2) = 134a5bbd3ffe97523ac750490531bcb9441c532cedf0229aa006aa1368e9d25040507c6f519bed6754044f62c371f7c7f9a11b6a311f79b9680d478bf4373eb3
+Size (httpd-2.4.68.tar.bz2) = 7738512 bytes
 SHA1 (patch-aa) = 9a66685f1d2e4710ab464beda98cbaad632aebf9
 SHA1 (patch-ad) = dd4dbffaa8d784bbbf37b85e17977ff0c73e9074
 SHA1 (patch-ae) = 0a54d96ca77394b1ca725df76819caa95c381f39