diff options
| author | Remi Collet <remi@remirepo.net> | 2021-09-27 10:56:47 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-09-27 10:56:47 +0200 |
| commit | 045aa4dd18893d2900eb02bc22ec7885c8940a8f (patch) | |
| tree | 397c27060ea912e6a37e778fbe0ff1fbb82853df | |
| parent | 46e725355cc1898571d6bee2203efc5ac4a26e8c (diff) | |
add upstream patch for OpenSSL test suite
| -rw-r--r-- | php-bartlett-php-compatinfo-db-upstream.patch | 33 | ||||
| -rw-r--r-- | php-bartlett-php-compatinfo-db.spec | 10 |
2 files changed, 42 insertions, 1 deletions
diff --git a/php-bartlett-php-compatinfo-db-upstream.patch b/php-bartlett-php-compatinfo-db-upstream.patch new file mode 100644 index 0000000..a3cfe96 --- /dev/null +++ b/php-bartlett-php-compatinfo-db-upstream.patch @@ -0,0 +1,33 @@ +From 91f1a3be3613cb60d90ebbde06a2c015c44752fa Mon Sep 17 00:00:00 2001 +From: Laurent Laville <laurent.laville@gmail.com> +Date: Mon, 27 Sep 2021 08:46:20 +0000 +Subject: [PATCH] fix following explain on comment + https://github.com/llaville/php-compatinfo-db/issues/88#issuecomment-927653102 + +--- + data/reference/extension/openssl/40/constants.json | 8 +++++++- + data/reference/extension/openssl/81/constants.json | 13 ------------- + src/Application/Query/Init/InitHandler.php | 2 +- + 3 files changed, 8 insertions(+), 15 deletions(-) + delete mode 100644 data/reference/extension/openssl/81/constants.json + +diff --git a/data/reference/extension/openssl/40/constants.json b/data/reference/extension/openssl/40/constants.json +index f098bcc6..f626e042 100644 +--- a/data/reference/extension/openssl/40/constants.json ++++ b/data/reference/extension/openssl/40/constants.json +@@ -37,7 +37,13 @@ + { + "name": "OPENSSL_SSLV23_PADDING", + "ext_min": "4.0.4", +- "php_min": "4.0.4" ++ "php_min": "4.0.4", ++ "dependencies": [ ++ { ++ "name": "openssl", ++ "constraint": "<3.0.0" ++ } ++ ] + }, + { + "name": "PKCS7_BINARY", + diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec index 6bd7fe7..0ea50b4 100644 --- a/php-bartlett-php-compatinfo-db.spec +++ b/php-bartlett-php-compatinfo-db.spec @@ -49,6 +49,8 @@ Patch0: %{name}-3.10-rpm.patch # - CURL_SSLVERSION constants # - Phar::OPENSSL_SHA* constants Patch1: %{name}-backports.patch +# upstream +Patch2: %{name}-upstream.patch BuildArch: noarch @@ -156,7 +158,8 @@ Conflicts: php-bartlett-PHP-CompatInfo < 5 %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -%patch1 -p1 -b .curltls +%patch2 -p1 -b .up +%patch1 -p1 -b .backports : relocate mv config src/config @@ -289,8 +292,13 @@ exit $ret %changelog +* Mon Sep 27 2021 Remi Collet <remi@remirepo.net> - 3.11.0-2 +- add upstream patch for OpenSSL test suite + * Mon Sep 27 2021 Remi Collet <remi@remirepo.net> - 3.11.0-1 - update to 3.11.0 +- open https://github.com/llaville/php-compatinfo-db/issues/88 + OPENSSL_SSLV23_PADDING is optional * Wed Sep 1 2021 Remi Collet <remi@remirepo.net> - 3.10.0-1 - update to 3.10.0 |