diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-yaml.spec | 26 | ||||
| -rw-r--r-- | yaml-php81.patch | 48 |
4 files changed, 10 insertions, 68 deletions
@@ -2,7 +2,7 @@ yaml LibYAML Support => enabled -Module Version => 2.2.1 +Module Version => 2.2.2 LibYAML Version => 0.2.5 Directive => Local Value => Master Value @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #106 yaml version 2.2.1 ] { +Extension [ <persistent> extension #113 yaml version 2.2.2 ] { - Dependencies { Dependency [ date (Optional) ] diff --git a/php-pecl-yaml.spec b/php-pecl-yaml.spec index 8e26599..10770c2 100644 --- a/php-pecl-yaml.spec +++ b/php-pecl-yaml.spec @@ -18,20 +18,18 @@ %global pecl_name yaml %global ini_name 40-%{pecl_name}.ini -%global upstream_version 2.2.1 +%global upstream_version 2.2.2 #global upstream_prever b2 Summary: PHP Bindings for yaml Name: %{?sub_prefix}php-pecl-yaml Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 8%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT URL: https://pecl.php.net/package/yaml Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -Patch0: %{pecl_name}-php81.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.1 @@ -54,18 +52,12 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{relea %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "7.2" Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" Obsoletes: php74-pecl-%{pecl_name} <= %{version} @@ -98,8 +90,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 - # Check upstream version (often broken) extver=$(sed -n '/#define PHP_YAML_VERSION/{s/.* "//;s/".*$//;p}' php_yaml.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -189,11 +179,9 @@ cd NTS --modules | grep '^%{pecl_name}$' : Upstream test suite for NTS extension -TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php --show-diff +%{__php} -n run-tests.php -q -P --show-diff %if %{with_zts} cd ../ZTS @@ -203,11 +191,9 @@ cd ../ZTS --modules | grep '^%{pecl_name}$' : Upstream test suite for ZTS extension -TEST_PHP_EXECUTABLE=%{__ztsphp} \ TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ -NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php --show-diff +%{__ztsphp} -n run-tests.php -q -P --show-diff %endif @@ -247,6 +233,10 @@ fi %changelog +* Mon Oct 25 2021 Remi Collet <remi@remirepo.net> - 2.2.2-1 +- update to 2.2.2 +- drop patch merged upstream + * Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 2.2.1-8 - rebuild for 8.1.0RC1 diff --git a/yaml-php81.patch b/yaml-php81.patch deleted file mode 100644 index 7cee205..0000000 --- a/yaml-php81.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 53065f4a99d94c6576067df4bc34f1f6fd32d59a Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 9 Jun 2021 15:51:54 +0200 -Subject: [PATCH 1/2] relax test, hide deprecation message - ---- - tests/yaml_parse_file_002.phpt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/yaml_parse_file_002.phpt b/tests/yaml_parse_file_002.phpt -index 83c54c7..d626eab 100644 ---- a/tests/yaml_parse_file_002.phpt -+++ b/tests/yaml_parse_file_002.phpt -@@ -5,6 +5,8 @@ yaml_parse_file - error cases - --INI-- - yaml.decode_timestamp=1 - date.timezone=GMT -+; E_ALL - E_DEPRECATED to hide Deprecated: yaml_parse_file(): Passing null to parameter #1... -+error_reporting=24575 - --FILE-- - <?php - try { - -From 0dbda266156a6d77496f28c5055131bcb4ca0b7f Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 23 Jul 2021 13:52:03 +0200 -Subject: [PATCH 2/2] fix ZEND_ATOL usage - ---- - detect.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/detect.c b/detect.c -index 1d650f7..0a18aba 100644 ---- a/detect.c -+++ b/detect.c -@@ -542,7 +542,11 @@ scalar_is_numeric(const char *value, size_t length, zend_long *lval, - break; - - default: -+#if PHP_VERSION_ID < 80100 - ZEND_ATOL(*lval, buf); -+#else -+ *lval = ZEND_ATOL(buf); -+#endif - break; - } - |