summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-bartlett-php-compatinfo-db-backports.patch (renamed from php-bartlett-php-compatinfo-db-curltls.patch)21
-rw-r--r--php-bartlett-php-compatinfo-db.spec7
2 files changed, 26 insertions, 2 deletions
diff --git a/php-bartlett-php-compatinfo-db-curltls.patch b/php-bartlett-php-compatinfo-db-backports.patch
index b440d19..618e7d8 100644
--- a/php-bartlett-php-compatinfo-db-curltls.patch
+++ b/php-bartlett-php-compatinfo-db-backports.patch
@@ -49,3 +49,24 @@ diff -up ./data/reference/extension/curl/55/constants.json.curltls data/referenc
"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.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