v2.2.0RC2

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -5,3 +5,9 @@ clog
 /msgpack-2.0.2.tgz
 /msgpack-2.0.3-943d272.tar.gz
 /msgpack-2.0.3.tgz
+/msgpack-2.1.0beta1.tgz
+/msgpack-2.1.0.tgz
+/msgpack-2.1.1.tgz
+/msgpack-2.1.2.tgz
+/msgpack-2.2.0RC1.tgz
+/msgpack-2.2.0RC2.tgz

125.patch

@@ -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);
- 

php-pecl-msgpack.spec

@@ -1,6 +1,6 @@
 # Fedora spec file for php-pecl-msgpack
 #
-# Copyright (c) 2012-2018 Remi Collet
+# Copyright (c) 2012-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,32 +10,32 @@
 # we don't want -z defs linker flag
 %undefine _strict_symbol_defs_build
 
+%global upstream_version 2.2.0
+%global upstream_prever  RC2
+%global upstream_lower   RC2
+
 %global pecl_name   msgpack
 %global with_zts    0%{?__ztsphp:1}
 %global ini_name  40-%{pecl_name}.ini
 # system library is outdated, and bundled library includes not yet released changes
-# e.g. missing template_callback_str in 1.4.1
+# BTW, only pack_template.h and unpack_template.h headers are used
 %global        with_msgpack 0
 
 Summary:       API for communicating with MessagePack serialization
 Name:          php-pecl-msgpack
-Version:       2.0.3
-Release:       2%{?dist}
-Source:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+Version:       %{upstream_version}%{?upstream_lower:~%{upstream_lower}}
+Release:       1%{?dist}
+Source:        https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 License:       BSD
-URL:           http://pecl.php.net/package/msgpack
+URL:           https://pecl.php.net/package/msgpack
 
-Patch2:        https://patch-diff.githubusercontent.com/raw/msgpack/msgpack-php/pull/125.patch
-
-BuildRequires: php-devel > 7
+BuildRequires: php-devel >= 7.0
 BuildRequires: php-pear
 %if %{with_msgpack}
 BuildRequires: msgpack-devel
 %else
-Provides:      bundled(msgpack)
+Provides:      bundled(msgpack) = 3.2.0
 %endif
-# https://github.com/msgpack/msgpack-php/issues/25
-ExcludeArch: ppc64
 
 Requires:      php(zend-abi) = %{php_zend_api}
 Requires:      php(api) = %{php_core_api}
@@ -73,13 +73,11 @@ These are the files needed to compile programs using MessagePack serializer.
 
 %prep
 %setup -qc
-mv %{pecl_name}-%{version} NTS
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 
 sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
 
 cd NTS
-%patch2 -p1 -b .pr125
-
 %if %{with_msgpack}
 # use system library
 rm -rf msgpack
@@ -90,8 +88,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 ..
@@ -156,9 +154,10 @@ done
 %check
 # Erratic results
 rm */tests/034.phpt
-# Known by upstream as failed test (travis result)
-rm */tests/041.phpt
-rm */tests/040*.phpt
+%ifarch aarch64
+# too slow
+rm */tests/035.phpt
+%endif
 
 cd NTS
 : Minimal load test for NTS extension
@@ -169,9 +168,7 @@ cd NTS
 : Upstream test suite  for NTS extension
 TEST_PHP_EXECUTABLE=%{_bindir}/php \
 TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=0 \
-%{_bindir}/php -n run-tests.php --show-diff
+%{_bindir}/php -n run-tests.php -q --show-diff
 
 %if %{with_zts}
 cd ../ZTS
@@ -183,9 +180,7 @@ cd ../ZTS
 : Upstream test suite  for ZTS extension
 TEST_PHP_EXECUTABLE=%{__ztsphp} \
 TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=0 \
-%{__ztsphp} -n run-tests.php --show-diff
+%{__ztsphp} -n run-tests.php -q --show-diff
 %endif
 
 
@@ -213,6 +208,55 @@ REPORT_EXIT_STATUS=0 \
 
 
 %changelog
+* Fri Oct  7 2022 Remi Collet <remi@remirepo.net> - 2.2.0~RC2-1
+- update to 2.2.0RC2
+
+* Wed Oct 05 2022 Remi Collet <remi@remirepo.net> - 2.2.0~RC1-4
+- rebuild for https://fedoraproject.org/wiki/Changes/php82
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0~RC1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0~RC1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Oct 28 2021 Remi Collet <remi@remirepo.net> - 2.2.0~RC1-1
+- update to 2.2.0RC1
+- rebuild for https://fedoraproject.org/wiki/Changes/php81
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Mar  4 2021 Remi Collet <remi@remirepo.net> - 2.1.2-2
+- rebuild for https://fedoraproject.org/wiki/Changes/php80
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 2.1.2-1
+- update to 2.1.2
+
+* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 2.1.1-1
+- update to 2.1.1
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Mar  2 2020 Remi Collet <remi@remirepo.net> - 2.1.0-1
+- update to 2.1.0
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0~beta1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 2.1.0~beta1-1
+- update to 2.1.0beta1
+
+* Thu Oct 03 2019 Remi Collet <remi@remirepo.net> - 2.0.3-4
+- rebuild for https://fedoraproject.org/wiki/Changes/php74
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (msgpack-2.0.3.tgz) = 4eaf5d2cd50796349414d8272e210f1c8c2e82d72383f440e13d31742a75b0e2fa1f48bd916c057b4c65778bd90eace7dcc0cdb86931620963e666f3aa6905db
+SHA512 (msgpack-2.2.0RC2.tgz) = 11b7243e6abb7dc58a02e2289433a292e2b2a3298357e3a14468faa06c7d302c442891cdf944e31b22435b9ce449b2ab632e30c1c5ccdec8f6b6e5033a2cdbef