From 08d3f836ea2c12f74831beb83759aa54e0e50e27 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 1 Jul 2026 10:17:40 +0200
Subject: Fix Memory corruption (zend_mm_heap corrupted) in openssl_encrypt
 with AES-WRAP-PAD

---
 php.spec | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 6c60c5d..ed8eb89 100644
--- a/php.spec
+++ b/php.spec
@@ -70,7 +70,7 @@
 %bcond_with           zip
 # Optional extensions; to disable: pass "--without xxx" etc to rpmbuild/mock.
 %bcond_without        imap
-%if 0%{?rhel} == 10
+%if 0%{?rhel} > 10
 %bcond_with           firebird
 %else
 %bcond_without        firebird
@@ -125,7 +125,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-Release: 16%{?dist}
+Release: 17%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -238,6 +238,7 @@ Patch228: php-cve-2026-6735.patch
 Patch229: php-cve-2026-7259.patch
 Patch230: php-cve-2026-7568.patch
 Patch231: php-cve-2026-7258.patch
+Patch232: php-gh22187.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -1054,6 +1055,7 @@ rm ext/openssl/tests/p12_with_extra_certs.p12
 %patch -P229 -p1 -b .cve7259
 %patch -P230 -p1 -b .cve7268
 %patch -P231 -p1 -b .cve7258
+%patch -P232 -p1 -b .gh22187
 
 # Fixes for tests
 %patch -P300 -p1 -b .datetests
@@ -1106,6 +1108,12 @@ rm ext/openssl/tests/openssl_error_string_basic_openssl3.phpt
 %endif
 rm ext/openssl/tests/openssl_private_decrypt_basic.phpt
 rm ext/openssl/tests/openssl_x509_parse_basic.phpt
+rm ext/openssl/tests/sni_server.phpt
+rm ext/openssl/tests/sni_server_key_cert.phpt
+rm ext/openssl/tests/bug74341.phpt
+rm ext/pcre/tests/pcre_extra.phpt
+rm ext/pcre/tests/split.phpt
+rm ext/pcre/tests/grep2.phpt
 
 # Safety check for API version change.
 pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h)
@@ -1950,6 +1958,9 @@ EOF
 
 
 %changelog
+* Wed Jul  1 2026 Remi Collet <remi@remirepo.net> - 8.0.30-17
+- Fix Memory corruption (zend_mm_heap corrupted) in openssl_encrypt with AES-WRAP-PAD
+
 * Mon May 11 2026 Remi Collet <remi@remirepo.net> - 8.0.30-16
 - Fix XSS within status endpoint
   CVE-2026-6735
-- 
cgit