new version 2.4.54

new version 2.4.53
fixes CVE-2022-23943, CVE-2022-22721, CVE-2022-22720 and CVE-2022-22719
2022-06-27 12:04:24 +02:00 · 2022-03-17 17:14:47 +01:00
41 changed files with 3464 additions and 1175 deletions
--- a/.gitignore
+++ b/.gitignore
@ -45,14 +45,3 @@ x86_64
 /httpd-2.4.52.tar.bz2.asc
 /httpd-2.4.53.tar.bz2.asc
 /httpd-2.4.54.tar.bz2.asc
-/httpd-2.4.55.tar.bz2.asc
-/httpd-2.4.56.tar.bz2.asc
-/httpd-2.4.57.tar.bz2.asc
-/httpd-2.4.58.tar.bz2.asc
-/httpd-2.4.59.tar.bz2.asc
-/httpd-2.4.61.tar.bz2.asc
-/httpd-2.4.62.tar.bz2.asc
-/httpd-2.4.63.tar.bz2.asc
-/httpd-2.4.64.tar.bz2.asc
-/httpd-2.4.65.tar.bz2.asc
-/httpd-2.4.66.tar.bz2.asc
--- a/00-base.conf
+++ b/00-base.conf
@ -15,7 +15,6 @@ LoadModule authn_dbd_module modules/mod_authn_dbd.so
 LoadModule authn_dbm_module modules/mod_authn_dbm.so
 LoadModule authn_file_module modules/mod_authn_file.so
 LoadModule authn_socache_module modules/mod_authn_socache.so
-LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so
 LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authz_dbd_module modules/mod_authz_dbd.so
 LoadModule authz_dbm_module modules/mod_authz_dbm.so
@ -24,6 +23,7 @@ LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule authz_owner_module modules/mod_authz_owner.so
 LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule brotli_module modules/mod_brotli.so
 LoadModule cache_module modules/mod_cache.so
 LoadModule cache_disk_module modules/mod_cache_disk.so
 LoadModule cache_socache_module modules/mod_cache_socache.so
--- a/00-brotli.conf
+++ b/00-brotli.conf
@ -1 +0,0 @@
-LoadModule brotli_module modules/mod_brotli.so
--- a/apachectl.xml
+++ b/apachectl.xml
@ -5,7 +5,6 @@
 ]>
 <!--
 Copyright 2020 Red Hat, Inc.
- Copyright 2018 Frank Dana

 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements. See the NOTICE file distributed with
@ -71,7 +70,7 @@

      <para>The version of <command>apachectl</command> used on this
      system is a replacement script intended to be mostly (but not
-      completely) compatible with the version provided with
+      completely) compatible with version provided with
      <emphasis>Apache httpd</emphasis>.  This
      <command>apachectl</command> mostly acts as a wrapper around
      <command>systemctl</command> and manipulates the
@ -161,7 +160,7 @@
      </varlistentry>

      <varlistentry>
-        <term><option>configtest</option> | <option>-t</option></term>
+        <term><option>configtest</option></term>
        <listitem>
          <para>Run a configuration file syntax test. It parses the configuration
          files and either reports <literal>Syntax OK</literal>
@ -173,8 +172,8 @@
  </refsect1>

  <refsect1 id='bugs'>
-    <title>Reporting Bugs</title>
-    <para>Please report bugs by filing an issue in @BUG_REPORT_URL@.</para>
+    <title>Bugs</title>
+    <para>Please report bugs by filing an issue in Bugzilla via <ulink url='https://bugzilla.redhat.com/'/>.</para>
  </refsect1>

    <refsect1>
--- a/gating.yaml
+++ b/gating.yaml
@ -14,14 +14,3 @@ decision_contexts: [bodhi_update_push_stable]
 subject_type: koji_build
 rules:
  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
-
-#gating rhel
--- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier2.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier3.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
--- a/htcacheclean.service
+++ b/htcacheclean.service
@ -7,10 +7,5 @@ Documentation=man:htcacheclean.service(8)
 Type=forking
 User=apache
 PIDFile=/run/httpd/htcacheclean/pid
-Environment=LANG=C
 EnvironmentFile=/etc/sysconfig/htcacheclean
 ExecStart=/usr/sbin/htcacheclean -P /run/httpd/htcacheclean/pid -d $INTERVAL -p $CACHE_ROOT -l $LIMIT $OPTIONS
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
--- a/htcacheclean.service.xml
+++ b/htcacheclean.service.xml
@ -106,11 +106,6 @@
    <filename>/etc/sysconfig/htcacheclean</filename></para>
  </refsect1>

-  <refsect1>
-    <title>Reporting Bugs</title>
-    <para>Please report bugs by filing an issue in @BUG_REPORT_URL@.</para>
-  </refsect1>
-
  <refsect1>
    <title>See also</title>

--- a/httpd-2.4.43-apxs.patch
+++ b/httpd-2.4.43-apxs.patch
@ -1,6 +1,3 @@
-
-Upstream-Status: local customisation
-
 diff --git a/support/apxs.in b/support/apxs.in
 index b2705fa..c331631 100644
 --- a/support/apxs.in
--- a/httpd-2.4.43-corelimit.patch
+++ b/httpd-2.4.43-corelimit.patch
@ -1,6 +1,3 @@
-
-Upstream-Status: local customisation
-
 diff --git a/server/core.c b/server/core.c
 index 79b2a82..dc0f17a 100644
 --- a/server/core.c
--- a/httpd-2.4.43-deplibs.patch
+++ b/httpd-2.4.43-deplibs.patch
@ -1,6 +1,3 @@
-
-Upstream-Status: local customisation, not needed upstream
-
 diff --git a/configure.in b/configure.in
 index f8f9442..f276550 100644
 --- a/configure.in
--- a/httpd-2.4.43-gettid.patch
+++ b/httpd-2.4.43-gettid.patch
@ -0,0 +1,93 @@
+From d4e5b6e1e5585d341d1e51f1ddc637c099111076 Mon Sep 17 00:00:00 2001
+From: Joe Orton <jorton@redhat.com>
+Date: Tue, 7 Jul 2020 09:48:01 +0100
+Subject: [PATCH] Check and use gettid() directly with glibc 2.30+.
+
+* configure.in: Check for gettid() and define HAVE_SYS_GETTID if
+  gettid() is only usable via syscall().
+
+* server/log.c (log_tid): Use gettid() directly if available.
+---
+ configure.in | 14 +++++++++-----
+ server/log.c |  8 ++++++--
+ 2 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 423d58d4b9a..60cbf7b7f81 100644
+--- httpd-2.4.43/configure.in.gettid
+++ httpd-2.4.43/configure.in
+@@ -478,7 +500,8 @@
+ timegm \
+ getpgid \
+ fopen64 \
+-getloadavg
+getloadavg \
+gettid
+ )
+ 
+ dnl confirm that a void pointer is large enough to store a long integer
+@@ -489,16 +512,19 @@
+    APR_ADDTO(HTTPD_LIBS, [-lselinux])
+ ])
+ 
+-AC_CACHE_CHECK([for gettid()], ac_cv_gettid,
+if test $ac_cv_func_gettid = no; then
+  # On Linux before glibc 2.30, gettid() is only usable via syscall()
+  AC_CACHE_CHECK([for gettid() via syscall], ap_cv_gettid,
+ [AC_TRY_RUN(#define _GNU_SOURCE
+ #include <unistd.h>
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+ int main(int argc, char **argv) {
+ pid_t t = syscall(SYS_gettid); return t == -1 ? 1 : 0; },
+-[ac_cv_gettid=yes], [ac_cv_gettid=no], [ac_cv_gettid=no])])
+-if test "$ac_cv_gettid" = "yes"; then
+-    AC_DEFINE(HAVE_GETTID, 1, [Define if you have gettid()])
+  [ap_cv_gettid=yes], [ap_cv_gettid=no], [ap_cv_gettid=no])])
+  if test "$ap_cv_gettid" = "yes"; then
+      AC_DEFINE(HAVE_SYS_GETTID, 1, [Define if you have gettid() via syscall()])
+  fi
+ fi
+ 
+ dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs
+--- httpd-2.4.43/server/log.c.gettid
+++ httpd-2.4.43/server/log.c
+@@ -55,7 +55,7 @@
+ #include "ap_mpm.h"
+ #include "ap_listen.h"
+ 
+-#if HAVE_GETTID
+#if HAVE_SYS_GETTID
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+ #endif
+@@ -625,14 +625,18 @@
+ #if APR_HAS_THREADS
+     int result;
+ #endif
+-#if HAVE_GETTID
+#if defined(HAVE_GETTID) || defined(HAVE_SYS_GETTID)
+     if (arg && *arg == 'g') {
+#ifdef HAVE_GETTID
+        pid_t tid = gettid();
+#else
+         pid_t tid = syscall(SYS_gettid);
+#endif
+         if (tid == -1)
+             return 0;
+         return apr_snprintf(buf, buflen, "%"APR_PID_T_FMT, tid);
+     }
+-#endif
+#endif /* HAVE_GETTID || HAVE_SYS_GETTID */
+ #if APR_HAS_THREADS
+     if (ap_mpm_query(AP_MPMQ_IS_THREADED, &result) == APR_SUCCESS
+         && result != AP_MPMQ_NOT_SUPPORTED)
+@@ -966,7 +970,7 @@
+ #if APR_HAS_THREADS
+         field_start = len;
+         len += cpystrn(buf + len, ":tid ", buflen - len);
+-        item_len = log_tid(info, NULL, buf + len, buflen - len);
+        item_len = log_tid(info, "g", buf + len, buflen - len);
+         if (!item_len)
+             len = field_start;
+         else
--- a/httpd-2.4.43-icons.patch
+++ b/httpd-2.4.43-icons.patch
@ -0,0 +1,22 @@
+diff --git a/docs/conf/extra/httpd-autoindex.conf.in b/docs/conf/extra/httpd-autoindex.conf.in
+index 51b02ed..0e8b626 100644
+--- a/docs/conf/extra/httpd-autoindex.conf.in
+++ b/docs/conf/extra/httpd-autoindex.conf.in
+@@ -21,7 +21,7 @@ IndexOptions FancyIndexing HTMLTable VersionSort
+ Alias /icons/ "@exp_iconsdir@/"
+ 
+ <Directory "@exp_iconsdir@">
+-    Options Indexes MultiViews
+    Options Indexes MultiViews FollowSymlinks
+     AllowOverride None
+     Require all granted
+ </Directory>
+@@ -53,7 +53,7 @@ AddIcon /icons/dvi.gif .dvi
+ AddIcon /icons/uuencoded.gif .uu
+ AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
+ AddIcon /icons/tex.gif .tex
+-AddIcon /icons/bomb.gif core
+AddIcon /icons/bomb.gif core.
+ 
+ AddIcon /icons/back.gif ..
+ AddIcon /icons/hand.right.gif README
--- a/httpd-2.4.43-mod_systemd.patch
+++ b/httpd-2.4.43-mod_systemd.patch
@ -1,12 +1,10 @@

 More verbose startup logging for mod_systemd.

-diff --git a/modules/arch/unix/mod_systemd.c b/modules/arch/unix/mod_systemd.c
-index 22482fd..b46d3ef 100644
--- a/modules/arch/unix/mod_systemd.c
-+++ b/modules/arch/unix/mod_systemd.c
-@@ -34,11 +34,14 @@
- #endif
+--- httpd-2.4.43/modules/arch/unix/mod_systemd.c.mod_systemd
+++ httpd-2.4.43/modules/arch/unix/mod_systemd.c
+@@ -29,11 +29,14 @@
+ #include "mpm_common.h"
 
 #include "systemd/sd-daemon.h"
 +#include "systemd/sd-journal.h"
@ -20,9 +18,9 @@ index 22482fd..b46d3ef 100644
 static int systemd_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
                               apr_pool_t *ptemp)
 {
-@@ -63,6 +66,20 @@ static void log_selinux_context(void)
+@@ -44,6 +47,20 @@
+     return OK;
 }
- #endif
 
 +static char *dump_listener(ap_listen_rec *lr, apr_pool_t *p)
 +{
@ -41,17 +39,21 @@ index 22482fd..b46d3ef 100644
 /* Report the service is ready in post_config, which could be during
  * startup or after a reload.  The server could still hit a fatal
  * startup error after this point during ap_run_mpm(), so this is
-@@ -73,23 +90,52 @@ static void log_selinux_context(void)
- static int systemd_post_config(apr_pool_t *pconf, apr_pool_t *plog,
+@@ -51,19 +68,51 @@
+  * the TCP ports so new connections will not be rejected.  There will
+  * always be a possible async failure event simultaneous to the
+  * service reporting "ready", so this should be good enough. */
+-static int systemd_post_config(apr_pool_t *p, apr_pool_t *plog,
+static int systemd_post_config(apr_pool_t *pconf, apr_pool_t *plog,
                                apr_pool_t *ptemp, server_rec *main_server)
 {
 +    ap_listen_rec *lr;
 +    apr_size_t plen = sizeof describe_listeners;
 +    char *p = describe_listeners;
 +
-     if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG)
-         return OK;
- 
+    if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG)
+        return OK;
+
 +    for (lr = ap_listeners; lr; lr = lr->next) {
 +        char *s = dump_listener(lr, ptemp);
 +
@ -72,10 +74,6 @@ index 22482fd..b46d3ef 100644
 +        }
 +    }
 +
- #ifdef HAVE_SELINUX
-     log_selinux_context();
- #endif
- 
     sd_notify(0, "READY=1\n"
               "STATUS=Configuration loaded.\n");
 +
--- a/httpd-2.4.43-r1861269.patch
+++ b/httpd-2.4.43-r1861269.patch
@ -0,0 +1,20 @@
+diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
+index b53f3f8..979489c 100644
+--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
+@@ -812,8 +812,14 @@ const char *ssl_cmd_SSLCipherSuite(cmd_parms *cmd,
+ static const char *ssl_cmd_check_file(cmd_parms *parms,
+                                       const char **file)
+ {
+-    const char *filepath = ap_server_root_relative(parms->pool, *file);
+    const char *filepath;
+ 
+    /* If only dumping the config, don't verify the paths */
+    if (ap_state_query(AP_SQ_RUN_MODE) == AP_SQ_RM_CONFIG_DUMP) {
+        return NULL;
+    }
+
+    filepath = ap_server_root_relative(parms->pool, *file);
+     if (!filepath) {
+         return apr_pstrcat(parms->pool, parms->cmd->name,
+                            ": Invalid file path ", *file, NULL);
--- a/httpd-2.4.43-r1861793+.patch
+++ b/httpd-2.4.43-r1861793+.patch
@ -0,0 +1,271 @@
+diff --git a/configure.in b/configure.in
+index cb43246..0bb6b0d 100644
+--- httpd-2.4.43/configure.in.r1861793+
+++ httpd-2.4.43/configure.in
+@@ -465,6 +465,28 @@
+ AC_SEARCH_LIBS(crypt, crypt)
+ CRYPT_LIBS="$LIBS"
+ APACHE_SUBST(CRYPT_LIBS)
+
+if test "$ac_cv_search_crypt" != "no"; then
+   # Test crypt() with the SHA-512 test vector from https://akkadia.org/drepper/SHA-crypt.txt
+   AC_CACHE_CHECK([whether crypt() supports SHA-2], [ap_cv_crypt_sha2], [
+    AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+#include <crypt.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define PASSWD_0 "Hello world!"
+#define SALT_0 "\$6\$saltstring"
+#define EXPECT_0 "\$6\$saltstring\$svn8UoSVapNtMuq1ukKS4tPQd8iKwSMHWjl/O817G3uBnIFNjnQJu" \
+               "esI68u4OTLiBFdcbYEdFCoEOfaS35inz1"
+]], [char *result = crypt(PASSWD_0, SALT_0);
+     if (!result) return 1;
+     if (strcmp(result, EXPECT_0)) return 2;
+])], [ap_cv_crypt_sha2=yes], [ap_cv_crypt_sha2=no])])
+   if test "$ap_cv_crypt_sha2" = yes; then
+     AC_DEFINE([HAVE_CRYPT_SHA2], 1, [Define if crypt() supports SHA-2 hashes])
+   fi
+fi
+
+ LIBS="$saved_LIBS"
+ 
+ dnl See Comment #Spoon
+--- httpd-2.4.43/docs/man/htpasswd.1.r1861793+
+++ httpd-2.4.43/docs/man/htpasswd.1
+@@ -27,16 +27,16 @@
+ .SH "SYNOPSIS"
+  
+ .PP
+-\fB\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] \fIpasswdfile\fR \fIusername\fR\fR
+\fB\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fB2\fR | -\fB5\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBr\fR \fIrounds\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] \fIpasswdfile\fR \fIusername\fR\fR
+  
+ .PP
+-\fB\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR\fR
+\fB\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fB2\fR | -\fB5\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBr\fR \fIrounds\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] [ -\fBv\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR\fR
+  
+ .PP
+-\fB\fBhtpasswd\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR\fR
+\fB\fBhtpasswd\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fB2\fR | -\fB5\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBr\fR \fIrounds\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR\fR
+  
+ .PP
+-\fB\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR \fIpassword\fR\fR
+\fB\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fB2\fR | -\fB5\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBr\fR \fIrounds\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR \fIpassword\fR\fR
+  
+ 
+ .SH "SUMMARY"
+@@ -48,7 +48,7 @@
+ Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by \fBhtpasswd\fR\&. This program can only manage usernames and passwords stored in a flat-file\&. It can encrypt and display password information for use in other types of data stores, though\&. To use a DBM database see dbmmanage or htdbm\&.
+  
+ .PP
+-\fBhtpasswd\fR encrypts passwords using either bcrypt, a version of MD5 modified for Apache, SHA1, or the system's \fBcrypt()\fR routine\&. Files managed by \fBhtpasswd\fR may contain a mixture of different encoding types of passwords; some user records may have bcrypt or MD5-encrypted passwords while others in the same file may have passwords encrypted with \fBcrypt()\fR\&.
+\fBhtpasswd\fR encrypts passwords using either bcrypt, a version of MD5 modified for Apache, SHA-1, or the system's \fBcrypt()\fR routine\&. SHA-2-based hashes (SHA-256 and SHA-512) are supported for \fBcrypt()\fR\&. Files managed by \fBhtpasswd\fR may contain a mixture of different encoding types of passwords; some user records may have bcrypt or MD5-encrypted passwords while others in the same file may have passwords encrypted with \fBcrypt()\fR\&.
+  
+ .PP
+ This manual page only lists the command line arguments\&. For details of the directives necessary to configure user authentication in httpd see the Apache manual, which is part of the Apache distribution or can be found at http://httpd\&.apache\&.org/\&.
+@@ -73,17 +73,26 @@
+ \fB-m\fR
+ Use MD5 encryption for passwords\&. This is the default (since version 2\&.2\&.18)\&.  
+ .TP
+\fB-2\fR
+Use SHA-256 \fBcrypt()\fR based hashes for passwords\&. This is supported on most Unix platforms\&.  
+.TP
+\fB-5\fR
+Use SHA-512 \fBcrypt()\fR based hashes for passwords\&. This is supported on most Unix platforms\&.  
+.TP
+ \fB-B\fR
+ Use bcrypt encryption for passwords\&. This is currently considered to be very secure\&.  
+ .TP
+ \fB-C\fR
+ This flag is only allowed in combination with \fB-B\fR (bcrypt encryption)\&. It sets the computing time used for the bcrypt algorithm (higher is more secure but slower, default: 5, valid: 4 to 17)\&.  
+ .TP
+\fB-r\fR
+This flag is only allowed in combination with \fB-2\fR or \fB-5\fR\&. It sets the number of hash rounds used for the SHA-2 algorithms (higher is more secure but slower; the default is 5,000)\&.  
+.TP
+ \fB-d\fR
+ Use \fBcrypt()\fR encryption for passwords\&. This is not supported by the httpd server on Windows and Netware\&. This algorithm limits the password length to 8 characters\&. This algorithm is \fBinsecure\fR by today's standards\&. It used to be the default algorithm until version 2\&.2\&.17\&.  
+ .TP
+ \fB-s\fR
+-Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&. This algorithm is \fBinsecure\fR by today's standards\&.  
+Use SHA-1 (160-bit) encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&. This algorithm is \fBinsecure\fR by today's standards\&.  
+ .TP
+ \fB-p\fR
+ Use plaintext passwords\&. Though \fBhtpasswd\fR will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&.  
+@@ -152,10 +161,13 @@
+ When using the \fBcrypt()\fR algorithm, note that only the first 8 characters of the password are used to form the password\&. If the supplied password is longer, the extra characters will be silently discarded\&.
+  
+ .PP
+-The SHA encryption format does not use salting: for a given password, there is only one encrypted representation\&. The \fBcrypt()\fR and MD5 formats permute the representation by prepending a random salt string, to make dictionary attacks against the passwords more difficult\&.
+The SHA-1 encryption format does not use salting: for a given password, there is only one encrypted representation\&. The \fBcrypt()\fR and MD5 formats permute the representation by prepending a random salt string, to make dictionary attacks against the passwords more difficult\&.
+ 
+.PP
+The SHA-1 and \fBcrypt()\fR formats are insecure by today's standards\&.
+  
+ .PP
+-The SHA and \fBcrypt()\fR formats are insecure by today's standards\&.
+The SHA-2-based \fBcrypt()\fR formats (SHA-256 and SHA-512) are supported on most modern Unix systems, and follow the specification at https://www\&.akkadia\&.org/drepper/SHA-crypt\&.txt\&.
+  
+ .SH "RESTRICTIONS"
+  
+--- httpd-2.4.43/support/htpasswd.c.r1861793+
+++ httpd-2.4.43/support/htpasswd.c
+@@ -109,17 +109,21 @@
+             "for it." NL
+         " -i  Read password from stdin without verification (for script usage)." NL
+         " -m  Force MD5 encryption of the password (default)." NL
+-        " -B  Force bcrypt encryption of the password (very secure)." NL
+        " -2  Force SHA-256 crypt() hash of the password (very secure)." NL
+        " -5  Force SHA-512 crypt() hash of the password (very secure)." NL
+        " -B  Force bcrypt encryption of the password (very secure)." NL
+         " -C  Set the computing time used for the bcrypt algorithm" NL
+         "     (higher is more secure but slower, default: %d, valid: 4 to 17)." NL
+        " -r  Set the number of rounds used for the SHA-256, SHA-512 algorithms" NL
+        "     (higher is more secure but slower, default: 5000)." NL
+         " -d  Force CRYPT encryption of the password (8 chars max, insecure)." NL
+-        " -s  Force SHA encryption of the password (insecure)." NL
+        " -s  Force SHA-1 encryption of the password (insecure)." NL
+         " -p  Do not encrypt the password (plaintext, insecure)." NL
+         " -D  Delete the specified user." NL
+         " -v  Verify password for the specified user." NL
+         "On other systems than Windows and NetWare the '-p' flag will "
+             "probably not work." NL
+-        "The SHA algorithm does not use a salt and is less secure than the "
+        "The SHA-1 algorithm does not use a salt and is less secure than the "
+             "MD5 algorithm." NL,
+         BCRYPT_DEFAULT_COST
+     );
+@@ -178,7 +182,7 @@
+     if (rv != APR_SUCCESS)
+         exit(ERR_SYNTAX);
+ 
+-    while ((rv = apr_getopt(state, "cnmspdBbDiC:v", &opt, &opt_arg)) == APR_SUCCESS) {
+    while ((rv = apr_getopt(state, "cnmspdBbDi25C:r:v", &opt, &opt_arg)) == APR_SUCCESS) {
+         switch (opt) {
+         case 'c':
+             *mask |= APHTP_NEWFILE;
+--- httpd-2.4.43/support/passwd_common.c.r1861793+
+++ httpd-2.4.43/support/passwd_common.c
+@@ -179,16 +179,21 @@
+ int mkhash(struct passwd_ctx *ctx)
+ {
+     char *pw;
+-    char salt[16];
+    char salt[17];
+     apr_status_t rv;
+     int ret = 0;
+ #if CRYPT_ALGO_SUPPORTED
+     char *cbuf;
+ #endif
+#ifdef HAVE_CRYPT_SHA2
+    const char *setting;
+    char method;
+#endif
+ 
+-    if (ctx->cost != 0 && ctx->alg != ALG_BCRYPT) {
+    if (ctx->cost != 0 && ctx->alg != ALG_BCRYPT
+        && ctx->alg != ALG_CRYPT_SHA256 && ctx->alg != ALG_CRYPT_SHA512 ) {
+         apr_file_printf(errfile,
+-                        "Warning: Ignoring -C argument for this algorithm." NL);
+                        "Warning: Ignoring -C/-r argument for this algorithm." NL);
+     }
+ 
+     if (ctx->passwd == NULL) {
+@@ -246,6 +251,34 @@
+         break;
+ #endif /* CRYPT_ALGO_SUPPORTED */
+ 
+#ifdef HAVE_CRYPT_SHA2
+    case ALG_CRYPT_SHA256:
+    case ALG_CRYPT_SHA512:
+        ret = generate_salt(salt, 16, &ctx->errstr, ctx->pool);
+        if (ret != 0)
+            break;
+
+        method = ctx->alg == ALG_CRYPT_SHA256 ? '5': '6';
+
+        if (ctx->cost) 
+            setting = apr_psprintf(ctx->pool, "$%c$rounds=%d$%s",
+                                   method, ctx->cost, salt);
+        else
+            setting = apr_psprintf(ctx->pool, "$%c$%s",
+                                   method, salt);
+
+        cbuf = crypt(pw, setting);
+        if (cbuf == NULL) {
+            rv = APR_FROM_OS_ERROR(errno);
+            ctx->errstr = apr_psprintf(ctx->pool, "crypt() failed: %pm", &rv);
+            ret = ERR_PWMISMATCH;
+            break;
+        }
+
+        apr_cpystrn(ctx->out, cbuf, ctx->out_len - 1);
+        break;
+#endif /* HAVE_CRYPT_SHA2 */
+
+ #if BCRYPT_ALGO_SUPPORTED
+     case ALG_BCRYPT:
+         rv = apr_generate_random_bytes((unsigned char*)salt, 16);
+@@ -294,6 +327,19 @@
+     case 's':
+         ctx->alg = ALG_APSHA;
+         break;
+#ifdef HAVE_CRYPT_SHA2
+    case '2':
+        ctx->alg = ALG_CRYPT_SHA256;
+        break;
+    case '5':
+        ctx->alg = ALG_CRYPT_SHA512;
+        break;
+#else
+    case '2':
+    case '5':
+        ctx->errstr = "SHA-2 crypt() algorithms are not supported on this platform.";
+        return ERR_ALG_NOT_SUPP;
+#endif
+     case 'p':
+         ctx->alg = ALG_PLAIN;
+ #if !PLAIN_ALGO_SUPPORTED
+@@ -324,11 +370,12 @@
+         return ERR_ALG_NOT_SUPP;
+ #endif
+         break;
+-    case 'C': {
+    case 'C':
+    case 'r': {
+             char *endptr;
+             long num = strtol(opt_arg, &endptr, 10);
+             if (*endptr != '\0' || num <= 0) {
+-                ctx->errstr = "argument to -C must be a positive integer";
+                ctx->errstr = "argument to -C/-r must be a positive integer";
+                 return ERR_SYNTAX;
+             }
+             ctx->cost = num;
+--- httpd-2.4.43/support/passwd_common.h.r1861793+
+++ httpd-2.4.43/support/passwd_common.h
+@@ -28,6 +28,8 @@
+ #include "apu_version.h"
+ #endif
+ 
+#include "ap_config_auto.h"
+
+ #define MAX_STRING_LEN 256
+ 
+ #define ALG_PLAIN 0
+@@ -35,6 +37,8 @@
+ #define ALG_APMD5 2
+ #define ALG_APSHA 3
+ #define ALG_BCRYPT 4
+#define ALG_CRYPT_SHA256 5
+#define ALG_CRYPT_SHA512 6
+ 
+ #define BCRYPT_DEFAULT_COST 5
+ 
+@@ -84,7 +88,7 @@
+     apr_size_t      out_len;
+     char            *passwd;
+     int             alg;
+-    int             cost;
+    int             cost; /* cost for bcrypt, rounds for SHA-2 */
+     enum {
+         PW_PROMPT = 0,
+         PW_ARG,
--- a/httpd-2.4.43-socket-activation.patch
+++ b/httpd-2.4.43-socket-activation.patch
@ -0,0 +1,300 @@
+diff --git a/server/listen.c b/server/listen.c
+index 5242c2a..e2e028a 100644
+--- a/server/listen.c
+++ b/server/listen.c
+@@ -34,6 +34,10 @@
+ #include <unistd.h>
+ #endif
+ 
+#ifdef HAVE_SYSTEMD
+#include <systemd/sd-daemon.h>
+#endif
+
+ /* we know core's module_index is 0 */
+ #undef APLOG_MODULE_INDEX
+ #define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX
+@@ -59,9 +63,12 @@ static int ap_listenbacklog;
+ static int ap_listencbratio;
+ static int send_buffer_size;
+ static int receive_buffer_size;
+#ifdef HAVE_SYSTEMD
+static int use_systemd = -1;
+#endif
+ 
+ /* TODO: make_sock is just begging and screaming for APR abstraction */
+-static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
+static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server, int do_bind_listen)
+ {
+     apr_socket_t *s = server->sd;
+     int one = 1;
+@@ -94,20 +101,6 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
+         return stat;
+     }
+ 
+-#if APR_HAVE_IPV6
+-    if (server->bind_addr->family == APR_INET6) {
+-        stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
+-        if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
+-            ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p, APLOGNO(00069)
+-                          "make_sock: for address %pI, apr_socket_opt_set: "
+-                          "(IPV6_V6ONLY)",
+-                          server->bind_addr);
+-            apr_socket_close(s);
+-            return stat;
+-        }
+-    }
+-#endif
+-
+     /*
+      * To send data over high bandwidth-delay connections at full
+      * speed we must force the TCP window to open wide enough to keep the
+@@ -169,21 +162,37 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
+     }
+ #endif
+ 
+-    if ((stat = apr_socket_bind(s, server->bind_addr)) != APR_SUCCESS) {
+-        ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, stat, p, APLOGNO(00072)
+-                      "make_sock: could not bind to address %pI",
+-                      server->bind_addr);
+-        apr_socket_close(s);
+-        return stat;
+-    }
+    if (do_bind_listen) {
+#if APR_HAVE_IPV6
+        if (server->bind_addr->family == APR_INET6) {
+            stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
+            if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
+                ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p, APLOGNO(00069)
+                              "make_sock: for address %pI, apr_socket_opt_set: "
+                              "(IPV6_V6ONLY)",
+                              server->bind_addr);
+                apr_socket_close(s);
+                return stat;
+            }
+        }
+#endif
+ 
+-    if ((stat = apr_socket_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
+-        ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_ERR, stat, p, APLOGNO(00073)
+-                      "make_sock: unable to listen for connections "
+-                      "on address %pI",
+-                      server->bind_addr);
+-        apr_socket_close(s);
+-        return stat;
+        if ((stat = apr_socket_bind(s, server->bind_addr)) != APR_SUCCESS) {
+            ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, stat, p, APLOGNO(00072)
+                          "make_sock: could not bind to address %pI",
+                          server->bind_addr);
+            apr_socket_close(s);
+            return stat;
+        }
+
+        if ((stat = apr_socket_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
+            ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_ERR, stat, p, APLOGNO(00073)
+                          "make_sock: unable to listen for connections "
+                          "on address %pI",
+                          server->bind_addr);
+            apr_socket_close(s);
+            return stat;
+        }
+     }
+ 
+ #ifdef WIN32
+@@ -315,6 +324,123 @@ static int find_listeners(ap_listen_rec **from, ap_listen_rec **to,
+     return found;
+ }
+ 
+#ifdef HAVE_SYSTEMD
+
+static int find_systemd_socket(process_rec * process, apr_port_t port) {
+    int fdcount, fd;
+    int sdc = sd_listen_fds(0);
+
+    if (sdc < 0) {
+        ap_log_perror(APLOG_MARK, APLOG_CRIT, sdc, process->pool, APLOGNO(02486)
+                      "find_systemd_socket: Error parsing enviroment, sd_listen_fds returned %d",
+                      sdc);
+        return -1;
+    }
+
+    if (sdc == 0) {
+        ap_log_perror(APLOG_MARK, APLOG_CRIT, sdc, process->pool, APLOGNO(02487)
+                      "find_systemd_socket: At least one socket must be set.");
+        return -1;
+    }
+
+    fdcount = atoi(getenv("LISTEN_FDS"));
+    for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + fdcount; fd++) {
+        if (sd_is_socket_inet(fd, 0, 0, -1, port) > 0) {
+            return fd;
+        }
+    }
+
+    return -1;
+}
+
+static apr_status_t alloc_systemd_listener(process_rec * process,
+                                           int fd, const char *proto,
+                                           ap_listen_rec **out_rec)
+{
+    apr_status_t rv;
+    struct sockaddr sa;
+    socklen_t len = sizeof(struct sockaddr);
+    apr_os_sock_info_t si;
+    ap_listen_rec *rec;
+    *out_rec = NULL;
+
+    memset(&si, 0, sizeof(si));
+
+    rv = getsockname(fd, &sa, &len);
+
+    if (rv != 0) {
+        rv = apr_get_netos_error();
+        ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, process->pool, APLOGNO(02489)
+                      "getsockname on %d failed.", fd);
+        return rv;
+    }
+
+    si.os_sock = &fd;
+    si.family = sa.sa_family;
+    si.local = &sa;
+    si.type = SOCK_STREAM;
+    si.protocol = APR_PROTO_TCP;
+
+    rec = apr_palloc(process->pool, sizeof(ap_listen_rec));
+    rec->active = 0;
+    rec->next = 0;
+
+
+    rv = apr_os_sock_make(&rec->sd, &si, process->pool);
+    if (rv != APR_SUCCESS) {
+        ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, process->pool, APLOGNO(02490)
+                      "apr_os_sock_make on %d failed.", fd);
+        return rv;
+    }
+
+    rv = apr_socket_addr_get(&rec->bind_addr, APR_LOCAL, rec->sd);
+    if (rv != APR_SUCCESS) {
+        ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, process->pool, APLOGNO(02491)
+                      "apr_socket_addr_get on %d failed.", fd);
+        return rv;
+    }
+
+    rec->protocol = apr_pstrdup(process->pool, proto);
+
+    *out_rec = rec;
+
+    return make_sock(process->pool, rec, 0);
+}
+
+static const char *set_systemd_listener(process_rec *process, apr_port_t port,
+                                        const char *proto)
+{
+    ap_listen_rec *last, *new;
+    apr_status_t rv;
+    int fd = find_systemd_socket(process, port);
+    if (fd < 0) {
+        return "Systemd socket activation is used, but this port is not "
+                "configured in systemd";
+    }
+
+    last = ap_listeners;
+    while (last && last->next) {
+        last = last->next;
+    }
+
+    rv = alloc_systemd_listener(process, fd, proto, &new);
+    if (rv != APR_SUCCESS) {
+        return "Failed to setup socket passed by systemd using socket activation";
+    }
+
+    if (last == NULL) {
+        ap_listeners = last = new;
+    }
+    else {
+        last->next = new;
+        last = new;
+    }
+
+    return NULL;
+}
+
+#endif /* HAVE_SYSTEMD */
+
+ static const char *alloc_listener(process_rec *process, const char *addr,
+                                   apr_port_t port, const char* proto,
+                                   void *slave)
+@@ -495,7 +621,7 @@ static int open_listeners(apr_pool_t *pool)
+                 }
+             }
+ #endif
+-            if (make_sock(pool, lr) == APR_SUCCESS) {
+            if (make_sock(pool, lr, 1) == APR_SUCCESS) {
+                 ++num_open;
+             }
+             else {
+@@ -607,8 +733,28 @@ AP_DECLARE(int) ap_setup_listeners(server_rec *s)
+         }
+     }
+ 
+-    if (open_listeners(s->process->pool)) {
+-        return 0;
+#ifdef HAVE_SYSTEMD
+    if (use_systemd) {
+        const char *userdata_key = "ap_open_systemd_listeners";
+        void *data;
+        /* clear the enviroment on our second run
+        * so that none of our future children get confused.
+        */
+        apr_pool_userdata_get(&data, userdata_key, s->process->pool);
+        if (!data) {
+            apr_pool_userdata_set((const void *)1, userdata_key,
+                                apr_pool_cleanup_null, s->process->pool);
+        }
+        else {
+            sd_listen_fds(1);
+        }
+    }
+    else
+#endif
+    {
+        if (open_listeners(s->process->pool)) {
+            return 0;
+        }
+     }
+ 
+     for (lr = ap_listeners; lr; lr = lr->next) {
+@@ -698,7 +844,7 @@ AP_DECLARE(apr_status_t) ap_duplicate_listeners(apr_pool_t *p, server_rec *s,
+                             duplr->bind_addr);
+                 return stat;
+             }
+-            make_sock(p, duplr);
+            make_sock(p, duplr, 1);
+ #if AP_NONBLOCK_WHEN_MULTI_LISTEN
+             use_nonblock = (ap_listeners && ap_listeners->next);
+             stat = apr_socket_opt_set(duplr->sd, APR_SO_NONBLOCK, use_nonblock);
+@@ -825,6 +971,11 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
+     if (argc < 1 || argc > 2) {
+         return "Listen requires 1 or 2 arguments.";
+     }
+#ifdef HAVE_SYSTEMD
+    if (use_systemd == -1) {
+        use_systemd = sd_listen_fds(0) > 0;
+    }
+#endif
+ 
+     rv = apr_parse_addr_port(&host, &scope_id, &port, argv[0], cmd->pool);
+     if (rv != APR_SUCCESS) {
+@@ -856,6 +1007,12 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
+         ap_str_tolower(proto);
+     }
+ 
+#ifdef HAVE_SYSTEMD
+    if (use_systemd) {
+        return set_systemd_listener(cmd->server->process, port, proto);
+    }
+#endif
+
+     return alloc_listener(cmd->server->process, host, port, proto, NULL);
+ }
+ 
--- a/httpd-2.4.43-sslprotdefault.patch
+++ b/httpd-2.4.43-sslprotdefault.patch
@ -1,8 +1,8 @@
 diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
-index 8fae1f8..c5dce7f 100644
+index 27e7a53..b53f3f8 100644
 --- a/modules/ssl/ssl_engine_config.c
 +++ b/modules/ssl/ssl_engine_config.c
-@@ -127,7 +127,7 @@ static void modssl_ctx_init(modssl_ctx_t *mctx, apr_pool_t *p)
+@@ -119,7 +119,7 @@ static void modssl_ctx_init(modssl_ctx_t *mctx, apr_pool_t *p)
     mctx->ticket_key          = NULL;
 #endif
 
@ -11,7 +11,7 @@ index 8fae1f8..c5dce7f 100644
     mctx->protocol_set        = 0;
 
     mctx->pphrase_dialog_type = SSL_PPTYPE_UNSET;
-@@ -268,6 +268,7 @@ static void modssl_ctx_cfg_merge(apr_pool_t *p,
+@@ -263,6 +263,7 @@ static void modssl_ctx_cfg_merge(apr_pool_t *p,
     if (add->protocol_set) {
         mrg->protocol_set = 1;
         mrg->protocol = add->protocol;
@ -19,19 +19,20 @@ index 8fae1f8..c5dce7f 100644
     }
     else {
         mrg->protocol_set = base->protocol_set;
+
 diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
-index 4e265b3..2fbd076 100644
+index bfad47a..b0fcf81 100644
 --- a/modules/ssl/ssl_engine_init.c
 +++ b/modules/ssl/ssl_engine_init.c
-@@ -638,6 +638,7 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
+@@ -577,6 +577,7 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
     MODSSL_SSL_METHOD_CONST SSL_METHOD *method = NULL;
     char *cp;
     int protocol = mctx->protocol;
 +    int protocol_set = mctx->protocol_set;
     SSLSrvConfigRec *sc = mySrvConfig(s);
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
-     /* default is highest supported version, will be overridden below */
-@@ -652,12 +653,18 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
+     int prot;
+@@ -586,12 +587,18 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
      *  Create the new per-server SSL context
      */
     if (protocol == SSL_PROTOCOL_NONE) {
@ -55,7 +56,7 @@ index 4e265b3..2fbd076 100644
 #ifndef OPENSSL_NO_SSL3
                      (protocol & SSL_PROTOCOL_SSLV3 ? "SSLv3, " : ""),
 #endif
-@@ -670,7 +677,8 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
+@@ -604,7 +611,8 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
 #endif
 #endif
                      NULL);
@ -65,7 +66,7 @@ index 4e265b3..2fbd076 100644
 
     ap_log_error(APLOG_MARK, APLOG_TRACE3, 0, s,
                  "Creating new SSL context (protocols: %s)", cp);
-@@ -776,13 +784,15 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
+@@ -705,13 +713,15 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
         prot = SSL3_VERSION;
 #endif
     } else {
@ -87,7 +88,7 @@ index 4e265b3..2fbd076 100644
 
     /* Next we scan for the minimal protocol version we should provide,
      * but we do not allow holes between max and min */
-@@ -806,7 +816,7 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
+@@ -731,7 +741,7 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
         prot = SSL3_VERSION;
     }
 #endif
--- a/httpd-2.4.46-htcacheclean-dont-break.patch
+++ b/httpd-2.4.46-htcacheclean-dont-break.patch
@ -0,0 +1,13 @@
+diff --git a/support/htcacheclean.c b/support/htcacheclean.c
+index 958ba6d..0a7fe3c 100644
+--- a/support/htcacheclean.c
+++ b/support/htcacheclean.c
+@@ -557,8 +557,6 @@ static int list_urls(char *path, apr_pool_t *pool, apr_off_t round)
+                                         }
+                                     }
+                                 }
+-
+-                                break;
+                             }
+                         }
+                     }
--- a/httpd-2.4.48-r1828172+.patch
+++ b/httpd-2.4.48-r1828172+.patch
--- a/httpd-2.4.48-r1842929+.patch
+++ b/httpd-2.4.48-r1842929+.patch
@ -1,6 +1,3 @@
-
-Upstream-Status: in trunk, not proposed for 2.4.x
-
 diff --git a/Makefile.in b/Makefile.in
 index 6747aea..40c7076 100644
 --- a/Makefile.in
--- a/httpd-2.4.48-r1878890.patch
+++ b/httpd-2.4.48-r1878890.patch
@ -0,0 +1,116 @@
+diff --git a/include/util_ldap.h b/include/util_ldap.h
+index 28e0760..edb8a81 100644
+--- a/include/util_ldap.h
+++ b/include/util_ldap.h
+@@ -32,7 +32,6 @@
+ #if APR_MAJOR_VERSION < 2
+ /* The LDAP API is currently only present in APR 1.x */
+ #include "apr_ldap.h"
+-#include "apr_ldap_rebind.h"
+ #else
+ #define APR_HAS_LDAP 0
+ #endif
+diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
+index 120f268..a5f7995 100644
+--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
+@@ -140,6 +140,38 @@ static int util_ldap_handler(request_rec *r)
+     return OK;
+ }
+ 
+/* For OpenLDAP with the 3-arg version of ldap_set_rebind_proc(), use
+ * a simpler rebind callback than the implementation in APR-util.
+ * Testing for API version >= 3001 appears safe although OpenLDAP
+ * 2.1.x (API version = 2004) also has the 3-arg API. */
+#if APR_HAS_OPENLDAP_LDAPSDK && defined(LDAP_API_VERSION) && LDAP_API_VERSION >= 3001
+
+#define uldap_rebind_init(p) APR_SUCCESS /* noop */
+
+static int uldap_rebind_proc(LDAP *ld, const char *url, ber_tag_t request,
+                             ber_int_t msgid, void *params)
+{
+    util_ldap_connection_t *ldc = params;
+
+    return ldap_bind_s(ld, ldc->binddn, ldc->bindpw, LDAP_AUTH_SIMPLE);
+}
+
+static apr_status_t uldap_rebind_add(util_ldap_connection_t *ldc)
+{
+    ldap_set_rebind_proc(ldc->ldap, uldap_rebind_proc, ldc);
+    return APR_SUCCESS;
+}
+
+#else /* !APR_HAS_OPENLDAP_LDAPSDK */
+
+#define USE_APR_LDAP_REBIND
+#include <apr_ldap_rebind.h>
+
+#define uldap_rebind_init(p) apr_ldap_rebind_init(p)
+#define uldap_rebind_add(ldc) apr_ldap_rebind_add((ldc)->rebind_pool, \
+                                                  (ldc)->ldap, (ldc)->binddn, \
+                                                  (ldc)->bindpw)
+#endif
+ 
+ 
+ /* ------------------------------------------------------------------ */
+@@ -181,6 +213,13 @@ static apr_status_t uldap_connection_unbind(void *param)
+     util_ldap_connection_t *ldc = param;
+ 
+     if (ldc) {
+#ifdef USE_APR_LDAP_REBIND
+        /* forget the rebind info for this conn */
+        if (ldc->ChaseReferrals == AP_LDAP_CHASEREFERRALS_ON) {
+            apr_pool_clear(ldc->rebind_pool);
+        }
+#endif
+
+         if (ldc->ldap) {
+             if (ldc->r) { 
+                 ap_log_rerror(APLOG_MARK, APLOG_TRACE5, 0, ldc->r, "LDC %pp unbind", ldc); 
+@@ -189,12 +228,6 @@ static apr_status_t uldap_connection_unbind(void *param)
+             ldc->ldap = NULL;
+         }
+         ldc->bound = 0;
+-
+-        /* forget the rebind info for this conn */
+-        if (ldc->ChaseReferrals == AP_LDAP_CHASEREFERRALS_ON) {
+-            apr_ldap_rebind_remove(ldc->ldap);
+-            apr_pool_clear(ldc->rebind_pool);
+-        }
+     }
+ 
+     return APR_SUCCESS;
+@@ -330,7 +363,7 @@ static int uldap_connection_init(request_rec *r,
+ 
+     if (ldc->ChaseReferrals == AP_LDAP_CHASEREFERRALS_ON) {
+         /* Now that we have an ldap struct, add it to the referral list for rebinds. */
+-        rc = apr_ldap_rebind_add(ldc->rebind_pool, ldc->ldap, ldc->binddn, ldc->bindpw);
+        rc = uldap_rebind_add(ldc);
+         if (rc != APR_SUCCESS) {
+             ap_log_error(APLOG_MARK, APLOG_ERR, rc, r->server, APLOGNO(01277)
+                     "LDAP: Unable to add rebind cross reference entry. Out of memory?");
+@@ -856,6 +889,7 @@ static util_ldap_connection_t *
+         /* whether or not to keep this connection in the pool when it's returned */
+         l->keep = (st->connection_pool_ttl == 0) ? 0 : 1;
+ 
+#ifdef USE_APR_LDAP_REBIND
+         if (l->ChaseReferrals == AP_LDAP_CHASEREFERRALS_ON) {
+             if (apr_pool_create(&(l->rebind_pool), l->pool) != APR_SUCCESS) {
+                 ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, APLOGNO(01286)
+@@ -867,6 +901,7 @@ static util_ldap_connection_t *
+             }
+             apr_pool_tag(l->rebind_pool, "util_ldap_rebind");
+         }
+#endif
+ 
+         if (p) {
+             p->next = l;
+@@ -3054,7 +3089,7 @@ static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog,
+     }
+ 
+     /* Initialize the rebind callback's cross reference list. */
+-    apr_ldap_rebind_init (p);
+    (void) uldap_rebind_init(p);
+ 
+ #ifdef AP_LDAP_OPT_DEBUG
+     if (st->debug_level > 0) {
--- a/httpd-2.4.51-r1894152.patch
+++ b/httpd-2.4.51-r1894152.patch
@ -0,0 +1,36 @@
+# ./pullrev.sh 1894152
+http://svn.apache.org/viewvc?view=revision&revision=1894152
+
+--- httpd-2.4.51/modules/filters/mod_deflate.c.r1894152
+++ httpd-2.4.51/modules/filters/mod_deflate.c
+@@ -835,6 +835,7 @@
+     while (!APR_BRIGADE_EMPTY(bb))
+     {
+         apr_bucket *b;
+        apr_status_t rv;
+ 
+         /*
+          * Optimization: If we are a HEAD request and bytes_sent is not zero
+@@ -914,8 +915,6 @@
+         }
+ 
+         if (APR_BUCKET_IS_FLUSH(e)) {
+-            apr_status_t rv;
+-
+             /* flush the remaining data from the zlib buffers */
+             zRC = flush_libz_buffer(ctx, c, f->c->bucket_alloc, deflate,
+                                     Z_SYNC_FLUSH, NO_UPDATE_CRC);
+@@ -947,7 +946,12 @@
+         }
+ 
+         /* read */
+-        apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
+        rv = apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
+        if (rv) {
+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10298)
+                          "failed reading from %s bucket", e->type->name);
+            return rv;
+        }
+         if (!len) {
+             apr_bucket_delete(e);
+             continue;
--- a/httpd-2.4.53-export.patch
+++ b/httpd-2.4.53-export.patch
@ -1,6 +1,3 @@
-
-Upstream-Status: r1861685 in trunk, not proposed for 2.4.x
-
 diff --git a/Makefile.in b/Makefile.in
 index bd8045c..d6733a5 100644
 --- a/Makefile.in
--- a/httpd-2.4.54-icons.patch
+++ b/httpd-2.4.54-icons.patch
@ -1,49 +0,0 @@
-diff --git a/docs/conf/extra/httpd-autoindex.conf.in b/docs/conf/extra/httpd-autoindex.conf.in
-index 51b02ed..93a2b87 100644
--- a/docs/conf/extra/httpd-autoindex.conf.in
-+++ b/docs/conf/extra/httpd-autoindex.conf.in
-@@ -21,7 +21,7 @@ IndexOptions FancyIndexing HTMLTable VersionSort
- Alias /icons/ "@exp_iconsdir@/"
- 
- <Directory "@exp_iconsdir@">
-    Options Indexes MultiViews
-+    Options Indexes MultiViews FollowSymlinks
-     AllowOverride None
-     Require all granted
- </Directory>
-@@ -37,6 +37,7 @@ AddIconByType (TXT,/icons/text.gif) text/*
- AddIconByType (IMG,/icons/image2.gif) image/*
- AddIconByType (SND,/icons/sound2.gif) audio/*
- AddIconByType (VID,/icons/movie.gif) video/*
-+AddIconByType /icons/bomb.gif application/x-coredump
- 
- AddIcon /icons/binary.gif .bin .exe
- AddIcon /icons/binhex.gif .hqx
-@@ -53,7 +54,6 @@ AddIcon /icons/dvi.gif .dvi
- AddIcon /icons/uuencoded.gif .uu
- AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
- AddIcon /icons/tex.gif .tex
-AddIcon /icons/bomb.gif core
- 
- AddIcon /icons/back.gif ..
- AddIcon /icons/hand.right.gif README
-diff --git a/docs/conf/magic b/docs/conf/magic
-index bc891d9..9a41b44 100644
--- a/docs/conf/magic
-+++ b/docs/conf/magic
-@@ -383,3 +383,15 @@
- 4   string      moov        video/quicktime
- 4   string      mdat        video/quicktime
- 
-+
-+#------------------------------------------------------------------------------
-+# application/x-coredump for LE/BE ELF
-+#
-+0       string          \177ELF
-+>5      byte            1
-+>16     leshort         4               application/x-coredump
-+
-+0       string          \177ELF
-+>5      byte            2
-+>16     beshort         4               application/x-coredump
-+
--- a/httpd-2.4.54-selinux.patch
+++ b/httpd-2.4.54-selinux.patch
@ -0,0 +1,60 @@
+diff --git a/configure.in b/configure.in
+index 74015ca..8c0ee10 100644
+--- a/configure.in
+++ b/configure.in
+@@ -508,6 +508,11 @@ getloadavg
+ dnl confirm that a void pointer is large enough to store a long integer
+ APACHE_CHECK_VOID_PTR_LEN
+ 
+AC_CHECK_LIB(selinux, is_selinux_enabled, [
+   AC_DEFINE(HAVE_SELINUX, 1, [Defined if SELinux is supported])
+   APR_ADDTO(HTTPD_LIBS, [-lselinux])
+])
+
+ AC_CACHE_CHECK([for gettid()], ac_cv_gettid,
+ [AC_TRY_RUN(#define _GNU_SOURCE
+ #include <unistd.h>
+diff --git a/server/core.c b/server/core.c
+index a6fa2fb..cf4cba4 100644
+--- a/server/core.c
+++ b/server/core.c
+@@ -65,6 +65,10 @@
+ #include <unistd.h>
+ #endif
+ 
+#ifdef HAVE_SELINUX
+#include <selinux/selinux.h>
+#endif
+
+ /* LimitRequestBody handling */
+ #define AP_LIMIT_REQ_BODY_UNSET         ((apr_off_t) -1)
+ #define AP_DEFAULT_LIMIT_REQ_BODY       ((apr_off_t) 1<<30) /* 1GB */
+@@ -5150,6 +5154,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
+     }
+ #endif
+ 
+#ifdef HAVE_SELINUX
+    {
+        static int already_warned = 0;
+        int is_enabled = is_selinux_enabled() > 0;
+        
+        if (is_enabled && !already_warned) {
+            security_context_t con;
+            
+            if (getcon(&con) == 0) {
+                
+                ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
+                             "SELinux policy enabled; "
+                             "httpd running as context %s", con);
+                
+                already_warned = 1;
+                
+                freecon(con);
+            }
+        }
+    }
+#endif
+
+     return OK;
+ }
+ 
--- a/httpd-2.4.63-r1912477+.patch
+++ b/httpd-2.4.63-r1912477+.patch
@ -1,383 +0,0 @@
-# ./pullrev.sh 1912477 1912571 1912718 1913654 1914438
-http://svn.apache.org/viewvc?view=revision&revision=1912477
-http://svn.apache.org/viewvc?view=revision&revision=1912571
-http://svn.apache.org/viewvc?view=revision&revision=1912718
-http://svn.apache.org/viewvc?view=revision&revision=1913654
-http://svn.apache.org/viewvc?view=revision&revision=1914438
-
-Upstream-Status: in trunk, not proposed for 2.4.x
-
-diff --git a/modules/dav/fs/config6.m4 b/modules/dav/fs/config6.m4
-index dd26ec8..72fff9a 100644
--- a/modules/dav/fs/config6.m4
-+++ b/modules/dav/fs/config6.m4
-@@ -20,4 +20,10 @@ esac
- 
- APACHE_MODULE(dav_fs, DAV provider for the filesystem.  --enable-dav also enables mod_dav_fs., $dav_fs_objects, , $dav_fs_enable,,dav)
- 
-+if test "x$enable_dav_fs" = "xshared"; then
-+    # The only symbol which needs to be exported is the module
-+    # structure, so ask libtool to hide everything else:
-+    APR_ADDTO(MOD_DAV_FS_LDADD, [-export-symbols-regex dav_fs_module])
-+fi
-+
- APACHE_MODPATH_FINISH
-diff --git a/modules/dav/fs/dbm.c b/modules/dav/fs/dbm.c
-index 39ab4ad..4551f70 100644
--- a/modules/dav/fs/dbm.c
-+++ b/modules/dav/fs/dbm.c
-@@ -47,6 +47,10 @@
- #include "http_log.h"
- #include "http_main.h"      /* for ap_server_conf */
- 
-+#ifndef DEFAULT_PROPDB_DBM_TYPE
-+#define DEFAULT_PROPDB_DBM_TYPE "default"
-+#endif
-+
- APLOG_USE_MODULE(dav_fs);
- 
- struct dav_db {
-@@ -129,10 +133,10 @@ void dav_fs_ensure_state_dir(apr_pool_t * p, const char *dirname)
- /* dav_dbm_open_direct:  Opens a *dbm database specified by path.
-  *    ro = boolean read-only flag.
-  */
-dav_error * dav_dbm_open_direct(apr_pool_t *p, const char *pathname, int ro,
-                                dav_db **pdb)
-+dav_error * dav_dbm_open_direct(apr_pool_t *p, const char *pathname,
-+                                const char *dbmtype, int ro, dav_db **pdb)
- {
-#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
-+#if APR_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
-     const apr_dbm_driver_t *driver;
-     const apu_err_t *err;
- #endif
-@@ -141,11 +145,12 @@ dav_error * dav_dbm_open_direct(apr_pool_t *p, const char *pathname, int ro,
- 
-     *pdb = NULL;
- 
-#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
-    if ((status = apr_dbm_get_driver(&driver, NULL, &err, p)) != APR_SUCCESS) {
-+#if APR_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
-+    if ((status = apr_dbm_get_driver(&driver, dbmtype, &err, p)) != APR_SUCCESS) {
-+
-         ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, APLOGNO(10289)
-                     "mod_dav_fs: The DBM library '%s' could not be loaded: %s",
-                             err->reason, err->msg);
-+                     "mod_dav_fs: The DBM library '%s' for '%s' could not be loaded: %s",
-+                     err->reason, dbmtype, err->msg);
-         return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 1, status,
-                 "Could not load library for database.");
-     }
-@@ -156,7 +161,7 @@ dav_error * dav_dbm_open_direct(apr_pool_t *p, const char *pathname, int ro,
-         return dav_fs_dbm_error(NULL, p, status);
-     }
- #else
-    if ((status = apr_dbm_open(&file, pathname,
-+    if ((status = apr_dbm_open_ex(&file, dbmtype, pathname,
-                                ro ? APR_DBM_READONLY : APR_DBM_RWCREATE,
-                                APR_OS_DEFAULT, p))
-                 != APR_SUCCESS
-@@ -206,7 +211,7 @@ static dav_error * dav_dbm_open(apr_pool_t * p, const dav_resource *resource,
- 
-     /* ### do we need to deal with the umask? */
- 
-    return dav_dbm_open_direct(p, pathname, ro, pdb);
-+    return dav_dbm_open_direct(p, pathname, DEFAULT_PROPDB_DBM_TYPE, ro, pdb);
- }
- 
- void dav_dbm_close(dav_db *db)
-diff --git a/modules/dav/fs/lock.c b/modules/dav/fs/lock.c
-index ef18c4a..29d167d 100644
--- a/modules/dav/fs/lock.c
-+++ b/modules/dav/fs/lock.c
-@@ -181,8 +181,7 @@ struct dav_lockdb_private
- {
-     request_rec *r;                  /* for accessing the uuid state */
-     apr_pool_t *pool;                /* a pool to use */
-    const char *lockdb_path;         /* where is the lock database? */
-
-+    const dav_fs_server_conf *conf;  /* lock database config & metadata */
-     int opened;                      /* we opened the database */
-     dav_db *db;                      /* if non-NULL, the lock database */
- };
-@@ -292,6 +291,19 @@ static int dav_fs_compare_locktoken(
-     return dav_compare_locktoken(lt1, lt2);
- }
- 
-+static apr_status_t dav_fs_lockdb_cleanup(void *data)
-+{
-+    dav_lockdb *lockdb = data;
-+
-+    apr_global_mutex_unlock(lockdb->info->conf->lockdb_mutex);
-+
-+    if (lockdb->info->db) {
-+        dav_dbm_close(lockdb->info->db);
-+    }
-+    
-+    return APR_SUCCESS;
-+}
-+
- /*
- ** dav_fs_really_open_lockdb:
- **
-@@ -300,15 +312,27 @@ static int dav_fs_compare_locktoken(
- static dav_error * dav_fs_really_open_lockdb(dav_lockdb *lockdb)
- {
-     dav_error *err;
-+    apr_status_t rv;
- 
-     if (lockdb->info->opened)
-         return NULL;
- 
-+    rv = apr_global_mutex_lock(lockdb->info->conf->lockdb_mutex);
-+    if (rv) {
-+        return dav_new_error(lockdb->info->pool,
-+                             HTTP_INTERNAL_SERVER_ERROR,
-+                             DAV_ERR_LOCK_OPENDB, rv,
-+                             "Could not lock mutex for lock database.");
-+    }
-+    
-     err = dav_dbm_open_direct(lockdb->info->pool,
-                              lockdb->info->lockdb_path,
-+                              lockdb->info->conf->lockdb_path,
-+                              lockdb->info->conf->lockdb_type,
-                               lockdb->ro,
-                               &lockdb->info->db);
-     if (err != NULL) {
-+        apr_global_mutex_unlock(lockdb->info->conf->lockdb_mutex);
-+        
-         return dav_push_error(lockdb->info->pool,
-                               HTTP_INTERNAL_SERVER_ERROR,
-                               DAV_ERR_LOCK_OPENDB,
-@@ -316,6 +340,10 @@ static dav_error * dav_fs_really_open_lockdb(dav_lockdb *lockdb)
-                               err);
-     }
- 
-+    apr_pool_cleanup_register(lockdb->info->pool, lockdb,
-+                              dav_fs_lockdb_cleanup,
-+                              dav_fs_lockdb_cleanup);
-+
-     /* all right. it is opened now. */
-     lockdb->info->opened = 1;
- 
-@@ -341,9 +369,9 @@ static dav_error * dav_fs_open_lockdb(request_rec *r, int ro, int force,
-     comb->pub.info = &comb->priv;
-     comb->priv.r = r;
-     comb->priv.pool = r->pool;
-
-    comb->priv.lockdb_path = dav_get_lockdb_path(r);
-    if (comb->priv.lockdb_path == NULL) {
-+    comb->priv.conf = dav_fs_get_server_conf(r);
-+    
-+    if (comb->priv.conf == NULL || comb->priv.conf->lockdb_path == NULL) {
-         return dav_new_error(r->pool, HTTP_INTERNAL_SERVER_ERROR,
-                              DAV_ERR_LOCK_NO_DB, 0,
-                              "A lock database was not specified with the "
-@@ -369,8 +397,8 @@ static dav_error * dav_fs_open_lockdb(request_rec *r, int ro, int force,
- */
- static void dav_fs_close_lockdb(dav_lockdb *lockdb)
- {
-    if (lockdb->info->db != NULL)
-        dav_dbm_close(lockdb->info->db);
-+    apr_pool_cleanup_run(lockdb->info->pool, lockdb,
-+                         dav_fs_lockdb_cleanup);
- }
- 
- /*
-diff --git a/modules/dav/fs/mod_dav_fs.c b/modules/dav/fs/mod_dav_fs.c
-index 2389f8f..4bf6c51 100644
--- a/modules/dav/fs/mod_dav_fs.c
-+++ b/modules/dav/fs/mod_dav_fs.c
-@@ -14,31 +14,35 @@
-  * limitations under the License.
-  */
- 
-+#if !defined(_MSC_VER) && !defined(NETWARE)
-+#include "ap_config_auto.h"
-+#endif
-+
- #include "httpd.h"
- #include "http_config.h"
-+#include "http_core.h"
-+#include "http_log.h"
- #include "apr_strings.h"
- 
- #include "mod_dav.h"
- #include "repos.h"
- 
-/* per-server configuration */
-typedef struct {
-    const char *lockdb_path;
-
-} dav_fs_server_conf;
-
- extern module AP_MODULE_DECLARE_DATA dav_fs_module;
- 
- #ifndef DEFAULT_DAV_LOCKDB
- #define DEFAULT_DAV_LOCKDB "davlockdb"
- #endif
-+#ifndef DEFAULT_DAV_LOCKDB_TYPE
-+#define DEFAULT_DAV_LOCKDB_TYPE "default"
-+#endif
- 
-const char *dav_get_lockdb_path(const request_rec *r)
-{
-    dav_fs_server_conf *conf;
-+static const char dav_fs_mutexid[] = "dav_fs-lockdb";
- 
-    conf = ap_get_module_config(r->server->module_config, &dav_fs_module);
-    return conf->lockdb_path;
-+static apr_global_mutex_t *dav_fs_lockdb_mutex;
-+
-+const dav_fs_server_conf *dav_fs_get_server_conf(const request_rec *r)
-+{
-+    return ap_get_module_config(r->server->module_config, &dav_fs_module);
- }
- 
- static void *dav_fs_create_server_config(apr_pool_t *p, server_rec *s)
-@@ -57,15 +61,50 @@ static void *dav_fs_merge_server_config(apr_pool_t *p,
- 
-     newconf->lockdb_path =
-         child->lockdb_path ? child->lockdb_path : parent->lockdb_path;
-+    newconf->lockdb_type =
-+        child->lockdb_type ? child->lockdb_type : parent->lockdb_type;
- 
-     return newconf;
- }
- 
-+static int dav_fs_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp)
-+{
-+    if (ap_mutex_register(pconf, dav_fs_mutexid, NULL, APR_LOCK_DEFAULT, 0))
-+        return !OK;
-+    return OK;
-+}
-+
-+static void dav_fs_child_init(apr_pool_t *p, server_rec *s)
-+{
-+    apr_status_t rv;
-+    
-+    rv = apr_global_mutex_child_init(&dav_fs_lockdb_mutex,
-+                                     apr_global_mutex_lockfile(dav_fs_lockdb_mutex),
-+                                     p);
-+    if (rv) {
-+        ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
-+                     APLOGNO(10488) "child init failed for mutex");
-+    }                     
-+}
-+
- static apr_status_t dav_fs_post_config(apr_pool_t *p, apr_pool_t *plog,
-                                        apr_pool_t *ptemp, server_rec *base_server)
- {
-     server_rec *s;
-
-+    apr_status_t rv;
-+
-+    /* Ignore first pass through the config. */
-+    if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG)
-+        return OK;
-+
-+    rv = ap_global_mutex_create(&dav_fs_lockdb_mutex, NULL, dav_fs_mutexid, NULL,
-+                                base_server, p, 0);
-+    if (rv) {
-+        ap_log_error(APLOG_MARK, APLOG_ERR, rv, base_server,
-+                     APLOGNO(10489) "could not create lock mutex");
-+        return !OK;
-+    }                     
-+    
-     for (s = base_server; s; s = s->next) {
-         dav_fs_server_conf *conf;
- 
-@@ -74,6 +113,13 @@ static apr_status_t dav_fs_post_config(apr_pool_t *p, apr_pool_t *plog,
-         if (!conf->lockdb_path) {
-             conf->lockdb_path = ap_state_dir_relative(p, DEFAULT_DAV_LOCKDB);
-         }
-+        if (!conf->lockdb_type) {
-+            conf->lockdb_type = DEFAULT_DAV_LOCKDB_TYPE;
-+        }
-+
-+        /* Mutex is common across all vhosts, but could have one per
-+         * vhost if required. */
-+        conf->lockdb_mutex = dav_fs_lockdb_mutex;
-     }
- 
-     return OK;
-@@ -98,19 +144,36 @@ static const char *dav_fs_cmd_davlockdb(cmd_parms *cmd, void *config,
-     return NULL;
- }
- 
-+/*
-+ * Command handler for the DAVLockDBType directive, which is TAKE1
-+ */
-+static const char *dav_fs_cmd_davlockdbtype(cmd_parms *cmd, void *config,
-+                                        const char *arg1)
-+{
-+    dav_fs_server_conf *conf = ap_get_module_config(cmd->server->module_config,
-+                                                    &dav_fs_module);
-+    conf->lockdb_type = arg1;
-+
-+    return NULL;
-+}
-+
- static const command_rec dav_fs_cmds[] =
- {
-     /* per server */
-     AP_INIT_TAKE1("DAVLockDB", dav_fs_cmd_davlockdb, NULL, RSRC_CONF,
-                   "specify a lock database"),
-+    AP_INIT_TAKE1("DAVLockDBType", dav_fs_cmd_davlockdbtype, NULL, RSRC_CONF,
-+                  "specify a lock database DBM type"),
- 
-     { NULL }
- };
- 
- static void register_hooks(apr_pool_t *p)
- {
-+    ap_hook_pre_config(dav_fs_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
-     ap_hook_post_config(dav_fs_post_config, NULL, NULL, APR_HOOK_MIDDLE);
-
-+    ap_hook_child_init(dav_fs_child_init, NULL, NULL, APR_HOOK_MIDDLE);
-+    
-     dav_hook_gather_propsets(dav_fs_gather_propsets, NULL, NULL,
-                              APR_HOOK_MIDDLE);
-     dav_hook_find_liveprop(dav_fs_find_liveprop, NULL, NULL, APR_HOOK_MIDDLE);
-diff --git a/modules/dav/fs/repos.h b/modules/dav/fs/repos.h
-index b164611..d3a55a5 100644
--- a/modules/dav/fs/repos.h
-+++ b/modules/dav/fs/repos.h
-@@ -25,6 +25,8 @@
- #ifndef _DAV_FS_REPOS_H_
- #define _DAV_FS_REPOS_H_
- 
-+#include "util_mutex.h"
-+
- /* the subdirectory to hold all DAV-related information for a directory */
- #define DAV_FS_STATE_DIR                ".DAV"
- #define DAV_FS_STATE_FILE_FOR_DIR       ".state_for_dir"
-@@ -53,8 +55,8 @@ dav_error * dav_fs_get_locknull_members(const dav_resource *resource,
- /* DBM functions used by the repository and locking providers */
- extern const dav_hooks_db dav_hooks_db_dbm;
- 
-dav_error * dav_dbm_open_direct(apr_pool_t *p, const char *pathname, int ro,
-                                dav_db **pdb);
-+dav_error * dav_dbm_open_direct(apr_pool_t *p, const char *pathname,
-+                                const char *dbmtype, int ro, dav_db **pdb);
- void dav_dbm_get_statefiles(apr_pool_t *p, const char *fname,
-                             const char **state1, const char **state2);
- dav_error * dav_dbm_delete(dav_db *db, apr_datum_t key);
-@@ -64,8 +66,15 @@ void dav_dbm_freedatum(dav_db *db, apr_datum_t data);
- int dav_dbm_exists(dav_db *db, apr_datum_t key);
- void dav_dbm_close(dav_db *db);
- 
-/* where is the lock database located? */
-const char *dav_get_lockdb_path(const request_rec *r);
-+/* Per-server configuration. */
-+typedef struct {
-+    const char *lockdb_path;
-+    const char *lockdb_type;
-+    apr_global_mutex_t *lockdb_mutex;
-+} dav_fs_server_conf;
-+
-+/* Returns server configuration for the request. */
-+const dav_fs_server_conf *dav_fs_get_server_conf(const request_rec *r);
- 
- const dav_hooks_locks *dav_fs_get_lock_hooks(request_rec *r);
- const dav_hooks_propdb *dav_fs_get_propdb_hooks(request_rec *r);
--- a/httpd-2.4.64-separate-systemd-fns.patch
+++ b/httpd-2.4.64-separate-systemd-fns.patch
@ -1,101 +0,0 @@
-diff --git a/acinclude.m4 b/acinclude.m4
-index 05abe18..97484c9 100644
--- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -631,7 +631,6 @@ case $host in
-       if test "${ac_cv_header_systemd_sd_daemon_h}" = "no" || test -z "${SYSTEMD_LIBS}"; then
-         AC_MSG_WARN([Your system does not support systemd.])
-       else
-        APR_ADDTO(HTTPD_LIBS, [$SYSTEMD_LIBS])
-         AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is supported])
-       fi
-    fi
-diff --git a/modules/arch/unix/mod_systemd.c b/modules/arch/unix/mod_systemd.c
-index af68249..7232a45 100644
--- a/modules/arch/unix/mod_systemd.c
-+++ b/modules/arch/unix/mod_systemd.c
-@@ -40,6 +40,9 @@
- #include <unistd.h>
- #endif
- 
-+APR_DECLARE_OPTIONAL_FN(int,
-+                        ap_systemd_journal_stream_fd, (const char *, int, int));
-+
- static char describe_listeners[30];
- 
- static int systemd_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
-@@ -217,10 +220,15 @@ static int ap_systemd_listen_fds(int unset_environment){
-     return sd_listen_fds(unset_environment);
- }
- 
-+static int ap_systemd_journal_stream_fd(const char *identifier, int priority, int level_prefix){
-+    return sd_journal_stream_fd("httpd", priority, 0);
-+}
-+
- static void systemd_register_hooks(apr_pool_t *p)
- {
-     APR_REGISTER_OPTIONAL_FN(ap_systemd_listen_fds);
-     APR_REGISTER_OPTIONAL_FN(ap_find_systemd_socket);
-+    APR_REGISTER_OPTIONAL_FN(ap_systemd_journal_stream_fd);
- 
-     /* Enable ap_extended_status. */
-     ap_hook_pre_config(systemd_pre_config, NULL, NULL, APR_HOOK_LAST);
-diff --git a/modules/loggers/config.m4 b/modules/loggers/config.m4
-index 0848d2e..8af2299 100644
--- a/modules/loggers/config.m4
-+++ b/modules/loggers/config.m4
-@@ -5,7 +5,6 @@ dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
- APACHE_MODPATH_INIT(loggers)
- 	
- APACHE_MODULE(log_config, logging configuration.  You won't be able to log requests to the server without this module., , , yes)
-APR_ADDTO(MOD_LOG_CONFIG_LDADD, [$SYSTEMD_LIBS])
- 
- APACHE_MODULE(log_debug, configurable debug logging, , , most)
- APACHE_MODULE(log_forensic, forensic logging)
-diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
-index 694f447..a65b982 100644
--- a/modules/loggers/mod_log_config.c
-+++ b/modules/loggers/mod_log_config.c
-@@ -172,10 +172,6 @@
- #include <limits.h>
- #endif
- 
-#ifdef HAVE_SYSTEMD
-#include <systemd/sd-journal.h>
-#endif
-
- #define DEFAULT_LOG_FORMAT "%h %l %u %t \"%r\" %>s %b"
- 
- module AP_MODULE_DECLARE_DATA log_config_module;
-@@ -1640,8 +1636,15 @@ static apr_status_t wrap_journal_stream(apr_pool_t *p, apr_file_t **outfd,
- {
- #ifdef HAVE_SYSTEMD
-     int fd;
-+    APR_OPTIONAL_FN_TYPE(ap_systemd_journal_stream_fd) *systemd_journal_stream_fd;
-+    
-+    systemd_journal_stream_fd = APR_RETRIEVE_OPTIONAL_FN(ap_systemd_journal_stream_fd);
-+    if (systemd_journal_stream_fd == NULL) {
-+        return APR_ENOTIMPL;
-+    }
- 
-    fd = sd_journal_stream_fd("httpd", priority, 0);
-+    fd = systemd_journal_stream_fd("httpd", priority, 0);
-+    
-     if (fd < 0) return fd;
- 
-     /* This is an AF_UNIX socket fd so is more pipe-like than
-diff --git a/modules/loggers/mod_log_config.h b/modules/loggers/mod_log_config.h
-index 877a593..bd52a98 100644
--- a/modules/loggers/mod_log_config.h
-+++ b/modules/loggers/mod_log_config.h
-@@ -69,6 +69,10 @@ APR_DECLARE_OPTIONAL_FN(ap_log_writer_init*, ap_log_set_writer_init,(ap_log_writ
-  */
- APR_DECLARE_OPTIONAL_FN(ap_log_writer*, ap_log_set_writer, (ap_log_writer* func));
- 
-+#ifdef HAVE_SYSTEMD
-+APR_DECLARE_OPTIONAL_FN(int, ap_systemd_journal_stream_fd, (const char *, int, int));
-+#endif
-+
- #endif /* MOD_LOG_CONFIG */
- /** @} */
- 
--- a/httpd-2.4.65-hcheck-stuck.patch
+++ b/httpd-2.4.65-hcheck-stuck.patch
@ -1,66 +0,0 @@
--- a/modules/proxy/mod_proxy_hcheck.c
-+++ b/modules/proxy/mod_proxy_hcheck.c
-@@ -989,12 +989,30 @@ static apr_status_t hc_watchdog_callback(int state
-     sctx_t *ctx = (sctx_t *)data;
-     server_rec *s = ctx->s;
-     proxy_server_conf *conf;
-+    proxy_worker **workers;
-+    proxy_worker *worker;
-+    apr_time_t now;
-+    int i, n;
- 
-+    conf = (proxy_server_conf *) ap_get_module_config(s->module_config, &proxy_module);
-+    balancer = (proxy_balancer *)conf->balancers->elts;
-+
-     switch (state) {
-         case AP_WATCHDOG_STATE_STARTING:
-             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03258)
-                          "%s watchdog started.",
-                          HCHECK_WATHCHDOG_NAME);
-+            /* set last update time for all workers */
-+            now = apr_time_now();
-+            for (i = 0; i < conf->balancers->nelts; i++, balancer++) {
-+                workers = (proxy_worker **)balancer->workers->elts;
-+                for (n = 0; n < balancer->workers->nelts; n++, ++workers) {
-+                    worker = *workers;
-+                    if (worker->s->updated == 0) {
-+                        worker->s->updated = now;
-+                    }
-+                }
-+            }
- #if HC_USE_THREADS
-             if (tpsize && hctp == NULL) {
-                 rv =  apr_thread_pool_create(&hctp, tpsize,
-@@ -1020,21 +1038,13 @@ static apr_status_t hc_watchdog_callback(int state
- 
-         case AP_WATCHDOG_STATE_RUNNING:
-             /* loop thru all workers */
-            if (s) {
-                int i;
-                conf = (proxy_server_conf *) ap_get_module_config(s->module_config, &proxy_module);
-                balancer = (proxy_balancer *)conf->balancers->elts;
-                ctx->s = s;
-+            {
-+                now = apr_time_now();
-                 for (i = 0; i < conf->balancers->nelts; i++, balancer++) {
-                    int n;
-                    apr_time_t now;
-                    proxy_worker **workers;
-                    proxy_worker *worker;
-                     /* Have any new balancers or workers been added dynamically? */
-                     ap_proxy_sync_balancer(balancer, s, conf);
-                     workers = (proxy_worker **)balancer->workers->elts;
-                    now = apr_time_now();
-                    for (n = 0; n < balancer->workers->nelts; n++) {
-+                    for (n = 0; n < balancer->workers->nelts; n++, workers++) {
-                         worker = *workers;
-                         if (!PROXY_WORKER_IS(worker, PROXY_WORKER_STOPPED) &&
-                             (worker->s->method != NONE) &&
-@@ -1074,7 +1084,6 @@ static apr_status_t hc_watchdog_callback(int state
-                                 hc_check(NULL, baton);
-                             }
-                         }
-                        workers++;
-                     }
-                 }
-             }
--- a/httpd-init.service
+++ b/httpd-init.service
@ -8,6 +8,5 @@ ConditionPathExists=|!/etc/pki/tls/private/localhost.key
 [Service]
 Type=oneshot
 RemainAfterExit=no
-PrivateTmp=true

 ExecStart=/usr/libexec/httpd-ssl-gencerts
--- a/1
+++ b/1
@ -33,7 +33,6 @@ sscg -q                                                             \
     --cert-file           /etc/pki/tls/certs/localhost.crt         \
     --cert-key-file       /etc/pki/tls/private/localhost.key       \
     --ca-file             /etc/pki/tls/certs/localhost.crt         \
-     --no-dhparams-file                                             \
     --lifetime            365                                      \
     --hostname            $FQDN                                    \
     --email               root@$FQDN
--- a/httpd.conf
+++ b/httpd.conf
@ -151,7 +151,7 @@ DocumentRoot "/var/www/html"
    #
    # AllowOverride controls what directives may be placed in .htaccess files.
    # It can be "All", "None", or any combination of the keywords:
-    #   AllowOverride FileInfo AuthConfig Limit
+    #   Options FileInfo AuthConfig Limit
    #
    AllowOverride None

@ -199,7 +199,6 @@ LogLevel warn
    # a CustomLog directive (see below).
    #
    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" PID: %P %{tid}P %T" combined_ext
    LogFormat "%h %l %u %t \"%r\" %>s %b" common

    <IfModule logio_module>
@ -217,11 +216,10 @@ LogLevel warn
    #CustomLog "logs/access_log" common

    #
-    # If you prefer a logfile with access, agent, referer, and process/thread
-    # information (an extended Combined Logfile Format), you can use the
-    # following directive.
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
    #
-    CustomLog "logs/access_log" combined_ext
+    CustomLog "logs/access_log" combined
 </IfModule>

 <IfModule alias_module>
@ -265,15 +263,6 @@ LogLevel warn
    Require all granted
 </Directory>

-<IfModule headers_module>
-    #
-    # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
-    # backend servers which have lingering "httpoxy" defects.
-    # 'Proxy' request header is undefined by the IETF, not listed by IANA
-    #
-    RequestHeader unset Proxy early
-</IfModule>
-
 <IfModule mime_module>
    #
    # TypesConfig points to the file containing the list of mappings from
@ -351,13 +340,6 @@ AddDefaultCharset UTF-8
 #ErrorDocument 402 http://www.example.com/subscription_info.html
 #

-#
-# MaxRanges: Maximum number of Ranges in a request before
-# returning the entire resource, or one of the special
-# values 'default', 'none' or 'unlimited'.
-# Default setting is to accept 200 Ranges.
-#MaxRanges unlimited
-
 #
 # EnableMMAP and EnableSendfile: On systems that support it, 
 # memory-mapping or the sendfile syscall may be used to deliver
--- a/httpd.conf.xml
+++ b/httpd.conf.xml
@ -241,11 +241,6 @@
      <filename>/etc/httpd/conf.modules.d</filename>
    </para>
  </refsect1>
-
-  <refsect1>
-    <title>Reporting Bugs</title>
-    <para>Please report bugs by filing an issue in @BUG_REPORT_URL@.</para>
-  </refsect1>
  
  <refsect1>
    <title>See also</title>
--- a/httpd.service
+++ b/httpd.service
@ -26,25 +26,8 @@ ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
 # Send SIGWINCH for graceful stop
 KillSignal=SIGWINCH
 KillMode=mixed
-DevicePolicy=closed
-KeyringMode=private
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-OOMPolicy=continue
-PrivateDevices=yes
 PrivateTmp=true
-ProtectClock=yes
-ProtectControlGroups=yes
-ProtectHome=read-only
-ProtectHostname=yes
-ProtectKernelLogs=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-ProtectSystem=yes
-RestrictNamespaces=yes
-RestrictRealtime=yes
-RestrictSUIDSGID=yes
-SystemCallArchitectures=native
+OOMPolicy=continue

 [Install]
 WantedBy=multi-user.target
--- a/httpd.service.xml
+++ b/httpd.service.xml
@ -175,7 +175,7 @@ Wants=network-online.target</programlisting>
      <para>System packages (including the httpd package itself) may
      restart the httpd service automatically after packages are
      upgraded, installed, or removed. This is done using the
-      <command>systemctl try-restart httpd.service</command> command, which
+      <command>systemctl try-restart httpd.service</command>, which
      stops then starts the service if it is running.</para>

      <para>To disable automatic restarts, create the file
@ -183,9 +183,8 @@ Wants=network-online.target</programlisting>
      When <command>httpd</command> interfaces are added in an update,
      it may not be safe to <emphasis>reload</emphasis> a running
      service after upgrading, if updated modules require interfaces
-      only available in the updated <command>httpd</command> binary.
-      It is recommended to allow automatic restarts for this
-      reason.</para>
+      only available in the updated httpd.  It is recommended to allow
+      automatic restarts for this reason.</para>
    </refsect2>

    <refsect2>
@ -231,16 +230,7 @@ Wants=network-online.target</programlisting>
    <refsect2>
      <title>Process policies and restrictions</title>

-      <para>The <command>httpd.service</command> unit enables a
-      variety of sandboxing options. Many of these prevent the service
-      from changing the system configuration or attributes of the
-      kernel - such as <emphasis>ProtectClock</emphasis> and
-      <emphasis>ProtectKernelModules</emphasis>. See
-      <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-      and
-      <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-      for more information on these options. Particular notice should
-      be taken of the following:
+      <para>The httpd service uses the following options:

      <itemizedlist>
        <listitem><para><emphasis>PrivateTmp</emphasis> is enabled by
@ -256,21 +246,13 @@ Wants=network-online.target</programlisting>
        the policy to <emphasis>continue</emphasis>, httpd will
        continue to run (and recover) if a single child is terminated
        because of excess memory consumption.</para></listitem>
+      </itemizedlist>

-        <listitem><para><emphasis>ProtectHome</emphasis> is set to
-        <emphasis>read-only</emphasis> by default. CGI scripts run via
-        <emphasis>UserDir</emphasis> will not be able modify any
-        content in <filename>/home</filename> by
-        default.</para></listitem>
-
-        <listitem><para><emphasis>ProtectSystem</emphasis> is set to
-        <emphasis>yes</emphasis> by default; this mounts various
-        system paths like <filename>/usr</filename> and
-        <filename>/boot</filename> as read-only by
-        default.</para></listitem>
-
-      </itemizedlist></para>
-
+      See
+      <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+      and
+      <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+      for more information.</para>
    </refsect2>

    <refsect2>
@ -368,12 +350,7 @@ ReloadPropagatedFrom=httpd.service</programlisting>
    <filename>/usr/lib/systemd/system/httpd@.service</filename>,
    <filename>/etc/systemd/systemd/httpd.service.d</filename></para>
  </refsect1>
-
-  <refsect1>
-    <title>Reporting Bugs</title>
-    <para>Please report bugs by filing an issue in @BUG_REPORT_URL@.</para>
-  </refsect1>
-
+  
  <refsect1>
    <title>See also</title>

--- a/httpd.spec
+++ b/httpd.spec
@ -4,33 +4,15 @@
 %define mmn 20120211
 %define mmnisa %{mmn}%{__isa_name}%{__isa_bits}
 %define vstring %(source /etc/os-release; echo ${NAME})
-%define bugurl %(source /etc/os-release; echo ${BUG_REPORT_URL})
 %if 0%{?fedora} > 26 || 0%{?rhel} > 7
 %global mpm event
 %else
 %global mpm prefork
 %endif

-%if 0%{?fedora} > 35 || 0%{?rhel} > 9
-%bcond_without pcre2
-%bcond_with pcre
-%else
-%bcond_with pcre2
-%bcond_without pcre
-%endif
-
-%if 0%{?fedora} > 40 || 0%{?rhel} > 9
-%bcond_with engine
-%else
-%bcond_without engine
-%endif
-
-# Similar issue to https://bugzilla.redhat.com/show_bug.cgi?id=2043092
-%undefine _package_note_flags
-
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.4.66
+Version: 2.4.54
 Release: 1%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@ -70,7 +52,6 @@ Source31: README.confmod
 Source32: httpd.service.xml
 Source33: htcacheclean.service.xml
 Source34: httpd.conf.xml
-Source35: 00-brotli.conf
 Source40: htcacheclean.service
 Source41: htcacheclean.sysconf
 Source42: httpd-init.service
@ -80,7 +61,6 @@ Source45: config.layout
 Source46: apachectl.sh
 Source47: apachectl.xml
 Source48: apache-poweredby.png
-Source49: httpd.sysusers

 # build/scripts patches
 Patch2: httpd-2.4.43-apxs.patch
@ -88,87 +68,60 @@ Patch3: httpd-2.4.43-deplibs.patch
 # Needed for socket activation and mod_systemd patch
 Patch19: httpd-2.4.53-detect-systemd.patch
 # Features/functional changes
-Patch20: httpd-2.4.48-r1842929+.patch
-Patch21: httpd-2.4.64-mod_systemd.patch
-Patch22: httpd-2.4.53-export.patch
-Patch23: httpd-2.4.43-corelimit.patch
-Patch24: httpd-2.4.54-icons.patch
-Patch25: httpd-2.4.43-cachehardmax.patch
-Patch26: httpd-2.4.43-sslciphdefault.patch
-Patch27: httpd-2.4.64-sslprotdefault.patch
-Patch28: httpd-2.4.43-logjournal.patch
-Patch29: httpd-2.4.63-r1912477+.patch
-Patch30: httpd-2.4.64-separate-systemd-fns.patch
+Patch21: httpd-2.4.48-r1842929+.patch
+Patch22: httpd-2.4.43-mod_systemd.patch
+Patch23: httpd-2.4.53-export.patch
+Patch24: httpd-2.4.43-corelimit.patch
+Patch25: httpd-2.4.54-selinux.patch
+Patch26: httpd-2.4.43-gettid.patch
+Patch27: httpd-2.4.43-icons.patch
+Patch30: httpd-2.4.43-cachehardmax.patch
+Patch34: httpd-2.4.43-socket-activation.patch
+Patch38: httpd-2.4.43-sslciphdefault.patch
+Patch39: httpd-2.4.43-sslprotdefault.patch
+Patch40: httpd-2.4.43-r1861269.patch
+Patch41: httpd-2.4.43-r1861793+.patch
+Patch42: httpd-2.4.48-r1828172+.patch
+Patch45: httpd-2.4.43-logjournal.patch

 # Bug fixes
 # https://bugzilla.redhat.com/show_bug.cgi?id=1397243
 Patch60: httpd-2.4.43-enable-sslv3.patch
-Patch61: httpd-2.4.65-hcheck-stuck.patch
+Patch61: httpd-2.4.48-r1878890.patch
+Patch63: httpd-2.4.46-htcacheclean-dont-break.patch
+Patch65: httpd-2.4.51-r1894152.patch

 # Security fixes
-# Patch200: ...
-
-# Apache-2.0: everything
-# BSD-3-Clause: util_pcre.c, ap_regex.h
-# metamail AND HPND-sell-variant:: server/util_md5.c:
-# Spencer-94: modules/metadata/mod_mime_magic.c
-License: Apache-2.0 AND (BSD-3-Clause AND metamail AND HPND-sell-variant AND Spencer-94)

+License: ASL 2.0
 BuildRequires: gcc, autoconf, pkgconfig, findutils, xmlto
 BuildRequires: perl-interpreter, perl-generators, systemd-devel
 BuildRequires: zlib-devel, libselinux-devel, lua-devel, brotli-devel
-BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.5.0
-BuildRequires: openldap-devel
-BuildRequires: systemd-rpm-macros
-BuildRequires: libxcrypt-devel
-%if %{with pcre2}
-BuildRequires: pcre2-devel
-%endif
-%if %{with pcre}
-BuildRequires: pcre-devel > 5.0
-%endif
+BuildRequires: apr-devel >= 1.5.0, apr-util-devel >= 1.5.0, pcre-devel >= 5.0
 BuildRequires: gnupg2
-Requires: system-logos(httpd-logo-ng)
+Requires: /etc/mime.types, system-logos(httpd-logo-ng)
 Provides: webserver
-Requires: httpd-core = 0:%{version}-%{release}
+Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
+Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
+Requires: httpd-tools = %{version}-%{release}
+Requires: httpd-filesystem = %{version}-%{release}
 Recommends: mod_http2, mod_lua
-%{?systemd_requires}
+Requires(pre): httpd-filesystem
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+Requires(post): systemd-units
+Conflicts: apr < 1.5.0-1
+Provides: mod_proxy_uwsgi = %{version}-%{release}
+Obsoletes: mod_proxy_uwsgi < 2.0.17.1-2

 %description
 The Apache HTTP Server is a powerful, efficient, and extensible
 web server.

-%package core
-Summary: httpd minimal core
-Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
-Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
-Provides: mod_proxy_uwsgi = %{version}-%{release}
-Requires: /etc/mime.types
-Requires: httpd-tools = %{version}-%{release}
-Requires: httpd-filesystem = %{version}-%{release}
-%if 0%{?fedora} > 39 || 0%{?rhel} > 9
-Requires: apr-util-1(dbm)%{_isa}
-%endif
-Requires(pre): httpd-filesystem
-Conflicts: apr < 1.5.0-1
-Conflicts: httpd < 2.4.53-2
-Obsoletes: mod_proxy_uwsgi < 2.0.17.1-2
-
-# Compat symlinks for Requires in other packages.
-%if "%{_sbindir}" == "%{_bindir}"
-# We rely on filesystem to create the symlink for us.
-Requires:           filesystem(unmerged-sbin-symlinks)
-Provides:           /usr/sbin/apachectl
-Provides:           /usr/sbin/httpd
-%endif
-
-%description core
-The httpd-core package contains essential httpd binaries.
-
 %package devel
 Summary: Development interfaces for the Apache HTTP Server
-Requires: apr-devel, apr-util-devel, pkgconfig, libtool
-Requires: httpd-core = 0:%{version}-%{release}
+Requires: apr-devel, apr-util-devel, pkgconfig
+Requires: httpd = %{version}-%{release}

 %description devel
 The httpd-devel package contains the APXS binary and other files
@ -181,7 +134,7 @@ to install this package.

 %package manual
 Summary: Documentation for the Apache HTTP Server
-Requires: httpd-core = 0:%{version}-%{release}
+Requires: httpd = %{version}-%{release}
 BuildArch: noarch

 %description manual
@ -192,7 +145,7 @@ also be found at https://httpd.apache.org/docs/2.4/.
 %package filesystem
 Summary: The basic directory layout for the Apache HTTP Server
 BuildArch: noarch
-%{?sysusers_requires_compat}
+Requires(pre): /usr/sbin/useradd

 %description filesystem
 The httpd-filesystem package contains the basic directory layout
@ -211,8 +164,8 @@ Summary: SSL/TLS module for the Apache HTTP Server
 Epoch: 1
 BuildRequires: openssl-devel
 Requires(pre): httpd-filesystem
-Requires: httpd-core = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
-Requires: sscg >= 3.0.3, /usr/bin/hostname
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+Requires: sscg >= 2.2.0, /usr/bin/hostname
 # Require an OpenSSL which supports PROFILE=SYSTEM
 Conflicts: openssl-libs < 1:1.0.1h-4
 # mod_ssl/mod_nss cannot both be loaded simultaneously
@ -225,7 +178,7 @@ Security (TLS) protocols.

 %package -n mod_proxy_html
 Summary: HTML and XML content filters for the Apache HTTP Server
-Requires: httpd-core = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
 BuildRequires: libxml2-devel
 BuildRequires: make
 Epoch: 1
@ -237,7 +190,7 @@ transform and modify HTML and XML content.

 %package -n mod_ldap
 Summary: LDAP authentication modules for the Apache HTTP Server
-Requires: httpd-core = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
 Requires: apr-util-ldap

 %description -n mod_ldap
@ -246,7 +199,7 @@ authentication to the Apache HTTP Server.

 %package -n mod_session
 Summary: Session interface for the Apache HTTP Server
-Requires: httpd-core = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}

 %description -n mod_session
 The mod_session module and associated backends provide an abstract
@ -254,7 +207,7 @@ interface for storing and accessing per-user session data.

 %package -n mod_lua
 Summary: Lua scripting support for the Apache HTTP Server
-Requires: httpd-core = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}

 %description -n mod_lua
 The mod_lua module allows the server to be extended with scripts
@ -262,7 +215,32 @@ written in the Lua programming language.

 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1 -S gendiff
+%setup -q
+%patch2 -p1 -b .apxs
+%patch3 -p1 -b .deplibs
+
+%patch19 -p1 -b .detectsystemd
+
+%patch21 -p1 -b .r1842929+
+%patch22 -p1 -b .mod_systemd
+%patch23 -p1 -b .export
+%patch24 -p1 -b .corelimit
+%patch25 -p1 -b .selinux
+%patch26 -p1 -b .gettid
+%patch27 -p1 -b .icons
+%patch30 -p1 -b .cachehardmax
+%patch34 -p1 -b .socketactivation
+%patch38 -p1 -b .sslciphdefault
+%patch39 -p1 -b .sslprotdefault
+%patch40 -p1 -b .r1861269
+%patch41 -p1 -b .r1861793+
+%patch42 -p1 -b .r1828172+
+%patch45 -p1 -b .logjournal
+
+%patch60 -p1 -b .enable-sslv3
+%patch61 -p1 -b .r1878890
+%patch63 -p1 -b .htcacheclean-dont-break
+%patch65 -p1 -b .r1894152

 # Patch in the vendor string
 sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@ -270,12 +248,6 @@ sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
 # Prevent use of setcap in "install-suexec-caps" target.
 sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in

-%if %{without engine}
-: Forcibly disable ENGINE support in mod_ssl
-sed -i.engine '/^#define MODSSL_HAVE_ENGINE_API/{s/1/0/}' modules/ssl/ssl_private.h
-! diff -u modules/ssl/ssl_private.h{.engine,}
-%endif
-
 # Example conf for instances
 cp $RPM_SOURCE_DIR/instance.conf .
 sed < $RPM_SOURCE_DIR/httpd.conf >> instance.conf '
@ -301,20 +273,22 @@ cp %{SOURCE48} ./docs/icons/apache_pb3.png
 # Provide default layout
 cp $RPM_SOURCE_DIR/config.layout .

-for f in httpd.conf htcacheclean.service httpd.service apachectl; do
-   sed '
+sed '
 s,@MPM@,%{mpm},g
 s,@DOCROOT@,%{docroot},g
 s,@LOGDIR@,%{_localstatedir}/log/httpd,g
-s|@BUG_REPORT_URL@|%{bugurl}|g
-' < $RPM_SOURCE_DIR/${f}.xml > ${f}.xml
-   xmlto man ${f}.xml
-done
+' < $RPM_SOURCE_DIR/httpd.conf.xml \
+    > httpd.conf.xml
+
+xmlto man ./httpd.conf.xml
+xmlto man $RPM_SOURCE_DIR/htcacheclean.service.xml
+xmlto man $RPM_SOURCE_DIR/httpd.service.xml
+
+# apachectl.xml => apachectl.8
+xmlto man %{SOURCE47}

 : Building with MMN %{mmn}, MMN-ISA %{mmnisa}
 : Default MPM is %{mpm}, vendor string is '%{vstring}'
-: Regex Engine: PCRE=%{with pcre} PCRE2=%{with pcre2}
-: mod_ssl ENGINE support: %{with engine}

 %build
 # forcibly prevent use of bundled apr, apr-util, pcre
@ -327,7 +301,11 @@ autoheader && autoconf || exit 1
 %{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
        support/apxs.in

-%set_build_flags
+export CFLAGS=$RPM_OPT_FLAGS
+export LDFLAGS="-Wl,-z,relro,-z,now"
+
+# Hard-code path to links to avoid unnecessary builddep
+export LYNX_PATH=/usr/bin/links

 # Build the daemon
 ./configure \
@ -355,19 +333,14 @@ autoheader && autoconf || exit 1
        --with-suexec-uidmin=1000 --with-suexec-gidmin=1000 \
        --with-brotli \
        --enable-pie \
-%if %{with pcre2}
-        --with-pcre2=%{_bindir}/pcre2-config \
-%endif
-%if %{with pcre}
-        --with-pcre=%{_bindir}/pcre-config \
-%endif
+        --with-pcre \
        --enable-mods-shared=all \
        --enable-ssl --with-ssl --disable-distcache \
        --enable-proxy --enable-proxy-fdpass \
        --enable-cache \
        --enable-disk-cache \
        --enable-ldap --enable-authnz-ldap \
-        --enable-cgid --enable-cgi --enable-authnz-fcgi \
+        --enable-cgid --enable-cgi \
        --enable-cgid-fdpassing \
        --enable-authn-anon --enable-authn-alias \
        --enable-systemd \
@ -375,13 +348,6 @@ autoheader && autoconf || exit 1
        --disable-http2 \
        --disable-md \
        $*
-
-if grep -q ac_cv_have_threadsafe_pollset=no config.log; then
-   cat config.log
-   : Failed to find thread-safe APR.
-   exit 1
-fi
-
 %make_build

 %install
@ -406,8 +372,7 @@ install -m 644 $RPM_SOURCE_DIR/README.confmod \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/README
 for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \
         00-proxy.conf 00-ssl.conf 01-ldap.conf 00-proxyhtml.conf \
-         01-ldap.conf 00-systemd.conf 01-session.conf 00-optional.conf \
-         00-brotli.conf; do
+         01-ldap.conf 00-systemd.conf 01-session.conf 00-optional.conf; do
  install -m 644 -p $RPM_SOURCE_DIR/$f \
        $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/$f
 done
@ -420,9 +385,8 @@ touch -r $RPM_SOURCE_DIR/00-mpm.conf \
 # install systemd override drop directory
 # Web application packages can drop snippets into this location if
 # they need ExecStart[pre|post].
-mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d \
-      $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/httpd.service.d
+mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d
+mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d

 install -m 644 -p $RPM_SOURCE_DIR/10-listen443.conf \
      $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf
@ -487,7 +451,6 @@ cat > $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.httpd <<EOF
 %%_httpd_contentdir %{contentdir}
 %%_httpd_moddir %%{_libdir}/httpd/modules
 %%_httpd_requires Requires: httpd-mmn = %%{_httpd_mmn}
-%%_httpd_statedir %%{_localstatedir}/lib/httpd
 EOF

 # Handle contentdir
@ -590,12 +553,9 @@ sed -i '/instdso/s,top_srcdir,top_builddir,' \
 cp -p $RPM_BUILD_ROOT%{_libdir}/httpd/build/config_vars.mk \
      $RPM_BUILD_ROOT%{_libdir}/httpd/build/vendor_config_vars.mk

-# Sanitize CFLAGS & LIBTOOL in standard config_vars.mk
-sed -e '/^[A-Z]*FLAGS = /s,-specs[^ ]*,,g' \
-    -e '/^LIBTOOL/s,/.*/libtool,%{_bindir}/libtool,' \
+# Sanitize CFLAGS in standard config_vars.mk
+sed '/^CFLAGS/s,=.*$,= -O2 -g -Wall,' \
    -i $RPM_BUILD_ROOT%{_libdir}/httpd/build/config_vars.mk
-diff -u $RPM_BUILD_ROOT%{_libdir}/httpd/build/vendor_config_vars.mk \
-     $RPM_BUILD_ROOT%{_libdir}/httpd/build/config_vars.mk || true

 sed 's/config_vars.mk/vendor_config_vars.mk/' \
    $RPM_BUILD_ROOT%{_bindir}/apxs \
@ -604,9 +564,6 @@ touch -r $RPM_BUILD_ROOT%{_bindir}/apxs \
      $RPM_BUILD_ROOT%{_libdir}/httpd/build/vendor-apxs
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/httpd/build/vendor-apxs

-# Fix content dir in sysusers file and install it
-install -p -D -m 0644 %{SOURCE49} %{buildroot}%{_sysusersdir}/httpd.conf
-
 # Remove unpackaged files
 rm -vf \
      $RPM_BUILD_ROOT%{_libdir}/*.exp \
@ -622,7 +579,11 @@ rm -vf \
 rm -rf $RPM_BUILD_ROOT/etc/httpd/conf/{original,extra}

 %pre filesystem
-%sysusers_create_compat %{SOURCE49}
+getent group apache >/dev/null || groupadd -g 48 -r apache
+getent passwd apache >/dev/null || \
+  useradd -r -u 48 -g apache -s /sbin/nologin \
+    -d %{contentdir} -c "Apache" apache
+exit 0

 %post
 %systemd_post httpd.service htcacheclean.service httpd.socket
@ -685,21 +646,7 @@ set -x
 exit $rv

 %files
-%{_mandir}/man8/*
-%{_mandir}/man5/*
-%exclude %{_mandir}/man8/httpd-init.*

-%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/00-brotli.conf
-%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/00-systemd.conf
-%{_libdir}/httpd/modules/mod_brotli.so
-%{_libdir}/httpd/modules/mod_systemd.so
-
-%{_unitdir}/httpd.service
-%{_unitdir}/httpd@.service
-%{_unitdir}/htcacheclean.service
-%{_unitdir}/*.socket
-
-%files core
 %doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE
 %doc docs/conf/extra/*.conf
 %doc instance.conf server-status.conf
@ -709,7 +656,6 @@ exit $rv
 %{_sysconfdir}/httpd/state
 %{_sysconfdir}/httpd/run
 %dir %{_sysconfdir}/httpd/conf
-
 %config(noreplace) %{_sysconfdir}/httpd/conf/httpd.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf/magic

@ -721,10 +667,7 @@ exit $rv

 %dir %{_sysconfdir}/httpd/conf.modules.d
 %{_sysconfdir}/httpd/conf.modules.d/README
-
 %config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/*.conf
-%exclude %{_sysconfdir}/httpd/conf.modules.d/00-brotli.conf
-%exclude %{_sysconfdir}/httpd/conf.modules.d/00-systemd.conf
 %exclude %{_sysconfdir}/httpd/conf.modules.d/00-ssl.conf
 %exclude %{_sysconfdir}/httpd/conf.modules.d/00-proxyhtml.conf
 %exclude %{_sysconfdir}/httpd/conf.modules.d/00-lua.conf
@ -737,8 +680,7 @@ exit $rv
 %dir %{_libexecdir}/initscripts/legacy-actions/httpd
 %{_libexecdir}/initscripts/legacy-actions/httpd/*

-%{_sbindir}/httpd
-%{_sbindir}/htcacheclean
+%{_sbindir}/ht*
 %{_sbindir}/fcgistarter
 %{_sbindir}/apachectl
 %{_sbindir}/rotatelogs
@ -747,8 +689,6 @@ exit $rv
 %dir %{_libdir}/httpd
 %dir %{_libdir}/httpd/modules
 %{_libdir}/httpd/modules/mod*.so
-%exclude %{_libdir}/httpd/modules/mod_brotli.so
-%exclude %{_libdir}/httpd/modules/mod_systemd.so
 %exclude %{_libdir}/httpd/modules/mod_auth_form.so
 %exclude %{_libdir}/httpd/modules/mod_ssl.so
 %exclude %{_libdir}/httpd/modules/mod_*ldap.so
@ -775,6 +715,14 @@ exit $rv
 %attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd
 %attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd/proxy

+%{_mandir}/man8/*
+%{_mandir}/man5/*
+%exclude %{_mandir}/man8/httpd-init.*
+
+%{_unitdir}/httpd.service
+%{_unitdir}/httpd@.service
+%{_unitdir}/htcacheclean.service
+%{_unitdir}/*.socket

 %files filesystem
 %dir %{_sysconfdir}/httpd
@ -787,16 +735,9 @@ exit $rv
 %dir %{contentdir}/icons
 %attr(755,root,root) %dir %{_unitdir}/httpd.service.d
 %attr(755,root,root) %dir %{_unitdir}/httpd.socket.d
-%attr(755,root,root) %dir %{_sysconfdir}/systemd/system/httpd.service.d
-%{_sysusersdir}/httpd.conf

 %files tools
-%{_bindir}/ab
-%{_bindir}/htdbm
-%{_bindir}/htdigest
-%{_bindir}/httxt2dbm
-%{_bindir}/htpasswd
-%{_bindir}/logresolve
+%{_bindir}/*
 %{_mandir}/man1/*
 %doc LICENSE NOTICE
 %exclude %{_bindir}/apxs
@ -846,210 +787,13 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd

 %changelog
-* Tue Dec 09 2025 Luboš Uhliarik <luhliari@redhat.com> - 2.4.66-1
- new version 2.4.66
-
-* Thu Nov 27 2025 Luboš Uhliarik <luhliari@redhat.com> - 2.4.65-5
- Improve default httpd LogFormats for better support diagnostics
-
-* Wed Nov 12 2025 Luboš Uhliarik <luhliari@redhat.com> - 2.4.65-3
- mod_ssl: SSLVHostSNIPolicy - Fix handling of STRICT mode
-
-* Tue Nov 04 2025 Luboš Uhliarik <luhliari@redhat.com> - 2.4.65-2
- mod_ssl: Add SSLVHostSNIPolicy directive to set the compatibility level
-  required for VirtualHost matching.
-
-* Sat Oct 18 2025 Luboš Uhliarik <luhliari@redhat.com> - 2.4.65-1
- new version 2.4.65
- mod_proxy_hcheck: reschedule health checks after child process restart
-
-* Mon Sep 08 2025 Luboš Uhliarik <luhliari@redhat.com> - 2.4.64-4
- Add tmpfiles.d rules for /var directories (bootc compatibility)
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.64-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jul 17 2025 Luboš Uhliarik <luhliari@redhat.com> - 2.4.64-2
- Fix RewriteRule with inverted pattern and RewriteCond regression
-
-* Fri Jul 11 2025 Luboš Uhliarik <luhliari@redhat.com> - 2.4.64-1
- new version 2.4.64
-
-* Tue Jun 24 2025 Joe Orton  <jorton@redhat.com> - 2.4.63-4
- mod_dav: add dav_get_base_path() API
-
-* Mon Feb 10 2025 Joe Orton <jorton@redhat.com> - 2.4.63-3
- sync default httpd.conf with upstream
-
-* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 2.4.63-2
- Add explicit BR: libxcrypt-devel
-
-* Fri Jan 24 2025 Luboš Uhliarik <luhliari@redhat.com> - 2.4.63-1
- new version 2.4.63
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.62-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.4.62-5
- Rebuilt for the bin-sbin merge (2nd attempt)
-
-* Fri Oct 11 2024 Luboš Uhliarik <luhliari@redhat.com> - 2.4.62-4
- mod_rewrite: regression fixes
-
-* Thu Aug 01 2024 Luboš Uhliarik <luhliari@redhat.com> - 2.4.62-3
- Fix regression introduced by CVE-2024-38474 fix
- added openldap-devel build dependency
-
-* Fri Jul 19 2024 Luboš Uhliarik <luhliari@redhat.com> - 2.4.62-1
- new version 2.4.62
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.61-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.4.61-2
- Rebuilt for the bin-sbin merge
-
-* Wed Jul 03 2024 Luboš Uhliarik <luhliari@redhat.com> - 2.4.61-1
- new version 2.4.61
-
-* Thu May 23 2024 Joe Orton <jorton@redhat.com> - 2.4.59-4
- mod_ssl: add engine bcond, disable ENGINE support by default for F41+
- mod_ssl: enable SSL_OP_NO_RENEGOTIATION (upstream PR#426)
-
-* Fri May  3 2024 Joe Orton <jorton@redhat.com> - 2.4.59-3
- apachectl(8): use BUG_REPORT_URL from /etc/os-release
- apachectl(8): fix grammar (#2278748)
- httpd.service.xml(8): mention ProtectSystem= setting
-
-* Mon Apr 15 2024 Joe Orton <jorton@redhat.com> - 2.4.59-2
- mod_ssl: add DH param handling fix (r1916863)
-
-* Fri Apr  5 2024 Joe Orton <jorton@redhat.com> - 2.4.59-1
- update to 2.4.59
-
-* Thu Mar 28 2024 Joe Orton <jorton@redhat.com> - 2.4.58-8
- rebuild to fix changelog ordering
-
-* Thu Mar 7 2024 Rahul Sundaram <sundaram@fedoraproject.org> - 2.4.58-7
- Update Systemd security settings as part of https://fedoraproject.org/wiki/Changes/SystemdSecurityHardening
- updated httpd.service(5) (Joe Orton)
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.58-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.58-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan  5 2024 Joe Orton <jorton@redhat.com> - 2.4.58-4
- fix OpenSSL 3.0 deprecation warnings (r1913912, r1915067)
- mod_ssl: move to provider API for pkcs11 support (#2253014)
-
-* Fri Dec  8 2023 Joe Orton <jorton@redhat.com> - 2.4.58-3
- mod_dav_fs: add DAVLockDBType, use global lock around lockdb
- fix build with libxml2 2.12
-
-* Thu Nov  2 2023 Joe Orton <jorton@redhat.com> - 2.4.58-2
- add dependency on apr-util-1(dbm) so a DBM provider is present
-
-* Fri Oct 20 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.4.58-1
- new version 2.4.58
-
-* Fri Oct 06 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.4.57-4
- SPDX migration
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.57-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jul  5 2023 Joe Orton <jorton@redhat.com> - 2.4.57-2
- package /etc/systemd/httpd/httpd.service.d
- also sanitize LDFLAGS/CXXFLAGS in non-vendor config_vars.mk
-
-* Tue Apr 11 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.4.57-1
- new version 2.4.57
-
-* Thu Mar 09 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.4.56-1
- new version 2.4.56
-
-* Tue Mar  7 2023 Joe Orton <jorton@redhat.com> - 2.4.55-3
- build and load mod_authnz_fcgi
-
-* Fri Feb 03 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.4.55-2
- rebuilt with new apr/apr-util
-
-* Wed Jan 25 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.4.55-1
- new version 2.4.55
-
-* Tue Jan 24 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.4.54-12
- prevent sscg writing /dhparams.pem
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.54-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Dec 20 2022 Joe Orton <jorton@redhat.com> - 2.4.54-10
- htcacheclean.service: add [Install] section, PrivateTmp=yes,
-  Environment=LANG=C (#2149714)
-
-* Mon Dec 19 2022 Joe Orton <jorton@redhat.com> - 2.4.54-9
- move SELinux context logging to mod_systemd
-
-* Mon Dec 19 2022 Joe Orton <jorton@redhat.com> - 2.4.54-8
- define _httpd_statedir macro
-
-* Wed Nov 30 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.54-7
- reduce AH03408 level to INFO in proxy_util.c
-
-* Thu Oct 13 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.54-6
- Provide a sysusers.d file to get user() and group() provides (#2134430)
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.54-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jun 24 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.54-4
- fix downgrade/upgrade issues
- mod_ssl and other modules should depend only on httpd-core package
-
-* Fri Jun 17 2022 Joe Orton <jorton@redhat.com> - 2.4.54-3
- update PCRE config selection
-
-* Thu Jun 09 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.54-2
+* Mon Jun 27 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.54-1
 - new version 2.4.54

-* Mon May 16 2022 Joe Orton <jorton@redhat.com> - 2.4.53-7
- disable package notes
-
-* Fri May 13 2022 Joe Orton <jorton@redhat.com> - 2.4.53-6
- use %%set_build_flags macro
-
-* Thu Apr 21 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.53-5
- don't use bomb.gif icon for all files/dirs ending with core
-
-* Wed Apr 20 2022 Joe Orton <jorton@redhat.com> - 2.4.53-4
- switch to PCRE2 for new releases
-
-* Thu Apr 07 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.53-3
- Related: #2070517 - fix issue when mod_systemd is not loaded
-
-* Wed Mar 30 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.53-2
- Resolves: #2070517 - Allow install httpd with smaller footprint
- try to minimize httpd dependencies (new httpd-core package)
- mod_systemd and mod_brotli are now in the main httpd package
-
 * Thu Mar 17 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.53-1
 - new version 2.4.53
 - fixes CVE-2022-23943, CVE-2022-22721, CVE-2022-22720 and CVE-2022-22719

-* Tue Feb  1 2022 Joe Orton <jorton@redhat.com> - 2.4.52-5
- rebuild for new OpenLDAP (#2032699)
-
-* Mon Jan 31 2022 Joe Orton <jorton@redhat.com> - 2.4.52-4
- add libtool to Requires: for httpd-devel (#2048281)
-
-* Fri Jan 28 2022 Joe Orton <jorton@redhat.com> - 2.4.52-3
- use LIBTOOL=/usr/bin/libtool in the non-vendor config_vars.mk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.52-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
 * Wed Dec 22 2021 Joe Orton <jorton@redhat.com> - 2.4.52-1
 - update to 2.4.52

--- a/httpd.sysusers
+++ b/httpd.sysusers
@ -1,2 +0,0 @@
-g apache 48
-u apache 48 "Apache" /usr/share/httpd /sbin/nologin
--- a/httpd.tmpfiles
+++ b/httpd.tmpfiles
@ -1,9 +1,2 @@
 d /run/httpd   710 root apache
 d /run/httpd/htcacheclean   700 apache apache
-d /var/log/httpd 700 root root -
-d /var/www       755 root root -
-d /var/www/html  755 root root -
-d /var/www/cgi-bin 755 root root -
-d /var/lib/httpd 700 apache apache -
-d /var/cache/httpd 700 apache apache -
-d /var/cache/httpd/proxy 700 apache apache -
--- a/httpd@.service
+++ b/httpd@.service
@ -19,25 +19,8 @@ ExecReload=/usr/sbin/httpd $OPTIONS -k graceful -f conf/%i.conf
 # Send SIGWINCH for graceful stop
 KillSignal=SIGWINCH
 KillMode=mixed
-DevicePolicy=closed
-KeyringMode=private
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-OOMPolicy=continue
-PrivateDevices=yes
 PrivateTmp=true
-ProtectClock=yes
-ProtectControlGroups=yes
-ProtectHome=read-only
-ProtectHostname=yes
-ProtectKernelLogs=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-ProtectSystem=yes
-RestrictNamespaces=yes
-RestrictRealtime=yes
-RestrictSUIDSGID=yes
-SystemCallArchitectures=native
+OOMPolicy=continue

 [Install]
 WantedBy=multi-user.target
--- a/pullrev.sh
+++ b/pullrev.sh
@ -6,8 +6,8 @@ if [ $# -lt 1 ]; then
 fi

 repo="https://svn.apache.org/repos/asf/httpd/httpd/trunk"
-repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x"
-ver=$(rpm -q --specfile httpd.spec --qf '%{VERSION}\n' | sed 1q)
+#repo="https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x"
+ver=2.4.51
 prefix="httpd-${ver}"
 suffix="${SUFFIX:-r$1${2:++}}"
 fn="${prefix}-${suffix}.patch"
@ -43,9 +43,7 @@ for r in $*; do
        http*) curl -s "$r" | filterdiff --strip=3 ;;
        *) svn diff -c ${r} ${repo}  ;;
    esac | filterdiff --remove-timestamps --clean \
-                      -x 'CHANGES' -x 'changes-entries/*.txt' \
-                      -x '*/next-number' -x 'STATUS' -x '*.xml' \
-                      -x '.github/*' \
+                      -x 'CHANGES' -x '*/next-number' -x 'STATUS' -x '*.xml' \
                      --addprefix="${prefix}/" > ${this}
    next=`mktemp /tmp/pullrevXXXXXX`
    if ! combinediff -w ${prev} ${this} > ${next}; then
@ -64,3 +62,4 @@ echo "+ git add ${fn}"
 git add "${fn}"
 echo "+ spec template:"
 echo "PatchN: ${fn}"
+echo "%patchN -p1 -b .${suffix}"
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -2,21 +2,5 @@
 badfuncs:
  # mod_proxy uses inet_ntoa (safely) for IPv4 address matching,
  # and APR interfaces for IPv6 addresses.
-  allowed:
-    /usr/lib*/httpd/modules/mod_proxy.so:
-      - inet_ntoa
-upstream:
  ignore:
-    - '*.xml'
-    - '*.service'
-    - '*.socket'
-    - '*.conf'
-    - '*.sysconf'
-    - '*.tmpfiles'
-    - 'README.*'
-    - '*.sysusers'
-    - '*.png'
-    - 'httpd-ssl-*'
-    - config.layout
-    - 'action*.sh'
-    - 'apachectl.*'
+    - /usr/lib*/httpd/modules/mod_proxy.so
--- a/4
+++ b/4
@ -1,3 +1,3 @@
-SHA512 (httpd-2.4.66.tar.bz2) = 49031a3465d956ee3b755e65810b6c35561ddd5fac2c624a273b733c238e115b914cd7b246837e5a3090ccfded6e0b8b3059bfd1f8ce4419081c805a38d05a4b
-SHA512 (httpd-2.4.66.tar.bz2.asc) = 3fc7a4c6c0705adc3f8223ed3d6ebc45f09b7a19ab63a8b4d359835d2b592cf11f0fd0438a40b5a43c0684b36602484bb908bf46b0c068dd22bacc2c194e7fbd
+SHA512 (httpd-2.4.54.tar.bz2) = 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
+SHA512 (httpd-2.4.54.tar.bz2.asc) = 90a582b10bbcd054f62b6961194f7d97b1f0f56286cfd89e0a5c36248808365b4defade068340a1e9deeaee09dcd3e88810bee8951f9840fe666dab8861b757b
 SHA512 (KEYS) = 88c848b7ab9e4915d6625dcad3e8328673b0448f2ce76f2c44eecc612cf6afbce3287a4ee7219a44c6fcc61d5ecb2a1a8545456a4a16b90400263d7249cbf192
Author	SHA1	Message	Date
Luboš Uhliarik	d6f2f17bee	new version 2.4.54	2022-06-27 12:04:24 +02:00
Luboš Uhliarik	d63447eec6	new version 2.4.53 fixes CVE-2022-23943, CVE-2022-22721, CVE-2022-22720 and CVE-2022-22719	2022-03-17 17:14:47 +01:00
				`@ -1 +0,0 @@`
				`LoadModule brotli_module modules/mod_brotli.so`