don't have time to look closer this evening, full release notes are at https://dlcdn.apache.org/httpd/CHANGES_2.4.69
On 2026/10/01 16:52, Giovanni Bechis wrote: > Hi, > update to Apache httpd follows. > 20 CVE fixed. > CVE details at https://httpd.apache.org/security/vulnerabilities_24.html > ok ? > Cheers > Giovanni > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/www/apache-httpd/Makefile,v > diff -u -p -r1.145 Makefile > --- Makefile 5 Aug 2026 09:16:35 -0000 1.145 > +++ Makefile 1 Oct 2026 14:44:48 -0000 > @@ -1,7 +1,6 @@ > COMMENT= apache HTTP server > > -V= 2.4.68 > -REVISION= 1 > +V= 2.4.69 > DISTNAME= httpd-${V} > PKGNAME= apache-httpd-${V} > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/www/apache-httpd/distinfo,v > diff -u -p -r1.55 distinfo > --- distinfo 9 Jun 2026 22:03:37 -0000 1.55 > +++ distinfo 1 Oct 2026 14:44:48 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (httpd-2.4.68.tar.gz) = 7ZqdRQD7SLso6v+zunHQbM+G1Jj6E6ufeB2gEMxIhJg= > -SIZE (httpd-2.4.68.tar.gz) = 10065436 > +SHA256 (httpd-2.4.69.tar.gz) = xVG5hh4m8Ub1fhsXZeaciaYLPbDsJSzKsNNig0hwFrs= > +SIZE (httpd-2.4.69.tar.gz) = 10822928 > Index: patches/patch-server_mpm_unix_c > =================================================================== > RCS file: /cvs/ports/www/apache-httpd/patches/patch-server_mpm_unix_c,v > diff -u -p -r1.7 patch-server_mpm_unix_c > --- patches/patch-server_mpm_unix_c 5 Aug 2026 09:16:35 -0000 1.7 > +++ patches/patch-server_mpm_unix_c 1 Oct 2026 14:44:48 -0000 > @@ -1,42 +1,7 @@ > Index: server/mpm_unix.c > --- server/mpm_unix.c.orig > +++ server/mpm_unix.c > -@@ -674,6 +674,34 @@ static apr_status_t dummy_connection(ap_pod_t *pod) > - } > - > - rv = apr_socket_connect(sock, lp->bind_addr); > -+#ifdef __OpenBSD__ > -+ /* OpenBSD's connect() returns EINVAL when the target address is the > -+ * wildcard address (INADDR_ANY / IN6ADDR_ANY), > -+ * Retry against the loopback address in that case. */ > -+ if (rv != APR_SUCCESS && APR_STATUS_IS_EINVAL(rv)) { > -+ int is_wildcard = 0; > -+ > -+ if (lp->bind_addr->family == APR_INET) { > -+ is_wildcard = (lp->bind_addr->sa.sin.sin_addr.s_addr == > INADDR_ANY); > -+ } > -+#if APR_HAVE_IPV6 > -+ else if (lp->bind_addr->family == APR_INET6) { > -+ is_wildcard = > IN6_IS_ADDR_UNSPECIFIED(&lp->bind_addr->sa.sin6.sin6_addr); > -+ } > -+#endif > -+ > -+ if (is_wildcard) { > -+ apr_sockaddr_t *loopback; > -+ const char *ip = (lp->bind_addr->family == APR_INET6) ? "::1" : > "127.0.0.1"; > -+ > -+ rv = apr_sockaddr_info_get(&loopback, ip, lp->bind_addr->family, > -+ lp->bind_addr->port, 0, p); > -+ if (rv == APR_SUCCESS) { > -+ rv = apr_socket_connect(sock, loopback); > -+ } > -+ } > -+ } > -+#endif /* __OpenBSD__ */ > - if (rv != APR_SUCCESS) { > - int log_level = APLOG_WARNING; > - > -@@ -800,7 +828,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco > +@@ -800,7 +800,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco > *exit_status = 1; > return 1; > } > @@ -45,7 +10,7 @@ Index: server/mpm_unix.c > } > else { > /* With containerization, httpd may get the same PID at each > startup, > -@@ -809,12 +837,12 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco > +@@ -809,12 +809,12 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco > if (otherpid != getpid() && kill(otherpid, 0) == 0) { > running = 1; > status = apr_psprintf(pconf, > @@ -60,7 +25,7 @@ Index: server/mpm_unix.c > otherpid); > } > } > -@@ -838,7 +866,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco > +@@ -838,7 +838,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco > > if (!strcmp(dash_k_arg, "restart")) { > if (!running) { > @@ -69,7 +34,7 @@ Index: server/mpm_unix.c > } > else { > *exit_status = send_signal(otherpid, SIGHUP); > -@@ -848,7 +876,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco > +@@ -848,7 +848,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco > > if (!strcmp(dash_k_arg, "graceful")) { > if (!running) { > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/www/apache-httpd/pkg/PLIST,v > diff -u -p -r1.42 PLIST > --- pkg/PLIST 9 Jun 2026 22:52:29 -0000 1.42 > +++ pkg/PLIST 1 Oct 2026 14:44:48 -0000 > @@ -410,6 +410,7 @@ share/doc/apache2/howto/ssi.html.fr.utf8 > share/doc/apache2/howto/ssi.html.ja.utf8 > share/doc/apache2/howto/ssi.html.ko.euc-kr > share/doc/apache2/images/ > +share/doc/apache2/images/README.md > share/doc/apache2/images/apache_header.gif > share/doc/apache2/images/bal-man-b.png > share/doc/apache2/images/bal-man-w.png > @@ -446,8 +447,16 @@ share/doc/apache2/images/pixel.gif > share/doc/apache2/images/reverse-proxy-arch.png > share/doc/apache2/images/rewrite_backreferences.png > share/doc/apache2/images/rewrite_backreferences.svg > +share/doc/apache2/images/rewrite_l_flag_looping.png > +share/doc/apache2/images/rewrite_l_flag_looping.svg > +share/doc/apache2/images/rewrite_module_order.png > +share/doc/apache2/images/rewrite_module_order.svg > +share/doc/apache2/images/rewrite_path_stripping.png > +share/doc/apache2/images/rewrite_path_stripping.svg > share/doc/apache2/images/rewrite_process_uri.png > share/doc/apache2/images/rewrite_process_uri.svg > +share/doc/apache2/images/rewrite_simplified_overview.png > +share/doc/apache2/images/rewrite_simplified_overview.svg > share/doc/apache2/images/right.gif > share/doc/apache2/images/ssl_intro_fig1.gif > share/doc/apache2/images/ssl_intro_fig1.png
