From 86519c6c353db3038812339d6a3c5dcab928c2e4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 18 Feb 2020 15:08:29 +0100
Subject: Renew openssl certs

---
 php.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 26c8e5d..fa99981 100644
--- a/php.spec
+++ b/php.spec
@@ -202,7 +202,6 @@ Patch91: php-5.6.3-oci8conf.patch
 # Upstream fixes (100+)
 Patch100: https://github.com/php/php-src/commit/be50a72715c141befe6f34ece660745da894aaf3.patch
 Patch101: https://github.com/php/php-src/commit/2ef8809ef3beb5f58b81dcff49bdcde4d2cb8426.patch
-Patch102: php-openssl-cert.patch
 Patch103: php-bug76846.patch
 
 # Security fixes (200+)
@@ -250,6 +249,8 @@ Patch237: php-bug79082.patch
 Patch300: php-7.0.10-datetests.patch
 # Revert changes for pcre < 8.34
 Patch301: php-7.0.0-oldpcre.patch
+# Renew openssl certs
+Patch302: php-openssl-cert.patch
 
 # WIP
 
@@ -981,7 +982,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 # upstream patches
 %patch100 -p1 -b .up1
 %patch101 -p1 -b .up2
-%patch102 -p1 -b .up3
 %patch103 -p1 -b .bug76846
 
 # security patches
@@ -1034,6 +1034,9 @@ if ! pkg-config libpcre --atleast-version 8.34 ; then
 %patch301 -p1 -b .pcre834
 fi
 %endif
+# New openssl certs
+%patch302 -p1 -b .renewcert
+rm ext/openssl/tests/bug65538_003.phpt
 
 # WIP patch
 
-- 
cgit