diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0011-mod_md-Add-OpenSSL-4.0-compatibility.patch b/meta-webserver/recipes-httpd/apache2/apache2/0011-mod_md-Add-OpenSSL-4.0-compatibility.patch deleted file mode 100644 index ee127681ec..0000000000 --- a/meta-webserver/recipes-httpd/apache2/apache2/0011-mod_md-Add-OpenSSL-4.0-compatibility.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6cd9ea8dcb5bf68a195e90578c7f05e12eba5468 Mon Sep 17 00:00:00 2001 -From: Rainer Jung -Date: Wed, 17 Jun 2026 09:48:52 +0000 -Subject: [PATCH] mod_md: Add OpenSSL 4.0 compatibility - -* Use getters instead of direct member access. - -* Struct was made opaque in OpenSSL 4. Getters exist since OpenSSL 1.1.0. - -* Keep OpenSSL 1.0.2 compatibility. - -Merge from icing/md: -https://github.com/icing/mod_md/commit/9fd90380db0722f0ccc14ff1c4da0ca21d4da75c - -Backport of r1935161 from trunk, [mod_md CTR] - - -Upstream-Status: Backport [https://github.com/apache/httpd/commit/6cd9ea8dcb5bf68a195e90578c7f05e12eba5468] ---- -diff --git a/modules/md/md_ocsp.c b/modules/md/md_ocsp.c -index aee799a7b39..2e7f14dff31 100644 ---- a/modules/md/md_ocsp.c -+++ b/modules/md/md_ocsp.c -@@ -533,13 +533,23 @@ static const char *certid_summary(const OCSP_CERTID *certid, apr_pool_t *p) - serial = issuer = key = "???"; - OCSP_id_get0_info(&aname_hash, &amd_nid, &akey_hash, &aserial, (OCSP_CERTID*)certid); - if (aname_hash) { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - data.len = (apr_size_t)aname_hash->length; - data.data = (const char*)aname_hash->data; -+#else -+ data.len = (apr_size_t)ASN1_STRING_length(aname_hash); -+ data.data = (const char*)ASN1_STRING_get0_data(aname_hash); -+#endif - md_data_to_hex(&issuer, 0, p, &data); - } - if (akey_hash) { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - data.len = (apr_size_t)akey_hash->length; - data.data = (const char*)akey_hash->data; -+#else -+ data.len = (apr_size_t)ASN1_STRING_length(akey_hash); -+ data.data = (const char*)ASN1_STRING_get0_data(akey_hash); -+#endif - md_data_to_hex(&key, 0, p, &data); - } - if (aserial) { diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.68.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.69.bb similarity index 98% rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.68.bb rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.69.bb index f178007ab7..fba4667bd1 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.68.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.69.bb @@ -16,7 +16,6 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ file://0008-Fix-perl-install-directory-to-usr-bin.patch \ file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \ file://0001-make_exports.awk-not-expose-the-path.patch \ - file://0011-mod_md-Add-OpenSSL-4.0-compatibility.patch \ " SRC_URI:append:class-target = " \ @@ -28,7 +27,7 @@ SRC_URI:append:class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[sha256sum] = "68c74d4df38c26bed4dfbdb8f3baf1eb532f3872357becc1bba5d136f6b63c06" +SRC_URI[sha256sum] = "c5e6ebc66e349b87d7fc6916ae7cc2a808ed348003de134cf9e9d89d3e2cc73d" S = "${UNPACKDIR}/httpd-${PV}"