summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-05-03 09:05:30 +0200
committerRemi Collet <remi@remirepo.net>2021-05-03 09:05:30 +0200
commit6f7d4a6c161334e0d779a61d020864bc2c059a0b (patch)
tree257583ce9da4fd86b50a50e72b71e4fe84467416
parent4f5aeaa392ffb6a41595f235ce499bcf8facd0e9 (diff)
update to 3.5.0HEADmaster
open https://github.com/llaville/php-compatinfo-db/issues/75 test failure add patch to add CURL_VERSION_ALTSVC in reference
-rw-r--r--php-bartlett-php-compatinfo-db-curl.patch22
-rw-r--r--php-bartlett-php-compatinfo-db-curltls.patch6
-rw-r--r--php-bartlett-php-compatinfo-db.spec18
3 files changed, 37 insertions, 9 deletions
diff --git a/php-bartlett-php-compatinfo-db-curl.patch b/php-bartlett-php-compatinfo-db-curl.patch
new file mode 100644
index 0000000..e49aed0
--- /dev/null
+++ b/php-bartlett-php-compatinfo-db-curl.patch
@@ -0,0 +1,22 @@
+diff --git a/data/reference/extension/curl/73/constants.json b/data/reference/extension/curl/73/constants.json
+index cf75fed..3cbb886 100644
+--- a/data/reference/extension/curl/73/constants.json
++++ b/data/reference/extension/curl/73/constants.json
+@@ -598,5 +598,16 @@
+ "constraint": "~7.64.0"
+ }
+ ]
++ },
++ {
++ "name": "CURL_VERSION_ALTSVC",
++ "ext_min": "7.3.6RC1",
++ "php_min": "7.3.6RC1",
++ "dependencies": [
++ {
++ "name": "libcurl",
++ "constraint": "~7.64.1"
++ }
++ ]
+ }
+ ]
+
diff --git a/php-bartlett-php-compatinfo-db-curltls.patch b/php-bartlett-php-compatinfo-db-curltls.patch
index a9ef45d..b440d19 100644
--- a/php-bartlett-php-compatinfo-db-curltls.patch
+++ b/php-bartlett-php-compatinfo-db-curltls.patch
@@ -1,6 +1,6 @@
-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
+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 @@
},
{
diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec
index 8bfb5bb..4abda60 100644
--- a/php-bartlett-php-compatinfo-db.spec
+++ b/php-bartlett-php-compatinfo-db.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
# See https://github.com/llaville/php-compatinfo-db/releases
-%global gh_commit 35e3902e44f3345dae2dcb85f3fb903600ab19af
+%global gh_commit 804010338882ea49b9d985405481610cb8fa291d
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20151031
%global gh_owner llaville
@@ -26,12 +26,12 @@
%bcond_with tests
%endif
-%global upstream_version 3.4.2
+%global upstream_version 3.5.0
#global upstream_prever RC1
Name: php-%{c_vendor}-%{c_project}
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Reference Database to be used with php-compatinfo library
License: BSD
@@ -45,8 +45,8 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
Patch0: %{name}-3.4-rpm.patch
# CURL_SSLVERSION constants have been backported
Patch1: %{name}-curltls.patch
-
-# upstream patches
+# CURL_VERSION_ALTSVC
+Patch2: %{name}-curl.patch
BuildArch: noarch
BuildRequires: php(language) >= 7.2
@@ -141,7 +141,8 @@ Conflicts: php-bartlett-PHP-CompatInfo < 5
%setup -q -n %{gh_project}-%{gh_commit}
%patch0 -p1 -b .rpm
-%patch1 -p0 -b .curltls
+%patch1 -p1 -b .curltls
+%patch2 -p1 -b .curl
: relocate
mv config src/config
@@ -272,6 +273,11 @@ exit $ret
%changelog
+* Mon May 3 2021 Remi Collet <remi@remirepo.net> - 3.5.0-1
+- update to 3.5.0
+- open https://github.com/llaville/php-compatinfo-db/issues/75 test failure
+- add patch to add CURL_VERSION_ALTSVC in reference
+
* Wed Mar 17 2021 Remi Collet <remi@remirepo.net> - 3.4.2-2
- use static proxy files to fix multi-users issue
https://github.com/llaville/php-compatinfo-db/issues/71