From c62ca0226d31dc42e90f5ba3f46d574b206e663f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 9 Nov 2021 14:52:47 +0100
Subject: add patch for OpenSSL 3.0, backported from 8.1

---
 php.spec | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index ea78c7f..c8492dc 100644
--- a/php.spec
+++ b/php.spec
@@ -66,7 +66,11 @@
 # Optional components; pass "--with mssql" etc to rpmbuild.
 %global with_oci8      %{?_with_oci8:1}%{!?_with_oci8:0}
 %global with_imap      1
+%if 0%{?rhel} == 9
+%global with_interbase 0
+%else
 %global with_interbase 1
+%endif
 %global with_freetds   1
 %global with_tidy      1
 %global with_sqlite3   1
@@ -110,7 +114,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -152,8 +156,6 @@ Patch5: php-7.2.0-includedir.patch
 Patch6: php-7.4.0-embed.patch
 Patch8: php-7.2.0-libdb.patch
 Patch9: php-7.0.7-curl.patch
-# backported from 8.0
-Patch10: php-net-snmp.patch
 
 # Functional changes
 Patch42: php-7.3.3-systzdata-v18.patch
@@ -166,6 +168,10 @@ Patch46: php-7.4.20-argon2.patch
 # drop "Configure command" from phpinfo output
 # and add build system and provider (from 8.0)
 Patch47: php-7.4.8-phpinfo.patch
+# fix snmp build without DES (from 8.0)
+Patch48: php-7.4.26-snmp.patch
+# compatibility with OpenSSL 3.0, from 8.1
+Patch50: php-7.4.26-openssl3.patch
 
 # RC Patch
 Patch91: php-7.2.0-oci8conf.patch
@@ -933,7 +939,6 @@ in pure PHP.
 %if 0%{?rhel}
 %patch9 -p1 -b .curltls
 %endif
-%patch10 -p1 -b .nodes
 
 %if 0%{?fedora} >= 28 || 0%{?rhel} >= 6
 %patch42 -p1 -b .systzdata
@@ -945,6 +950,11 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %endif
 %patch46 -p1 -b .argon2
 %patch47 -p1 -b .phpinfo
+%patch48 -p1 -b .snmp
+%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
+%patch50 -p1 -b .openssl3
+rm ext/openssl/tests/p12_with_extra_certs.p12
+%endif
 
 %patch91 -p1 -b .remi-oci8
 
@@ -1829,6 +1839,9 @@ fi
 
 
 %changelog
+* Tue Nov  9 2021 Remi Collet <remi@remirepo.net> - 7.4.26~RC1-2
+- add patch for OpenSSL 3.0, backported from 8.1
+
 * Wed Nov  3 2021 Remi Collet <remi@remirepo.net> - 7.4.26~RC1-1
 - update to 7.4.26RC1
 
-- 
cgit