new version 2.4.58

.gitignore

@@ -48,3 +48,4 @@ x86_64
 /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.48-r1878890.patch

@@ -1,116 +0,0 @@
-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) {

httpd.spec

@@ -23,8 +23,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.4.57
+Version: 2.4.58
-Release: 4%{?dist}
+Release: 1%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
@@ -100,7 +100,6 @@ Patch46: httpd-2.4.53-separate-systemd-fns.patch
 # Bug fixes
 # https://bugzilla.redhat.com/show_bug.cgi?id=1397243
 Patch60: httpd-2.4.43-enable-sslv3.patch
-Patch61: httpd-2.4.48-r1878890.patch
 Patch63: httpd-2.4.46-htcacheclean-dont-break.patch
 Patch65: httpd-2.4.51-r1894152.patch
 
@@ -271,7 +270,6 @@ written in the Lua programming language.
 %patch -P25 -p1 -b .selinux
 
 %patch -P60 -p1 -b .enable-sslv3
-%patch -P61 -p1 -b .r1878890
 %patch -P63 -p1 -b .htcacheclean-dont-break
 %patch -P65 -p1 -b .r1894152
 
@@ -858,6 +856,9 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* 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
 

sources

@@ -1,3 +1,3 @@
-SHA512 (httpd-2.4.57.tar.bz2) = 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
+SHA512 (httpd-2.4.58.tar.bz2) = d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
-SHA512 (httpd-2.4.57.tar.bz2.asc) = 3d40491da7610b91894ea24d011da213c0ba4c04dbf3d5dbefac704ba55d9a56acf375dd61363f50291a748ef5f14e7d2dcba96b15a8ce448267bfeb26bf7ecd
+SHA512 (httpd-2.4.58.tar.bz2.asc) = aa021b067fc84ae6a09d5ce321207622c6c08f22632ac7362318ca0505b84357d77d4ebc1f17fa2c3030ed9d9fd177e8fb989932caeef695e76936e010b63aa0
 SHA512 (KEYS) = 88c848b7ab9e4915d6625dcad3e8328673b0448f2ce76f2c44eecc612cf6afbce3287a4ee7219a44c6fcc61d5ecb2a1a8545456a4a16b90400263d7249cbf192