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

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Oct  3 19:45:40 UTC 2026

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

Log Message:
Pullup ticket #7264 - requested by taca
www/apache24: security fix

Revisions pulled up:
- www/apache24/Makefile                                         1.149
- www/apache24/PLIST                                            1.41
- www/apache24/distinfo                                         1.73

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Oct  2 00:54:11 UTC 2026

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

   Log Message:
   www/apache24: update to 2.4.69

   Apache 2.4.69 (2026-10-01)

     *) Fix the tar icon in the documentation so that its background is
        transparent.  #70238.  [Jeffery To <jeffery.to gmail.com>]

     *) mod_ssl: Fix OpenSSL compatibility macros for X509_get0_notBefore,
        X509_get0_notAfter, and X509_get0_serialNumber with OpenSSL < 1.1.
        #70205.  [Craig Lorentzen <crlorent amazon.com>]

     *) mod_cgid, mod_ssl, mod_md: Various hardening fixes.  [Various authors]

     *) mod_md: MDServerStatus is now disabled by default.  [Joe Orton]

     *) mod_auth_digest: Fix compatibility with expression-based AuthName.
        #59039.  [Eric Covener]

     *) mod_auth_digest.c: Drop RFC 2069 support; rewrite shared memory
        handling and client nonce handling; "authdigest-opaque" mutex is
        now longer needed.  [Joe Orton]

     *) mod_lbmethod_heartbeat: Use safe integer parsing with range
        validation, replacing atoi().  [Sayed Kaif <metsw24 gmail.com>]

     *) core: Reject control characters in the reason phrase of interim
        responses.  Only accept space as status-code separator.  [Joe Orton]

     *) mod_substitute: Fix SubstituteMaxLineLength to reject values too
        large for the K/M/G suffix.  [Joe Orton]

     *) mod_substitute: Fix crash or misbehaviour when loading a Substitute
        directive with a missing closing delimiter.  [Joe Orton]

     *) mod_dir: Fix a crash in fixup_dir for a request not mapped to any type.
        #68527.  [Eric Covener]

     *) mod_http2: Do not drop an in-flight response when a client sends a
        graceful GOAWAY (error code 0) while streams it opened are still
        being processed. The session now drains open streams instead of
        tearing down immediately, which async MPMs hit far more than event.
        Fixes a silently dropped response; RFC 9113 compliant. [Jim Jagielski]

     *) mod_md: OpenSSL 4 compatibility.

     *) pytest_suite: Port of the old PERL test framework to Python
        and pytest. Now included in the source tree under ./test
        [Jim Jagielski]


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.146.2.1 pkgsrc/www/apache24/Makefile
cvs rdiff -u -r1.40 -r1.40.4.1 pkgsrc/www/apache24/PLIST
cvs rdiff -u -r1.72 -r1.72.4.1 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.146 pkgsrc/www/apache24/Makefile:1.146.2.1
--- pkgsrc/www/apache24/Makefile:1.146  Wed Sep  2 19:04:56 2026
+++ pkgsrc/www/apache24/Makefile        Sat Oct  3 19:45:40 2026
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.146 2026/09/02 19:04:56 wiz Exp $
+# $NetBSD: Makefile,v 1.146.2.1 2026/10/03 19:45:40 bsiegert 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.68
+DISTNAME=      httpd-2.4.69
 PKGNAME=       ${DISTNAME:S/httpd/apache/}
-PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/www/apache24/PLIST
diff -u pkgsrc/www/apache24/PLIST:1.40 pkgsrc/www/apache24/PLIST:1.40.4.1
--- pkgsrc/www/apache24/PLIST:1.40      Tue Jun  9 01:22:47 2026
+++ pkgsrc/www/apache24/PLIST   Sat Oct  3 19:45:40 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2026/06/09 01:22:47 taca Exp $
+@comment $NetBSD: PLIST,v 1.40.4.1 2026/10/03 19:45:40 bsiegert Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -677,6 +677,7 @@ share/httpd/manual/howto/ssi.html.es
 share/httpd/manual/howto/ssi.html.fr.utf8
 share/httpd/manual/howto/ssi.html.ja.utf8
 share/httpd/manual/howto/ssi.html.ko.euc-kr
+share/httpd/manual/images/README.md
 share/httpd/manual/images/apache_header.gif
 share/httpd/manual/images/bal-man-b.png
 share/httpd/manual/images/bal-man-w.png
@@ -713,8 +714,16 @@ 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_l_flag_looping.png
+share/httpd/manual/images/rewrite_l_flag_looping.svg
+share/httpd/manual/images/rewrite_module_order.png
+share/httpd/manual/images/rewrite_module_order.svg
+share/httpd/manual/images/rewrite_path_stripping.png
+share/httpd/manual/images/rewrite_path_stripping.svg
 share/httpd/manual/images/rewrite_process_uri.png
 share/httpd/manual/images/rewrite_process_uri.svg
+share/httpd/manual/images/rewrite_simplified_overview.png
+share/httpd/manual/images/rewrite_simplified_overview.svg
 share/httpd/manual/images/right.gif
 share/httpd/manual/images/ssl_intro_fig1.gif
 share/httpd/manual/images/ssl_intro_fig1.png

Index: pkgsrc/www/apache24/distinfo
diff -u pkgsrc/www/apache24/distinfo:1.72 pkgsrc/www/apache24/distinfo:1.72.4.1
--- pkgsrc/www/apache24/distinfo:1.72   Tue Jun  9 01:22:47 2026
+++ pkgsrc/www/apache24/distinfo        Sat Oct  3 19:45:40 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.72 2026/06/09 01:22:47 taca Exp $
+$NetBSD: distinfo,v 1.72.4.1 2026/10/03 19:45:40 bsiegert Exp $
 
-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
+BLAKE2s (httpd-2.4.69.tar.bz2) = d892053228aeb772f1eb4fabf6c6850684f1bf6e97f5835c74dd4a546154f532
+SHA512 (httpd-2.4.69.tar.bz2) = ca9c5808eef7a0d8d88148b0d2d6045b5a0151823f09afc786b283cef9990036a9c7bc53d043e2f67b6ec06db05f655aa961cb875fa7ad0911fa04fdd295bd93
+Size (httpd-2.4.69.tar.bz2) = 8513053 bytes
 SHA1 (patch-aa) = 9a66685f1d2e4710ab464beda98cbaad632aebf9
 SHA1 (patch-ad) = dd4dbffaa8d784bbbf37b85e17977ff0c73e9074
 SHA1 (patch-ae) = 0a54d96ca77394b1ca725df76819caa95c381f39