From 1f32326a5a31b65927b031ac687c48f750f1e21b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 14 Nov 2016 09:57:52 +0100 Subject: [PATCH] - rebuild for https://fedoraproject.org/wiki/Changes/php71 - add patch for PHP 7.1 --- msgpack-php71.patch | 21 +++++++++++++++++++++ php-pecl-msgpack.spec | 11 ++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 msgpack-php71.patch diff --git a/msgpack-php71.patch b/msgpack-php71.patch new file mode 100644 index 0000000..bab1d2a --- /dev/null +++ b/msgpack-php71.patch @@ -0,0 +1,21 @@ +diff --git a/msgpack_unpack.h b/msgpack_unpack.h +index 5dc9524..0851625 100644 +--- a/msgpack_unpack.h ++++ b/msgpack_unpack.h +@@ -16,6 +16,16 @@ typedef enum + MSGPACK_UNPACK_PARSE_ERROR = -1, + } msgpack_unpack_return; + ++#if PHP_VERSION_ID >= 70100 ++typedef struct php_unserialize_data { ++ void *first; ++ void *last; ++ void *first_dtor; ++ void *last_dtor; ++ HashTable *allowed_classes; ++}; ++#endif ++ + typedef struct php_unserialize_data msgpack_unserialize_data_t; + + typedef struct { diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec index 07c37e8..5e97dc4 100644 --- a/php-pecl-msgpack.spec +++ b/php-pecl-msgpack.spec @@ -15,13 +15,16 @@ Summary: API for communicating with MessagePack serialization Name: php-pecl-msgpack Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/msgpack Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Patch0: %{pecl_name}-pr87.patch +# Temp for https://github.com/msgpack/msgpack-php/issues/100 +Patch1: %{pecl_name}-php71.patch + BuildRequires: php-devel > 7 BuildRequires: php-pear @@ -73,6 +76,8 @@ mv %{pecl_name}-%{version} NTS sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd NTS +%patch0 -p1 -b .pr87 +%patch1 -p1 -b .php71 %if %{with_msgpack} # use system library @@ -206,6 +211,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Mon Nov 14 2016 Remi Collet - 2.0.1-2 +- rebuild for https://fedoraproject.org/wiki/Changes/php71 +- add patch for PHP 7.1 + * Mon Jun 27 2016 Remi Collet - 2.0.1-1 - update to 2.0.1 (php 7, beta) - add patch for PHP 7.1