From 1b56c553de93d5b79d357f88efdcc8a01f1e9e44 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Mar 2023 14:07:33 +0200 Subject: update to 1.2.1 drop patch merged upstream --- 0001-fix-95-compatibility-with-PHP-5.x.patch | 24 ------------------------ PHPINFO | 2 +- REFLECTION | 2 +- php-pecl-awscrt.spec | 10 +++++----- 4 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 0001-fix-95-compatibility-with-PHP-5.x.patch diff --git a/0001-fix-95-compatibility-with-PHP-5.x.patch b/0001-fix-95-compatibility-with-PHP-5.x.patch deleted file mode 100644 index 7865033..0000000 --- a/0001-fix-95-compatibility-with-PHP-5.x.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8a74a146b73f60bb2497ab313fe2db0bb3937597 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 17 Mar 2023 08:34:21 +0100 -Subject: [PATCH] fix #95 compatibility with PHP 5.x - ---- - ext/php_aws_crt.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ext/php_aws_crt.h b/ext/php_aws_crt.h -index 68951c1..a1fd37c 100644 ---- a/ext/php_aws_crt.h -+++ b/ext/php_aws_crt.h -@@ -60,6 +60,7 @@ ZEND_EXTERN_MODULE_GLOBALS(awscrt) - # define XRETURN_STRING(s) RETURN_STRING(s, 1) - # define XRETVAL_STRINGL(s, l) RETVAL_STRINGL(s, l, 1) - # define XRETVAL_STRING(s) RETVAL_STRING(s, 1) -+# define zend_error_noreturn zend_error - #endif /* PHP 5.x */ - - #include "api.h" --- -2.39.2 - diff --git a/PHPINFO b/PHPINFO index b4a9026..ba6093b 100644 --- a/PHPINFO +++ b/PHPINFO @@ -1,7 +1,7 @@ awscrt -Version => 1.2.0 +Version => 1.2.1 Directive => Local Value => Master Value awscrt.log_level => no value => no value diff --git a/REFLECTION b/REFLECTION index a3bb4ab..3518129 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #121 awscrt version 1.2.0 ] { +Extension [ extension #121 awscrt version 1.2.1 ] { - INI { Entry [ awscrt.log_level ] diff --git a/php-pecl-awscrt.spec b/php-pecl-awscrt.spec index ffc1064..3a34bb6 100644 --- a/php-pecl-awscrt.spec +++ b/php-pecl-awscrt.spec @@ -30,14 +30,12 @@ Summary: AWS Common Runtime PHP bindings Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: Apache-2.0 URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz -Patch0: 0001-fix-95-compatibility-with-PHP-5.x.patch - %if 0%{?rhel} == 7 && 0%{?dtsversion} == 0 BuildRequires: devtoolset-6-toolchain %global dtsversion 6 @@ -99,8 +97,6 @@ sed -e 's/role="test"/role="src"/' \ mv %{pecl_name}-%{version} NTS pushd NTS -%patch0 -p1 -b .pr96 - # Parallel build sed -e '/(CMAKE_BUILD)/s/$/ --verbose %{?_smp_mflags}/' -i Makefile.frag @@ -226,6 +222,10 @@ fi %changelog +* Wed Mar 29 2023 Remi Collet - 1.2.1-1 +- update to 1.2.1 +- drop patch merged upstream + * Fri Mar 17 2023 Remi Collet - 1.2.0-1 - update to 1.2.0 (stable) - fix https://github.com/awslabs/aws-crt-php/issues/95 PHP 5.x compatibility -- cgit