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

---
 php74.spec | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'php74.spec')

diff --git a/php74.spec b/php74.spec
index c6f8b88..fb077c1 100644
--- a/php74.spec
+++ b/php74.spec
@@ -47,7 +47,11 @@
 %global with_libpcre  0
 %endif
 
+%if 0%{?rhel} == 9
+%global with_firebird 0
+%else
 %global with_firebird 1
+%endif
 
 # Build ZTS extension or only NTS
 %global with_zts      1
@@ -96,7 +100,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-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
@@ -149,6 +153,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
@@ -1147,6 +1155,11 @@ in pure PHP.
 %patch45 -p1 -b .ldap_r
 %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
 
@@ -2162,6 +2175,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