diff options
| author | Remi Collet <remi@remirepo.net> | 2019-12-20 11:10:43 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-12-20 11:10:43 +0100 |
| commit | 159f5654ca927d1f9e955c6168b1f6d2476b201c (patch) | |
| tree | 4615174c57fc67e77cd8da3bceedf9f255977ef2 | |
| parent | 5cdf4151b0a9716e67c3f46f0a5c1eb61c4cb680 (diff) | |
test build for upcoming 2.1.0
| -rw-r--r-- | 125.patch | 36 | ||||
| -rw-r--r-- | PHPINFO | 4 | ||||
| -rw-r--r-- | REFLECTION | 6 | ||||
| -rw-r--r-- | php-pecl-msgpack.spec | 28 |
4 files changed, 21 insertions, 53 deletions
diff --git a/125.patch b/125.patch deleted file mode 100644 index 7744d05..0000000 --- a/125.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 98d4af769b3c1ee42240c7dfb3799a2ce5edb3f3 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 26 Jun 2018 14:56:03 +0200 -Subject: [PATCH] fix ce->name is a zend_string - ---- - msgpack_convert.c | 2 +- - msgpack_unpack.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/msgpack_convert.c b/msgpack_convert.c -index 117727e..85d1da6 100644 ---- a/msgpack_convert.c -+++ b/msgpack_convert.c -@@ -314,7 +314,7 @@ int msgpack_convert_object(zval *return_value, zval *tpl, zval *value) /* {{{ */ - if (zend_call_function(&fci, &fcc) == FAILURE) { - MSGPACK_WARNING( - "[msgpack] (%s) Invocation of %s's constructor failed", -- __FUNCTION__, ce->name); -+ __FUNCTION__, ZSTR_VAL(ce->name)); - - return FAILURE; - } -diff --git a/msgpack_unpack.c b/msgpack_unpack.c -index 263341b..6c3f30b 100644 ---- a/msgpack_unpack.c -+++ b/msgpack_unpack.c -@@ -557,7 +557,7 @@ int msgpack_unserialize_map_item(msgpack_unserialize_data *unpack, zval **contai - if (ce->unserialize == NULL) { - MSGPACK_WARNING( - "[msgpack] (%s) Class %s has no unserializer", -- __FUNCTION__, ce->name); -+ __FUNCTION__, ZSTR_VAL(ce->name)); - - MSGPACK_UNSERIALIZE_FINISH_MAP_ITEM(unpack, key, val); - @@ -3,8 +3,8 @@ msgpack MessagePack Support => enabled Session Support => enabled -extension Version => 2.0.3 -header Version => 0.5.4 +extension Version => 2.1.0beta1 +header Version => 3.2.0 Directive => Local Value => Master Value msgpack.error_display => On => On @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #117 msgpack version 2.0.3 ] { +Extension [ <persistent> extension #82 msgpack version 2.1.0beta1 ] { - INI { Entry [ msgpack.error_display <ALL> ] @@ -16,7 +16,7 @@ Extension [ <persistent> extension #117 msgpack version 2.0.3 ] { } - Constants [1] { - Constant [ integer MESSAGEPACK_OPT_PHPONLY ] { -1001 } + Constant [ int MESSAGEPACK_OPT_PHPONLY ] { -1001 } } - Functions { @@ -52,7 +52,7 @@ Extension [ <persistent> extension #117 msgpack version 2.0.3 ] { Class [ <internal:msgpack> class MessagePack ] { - Constants [1] { - Constant [ public integer OPT_PHPONLY ] { -1001 } + Constant [ public int OPT_PHPONLY ] { -1001 } } - Static properties [0] { diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec index 7afb1aa..93fd539 100644 --- a/php-pecl-msgpack.spec +++ b/php-pecl-msgpack.spec @@ -23,6 +23,10 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini +%global upstream_version 2.1.0 +%global upstream_prever beta1 +%global upstream_lower beta1 + %if 0 %global with_msgpack 1 %else @@ -31,19 +35,17 @@ Summary: API for communicating with MessagePack serialization Name: %{?sub_prefix}php-pecl-msgpack -Version: 2.0.3 +Version: %{upstream_version}%{?upstream_lower:~%{upstream_lower}} %if 0%{?gh_date:1} Release: 0.5.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Release: 0%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Source: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz %endif License: BSD Group: Development/Languages -URL: http://pecl.php.net/package/msgpack - -Patch2: https://patch-diff.githubusercontent.com/raw/msgpack/msgpack-php/pull/125.patch +URL: https://pecl.php.net/package/msgpack BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 @@ -87,11 +89,11 @@ 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: php73-pecl-%{pecl_name} <= %{version} Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} +Obsoletes: php74-pecl-%{pecl_name} <= %{version} Obsoletes: php74w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -143,13 +145,12 @@ mv %{gh_project}-%{gh_commit} NTS mv NTS/package.xml . sed -e '/release/s/0.5.6/%{version}%{?gh_date:dev}/' -i package.xml %else -mv %{pecl_name}-%{version} NTS +mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS %endif %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS -%patch2 -p1 -b .pr125 %if %{with_msgpack} # use system library @@ -158,8 +159,8 @@ rm -rf msgpack # Sanity check, really often broken extver=$(sed -n '/#define PHP_MSGPACK_VERSION/{s/.* "//;s/".*$//;p}' php_msgpack.h) -if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}%{?gh_date:-dev}. +if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}%{?gh_date:-dev}"; then + : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?gh_date:-dev}. exit 1 fi cd .. @@ -305,6 +306,9 @@ fi %changelog +* Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 2.1.0~beta1-0 +- test build for upcoming 2.1.0 + * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 2.0.3-3 - rebuild for 7.4.0RC1 |