From 8199365501d0a1db8cce270e8ee127fdf98ef3cb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 1 Sep 2021 14:50:27 +0200
Subject: update patch for backported features

---
 php-bartlett-php-compatinfo-db-backports.patch | 72 ++++++++++++++++++++++++++
 php-bartlett-php-compatinfo-db-curltls.patch   | 51 ------------------
 php-bartlett-php-compatinfo-db.spec            |  7 ++-
 3 files changed, 77 insertions(+), 53 deletions(-)
 create mode 100644 php-bartlett-php-compatinfo-db-backports.patch
 delete mode 100644 php-bartlett-php-compatinfo-db-curltls.patch

diff --git a/php-bartlett-php-compatinfo-db-backports.patch b/php-bartlett-php-compatinfo-db-backports.patch
new file mode 100644
index 0000000..618e7d8
--- /dev/null
+++ b/php-bartlett-php-compatinfo-db-backports.patch
@@ -0,0 +1,72 @@
+diff -up ./data/reference/extension/curl/55/constants.json.curltls data/reference/extension/curl/55/constants.json
+--- ./data/reference/extension/curl/55/constants.json.curltls	2021-02-10 08:41:37.593374602 +0100
++++ ./data/reference/extension/curl/55/constants.json	2021-02-10 08:48:53.129243382 +0100
+@@ -1440,26 +1440,31 @@
+     },
+     {
+         "name": "CURL_SSLVERSION_DEFAULT",
++        "optional": true,
+         "ext_min": "5.5.0",
+         "php_min": "5.5.0"
+     },
+     {
+         "name": "CURL_SSLVERSION_SSLv2",
++        "optional": true,
+         "ext_min": "5.5.0",
+         "php_min": "5.5.0"
+     },
+     {
+         "name": "CURL_SSLVERSION_SSLv3",
++        "optional": true,
+         "ext_min": "5.5.0",
+         "php_min": "5.5.0"
+     },
+     {
+         "name": "CURL_SSLVERSION_TLSv1",
++        "optional": true,
+         "ext_min": "5.5.0",
+         "php_min": "5.5.0"
+     },
+     {
+         "name": "CURL_SSLVERSION_TLSv1_0",
++        "optional": true,
+         "ext_min": "5.5.19RC1",
+         "php_min": "5.5.19RC1",
+         "php_excludes": "5.6.0, 5.6.0RC1, 5.6.0RC2, 5.6.0RC3, 5.6.0RC4, 5.6.1, 5.6.1RC1, 5.6.2",
+@@ -1472,6 +1477,7 @@
+     },
+     {
+         "name": "CURL_SSLVERSION_TLSv1_1",
++        "optional": true,
+         "ext_min": "5.5.19RC1",
+         "php_min": "5.5.19RC1",
+         "php_excludes": "5.6.0, 5.6.0RC1, 5.6.0RC2, 5.6.0RC3, 5.6.0RC4, 5.6.1, 5.6.1RC1, 5.6.2",
+@@ -1484,6 +1490,7 @@
+     },
+     {
+         "name": "CURL_SSLVERSION_TLSv1_2",
++        "optional": true,
+         "ext_min": "5.5.19RC1",
+         "php_min": "5.5.19RC1",
+         "php_excludes": "5.6.0, 5.6.0RC1, 5.6.0RC2, 5.6.0RC3, 5.6.0RC4, 5.6.1, 5.6.1RC1, 5.6.2",
+diff -up ./data/reference/extension/phar/81/const.json.rpm ./data/reference/extension/phar/81/const.json
+--- ./data/reference/extension/phar/81/const.json.rpm	2021-09-01 14:43:32.274735177 +0200
++++ ./data/reference/extension/phar/81/const.json	2021-09-01 14:43:48.358698918 +0200
+@@ -2,13 +2,13 @@
+     {
+         "class_name": "Phar",
+         "name": "OPENSSL_SHA256",
+-        "ext_min": "8.1.0beta3",
+-        "php_min": "8.1.0beta3"
++        "ext_min": "8.0.10",
++        "php_min": "8.0.10"
+     },
+     {
+         "class_name": "Phar",
+         "name": "OPENSSL_SHA512",
+-        "ext_min": "8.1.0beta3",
+-        "php_min": "8.1.0beta3"
++        "ext_min": "8.0.10",
++        "php_min": "8.0.10"
+     }
+ ]
diff --git a/php-bartlett-php-compatinfo-db-curltls.patch b/php-bartlett-php-compatinfo-db-curltls.patch
deleted file mode 100644
index b440d19..0000000
--- a/php-bartlett-php-compatinfo-db-curltls.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -up ./data/reference/extension/curl/55/constants.json.curltls data/reference/extension/curl/55/constants.json
---- ./data/reference/extension/curl/55/constants.json.curltls	2021-02-10 08:41:37.593374602 +0100
-+++ ./data/reference/extension/curl/55/constants.json	2021-02-10 08:48:53.129243382 +0100
-@@ -1440,26 +1440,31 @@
-     },
-     {
-         "name": "CURL_SSLVERSION_DEFAULT",
-+        "optional": true,
-         "ext_min": "5.5.0",
-         "php_min": "5.5.0"
-     },
-     {
-         "name": "CURL_SSLVERSION_SSLv2",
-+        "optional": true,
-         "ext_min": "5.5.0",
-         "php_min": "5.5.0"
-     },
-     {
-         "name": "CURL_SSLVERSION_SSLv3",
-+        "optional": true,
-         "ext_min": "5.5.0",
-         "php_min": "5.5.0"
-     },
-     {
-         "name": "CURL_SSLVERSION_TLSv1",
-+        "optional": true,
-         "ext_min": "5.5.0",
-         "php_min": "5.5.0"
-     },
-     {
-         "name": "CURL_SSLVERSION_TLSv1_0",
-+        "optional": true,
-         "ext_min": "5.5.19RC1",
-         "php_min": "5.5.19RC1",
-         "php_excludes": "5.6.0, 5.6.0RC1, 5.6.0RC2, 5.6.0RC3, 5.6.0RC4, 5.6.1, 5.6.1RC1, 5.6.2",
-@@ -1472,6 +1477,7 @@
-     },
-     {
-         "name": "CURL_SSLVERSION_TLSv1_1",
-+        "optional": true,
-         "ext_min": "5.5.19RC1",
-         "php_min": "5.5.19RC1",
-         "php_excludes": "5.6.0, 5.6.0RC1, 5.6.0RC2, 5.6.0RC3, 5.6.0RC4, 5.6.1, 5.6.1RC1, 5.6.2",
-@@ -1484,6 +1490,7 @@
-     },
-     {
-         "name": "CURL_SSLVERSION_TLSv1_2",
-+        "optional": true,
-         "ext_min": "5.5.19RC1",
-         "php_min": "5.5.19RC1",
-         "php_excludes": "5.6.0, 5.6.0RC1, 5.6.0RC2, 5.6.0RC3, 5.6.0RC4, 5.6.1, 5.6.1RC1, 5.6.2",
diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec
index c51ca81..3ac0e9f 100644
--- a/php-bartlett-php-compatinfo-db.spec
+++ b/php-bartlett-php-compatinfo-db.spec
@@ -45,8 +45,11 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 # Fix version and avoir composer/package-versions-deprecated (relying on composer.lock)
 # Set proxy files as static
 Patch0:         %{name}-3.10-rpm.patch
-# CURL_SSLVERSION constants have been backported
-Patch1:         %{name}-curltls.patch
+# Backported features affecting test suite
+# - CURL_SSLVERSION constants
+# - Phar::OPENSSL_SHA* constants
+Patch1:         %{name}-backports.patch
+
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 7.2
-- 
cgit