diff options
| -rw-r--r-- | 393.patch | 29 | ||||
| -rw-r--r-- | 398.patch | 25 | ||||
| -rw-r--r-- | 399.patch | 55 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-igbinary.spec | 46 |
6 files changed, 22 insertions, 137 deletions
diff --git a/393.patch b/393.patch deleted file mode 100644 index 6b47045..0000000 --- a/393.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f5d5ce34a0f7ef60a7321fd79a1477b32fc1e03b Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 30 Sep 2024 08:05:42 +0200 -Subject: [PATCH] E_STRICT is deprecated in 8.4 - ---- - tests/igbinary_009b_php8.phpt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/igbinary_009b_php8.phpt b/tests/igbinary_009b_php8.phpt -index 483576aa..33d24518 100644 ---- a/tests/igbinary_009b_php8.phpt -+++ b/tests/igbinary_009b_php8.phpt -@@ -12,7 +12,7 @@ if (PHP_MAJOR_VERSION < 8) { - pcre.jit=0 - --FILE-- - <?php --error_reporting(E_ALL|E_STRICT); -+error_reporting(PHP_VERSION_ID < 80400 ?E_ALL|E_STRICT : E_ALL); - // Verify that $type[0] is the same zval as $type[0][0][0], but different from $type[0] - function test_cyclic2($type, $variable) { - $serialized = igbinary_serialize($variable); -@@ -111,4 +111,4 @@ array(1) { - } - } - --(Was normalized) -\ No newline at end of file -+(Was normalized) diff --git a/398.patch b/398.patch deleted file mode 100644 index 117abd2..0000000 --- a/398.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c7fe8aad3d7894bb85f5a189eba60dec9203950d Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 30 Jul 2025 11:38:30 +0200 -Subject: [PATCH] use Zend/zend_smart_string.h - ---- - src/php7/php_igbinary.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/php7/php_igbinary.h b/src/php7/php_igbinary.h -index 07312b76..d64c3702 100644 ---- a/src/php7/php_igbinary.h -+++ b/src/php7/php_igbinary.h -@@ -32,7 +32,11 @@ ZEND_END_MODULE_GLOBALS(igbinary) - #include "TSRM.h" - #endif - -+#if PHP_VERSION_ID < 70200 - #include "ext/standard/php_smart_string.h" -+#else -+#include "Zend/zend_smart_string.h" -+#endif - - /** Module init function. */ - PHP_MINIT_FUNCTION(igbinary); diff --git a/399.patch b/399.patch deleted file mode 100644 index d9ed571..0000000 --- a/399.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d28f7e6e5a2e7f73225bdf9b619920a7986ff885 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 1 Sep 2025 14:59:55 +0200 -Subject: [PATCH] fix tests for 8.5.0beta2 - ---- - tests/igbinary_026_php8.phpt | 2 -- - tests/igbinary_026b_php8.phpt | 4 +--- - tests/igbinary_057.phpt | 2 +- - 3 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/tests/igbinary_026_php8.phpt b/tests/igbinary_026_php8.phpt -index 91313d16..9a5aad4e 100644 ---- a/tests/igbinary_026_php8.phpt -+++ b/tests/igbinary_026_php8.phpt -@@ -1,7 +1,5 @@ - --TEST-- - Cyclic array test ----INI-- --report_memleaks=0 - --SKIPIF-- - <?php - if (!extension_loaded('igbinary')) { -diff --git a/tests/igbinary_026b_php8.phpt b/tests/igbinary_026b_php8.phpt -index b5ffa9cd..7489d539 100644 ---- a/tests/igbinary_026b_php8.phpt -+++ b/tests/igbinary_026b_php8.phpt -@@ -1,7 +1,5 @@ - --TEST-- - Cyclic array test 2 ----INI-- --report_memleaks=0 - --SKIPIF-- - <?php - if (!extension_loaded('igbinary')) { -@@ -83,4 +81,4 @@ array(1) { - } - } - --OK -\ No newline at end of file -+OK -diff --git a/tests/igbinary_057.phpt b/tests/igbinary_057.phpt -index 7df8ab5b..7d86d134 100644 ---- a/tests/igbinary_057.phpt -+++ b/tests/igbinary_057.phpt -@@ -6,7 +6,7 @@ Test serializing more strings than the capacity of the initial strings table. - function main() { - $array = array(); - for ($i = 0; $i < 2; $i++) { -- for ($c = 'a'; $c < 'z'; $c++) { -+ for ($c = 'a'; $c < 'z'; $c = chr(ord($c)+1)) { - $array[] = $c; - } - } @@ -2,7 +2,7 @@ igbinary igbinary support => enabled -igbinary version => 3.2.16 +igbinary version => 3.2.17RC1 igbinary APCu serializer ABI => 0 igbinary session support => yes @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #76 igbinary version 3.2.16 ] { +Extension [ <persistent> extension #88 igbinary version 3.2.17RC1 ] { - Dependencies { Dependency [ standard (Required) ] diff --git a/php-pecl-igbinary.spec b/php-pecl-igbinary.spec index bcf3e71..9f34153 100644 --- a/php-pecl-igbinary.spec +++ b/php-pecl-igbinary.spec @@ -14,28 +14,26 @@ %bcond_without tests %global pecl_name igbinary +%global pie_vend igbinary +%global pie_proj igbinary %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global gh_commit 6a2d5b7ea71489c4d7065dc7746d37cfa80d501c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global ini_name 40-%{pecl_name}.ini -%global upstream_version 3.2.16 -#global upstream_prever RC1 +%global upstream_version 3.2.17 +%global upstream_prever RC1 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure Summary: Replacement for the standard PHP serializer Name: %{?scl_prefix}php-pecl-igbinary Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 8%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 1%{?dist} License: BSD-3-Clause URL: https://pecl.php.net/package/igbinary Source0: https://pecl.php.net/get/%{sources}.tgz -Patch0: 393.patch -Patch1: 398.patch -Patch2: 399.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-pear @@ -48,11 +46,16 @@ BuildRequires: tzdata Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -Obsoletes: %{?scl_prefix}php-%{pecl_name} <= 1.1.1 -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +# Extension +Obsoletes: %{?scl_prefix}php-%{pecl_name} <= 1.1.1 +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +# PECL +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +# PIE +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version} %description @@ -82,23 +85,9 @@ These are the files needed to compile programs using Igbinary %prep %setup -q -c -%if 0%{?gh_date} -%{__php} -r ' - $pkg = simplexml_load_file("NTS/package.xml"); - $pkg->date = substr("%{gh_date}",0,4)."-".substr("%{gh_date}",4,2)."-".substr("%{gh_date}",6,2); - $pkg->version->release = "%{version}dev"; - $pkg->stability->release = "devel"; - $pkg->asXML("package.xml"); -' -%endif - sed -e '/COPYING/s/role="doc"/role="src"/' -i package.xml pushd %{sources} -%patch -P0 -p1 -b .pr393 -%patch -P1 -p1 -b .pr398 -%patch -P2 -p1 -b .pr399 - # Check version subdir=php7 extver=$(sed -n '/#define PHP_IGBINARY_VERSION/{s/.* "//;s/".*$//;p}' src/$subdir/igbinary.h) @@ -239,6 +228,11 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Nov 27 2025 Remi Collet <remi@remirepo.net> - 3.2.17~RC1-1 +- update to 3.2.17RC1 +- add pie virtual provides +- drop patches merged upstream + * Tue Oct 7 2025 Remi Collet <remi@remirepo.net> - 3.2.16-8 - rebuild for PHP 8.5.0RC2 - re-enable full test suite |