diff options
| -rw-r--r-- | 50353e06d89a0bf0a77287f9d232f3a2edb60667.patch | 26 | ||||
| -rw-r--r-- | PHPINFO | 8 | ||||
| -rw-r--r-- | REFLECTION | 10 | ||||
| -rw-r--r-- | php-pecl-apcu.spec | 14 |
4 files changed, 17 insertions, 41 deletions
diff --git a/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch b/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch deleted file mode 100644 index 4da2788..0000000 --- a/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 50353e06d89a0bf0a77287f9d232f3a2edb60667 Mon Sep 17 00:00:00 2001 -From: Nikita Popov <nikita.ppv@gmail.com> -Date: Fri, 7 Jun 2019 10:04:14 +0200 -Subject: [PATCH] Use different fatal error - -The string conversion fatal is an exception in 7.4. ---- - tests/apc_entry_003.phpt | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/tests/apc_entry_003.phpt b/tests/apc_entry_003.phpt -index ef8ace9..0fd7be4 100644 ---- a/tests/apc_entry_003.phpt -+++ b/tests/apc_entry_003.phpt -@@ -8,8 +8,9 @@ apc.enable_cli=1 - --FILE-- - <?php - $value = apcu_entry("test", function($key) { -- (string) new stdClass; -+ // Fatal error -+ class X implements Y {} - }); - ?> - --EXPECTF-- --%s fatal error: Object of class stdClass could not be converted to string in %s on line %d -+Fatal error: Interface 'Y' not found in %s on line %d @@ -2,12 +2,12 @@ apcu APCu Support => Enabled -Version => 5.1.17 +Version => 5.1.18 APCu Debugging => Disabled MMAP Support => Enabled -MMAP File Mask => /tmp/apc.GR4vQm +MMAP File Mask => /tmp/apc.lNWw6r Serialization Support => php, igbinary -Build Date => Feb 8 2019 11:54:42 +Build Date => Oct 28 2019 06:57:45 Directive => Local Value => Master Value apc.enabled => On => On @@ -17,7 +17,7 @@ apc.entries_hint => 4096 => 4096 apc.gc_ttl => 3600 => 3600 apc.ttl => 0 => 0 apc.smart => 0 => 0 -apc.mmap_file_mask => /tmp/apc.GR4vQm => /tmp/apc.GR4vQm +apc.mmap_file_mask => /tmp/apc.lNWw6r => /tmp/apc.lNWw6r apc.enable_cli => On => On apc.slam_defense => Off => Off apc.preload_path => no value => no value @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #75 apcu version 5.1.17 ] { +Extension [ <persistent> extension #74 apcu version 5.1.18 ] { - INI { Entry [ apc.enabled <SYSTEM> ] @@ -23,7 +23,7 @@ Extension [ <persistent> extension #75 apcu version 5.1.17 ] { Current = '0' } Entry [ apc.mmap_file_mask <SYSTEM> ] - Current = '/tmp/apc.SvCmZg' + Current = '/tmp/apc.WBmQ7j' } Entry [ apc.enable_cli <SYSTEM> ] Current = '1' @@ -46,7 +46,7 @@ Extension [ <persistent> extension #75 apcu version 5.1.17 ] { } - Constants [16] { - Constant [ integer ] { 139780637056704 } + Constant [ integer ] { 139698354347520 } Constant [ integer APC_LIST_ACTIVE ] { 1 } Constant [ integer APC_LIST_DELETED ] { 2 } Constant [ integer APC_ITER_TYPE ] { 1 } @@ -97,7 +97,7 @@ Extension [ <persistent> extension #75 apcu version 5.1.17 ] { - Parameters [3] { Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $var ] + Parameter #1 [ <optional> $var ] Parameter #2 [ <optional> $ttl ] } } @@ -118,7 +118,7 @@ Extension [ <persistent> extension #75 apcu version 5.1.17 ] { - Parameters [3] { Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $var ] + Parameter #1 [ <optional> $var ] Parameter #2 [ <optional> $ttl ] } } diff --git a/php-pecl-apcu.spec b/php-pecl-apcu.spec index 613ceff..e111306 100644 --- a/php-pecl-apcu.spec +++ b/php-pecl-apcu.spec @@ -29,20 +29,18 @@ Name: %{?sub_prefix}php-pecl-apcu Summary: APC User Cache -Version: 5.1.17 +Version: 5.1.18 %if 0%{?gh_date:1} Release: 0.7.%{gh_date}git%{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: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif Source1: %{pecl_name}-5.1.2.ini Source2: %{pecl_name}-panel.conf Source3: %{pecl_name}.conf.php -Patch0: https://github.com/krakjoe/apcu/commit/50353e06d89a0bf0a77287f9d232f3a2edb60667.patch - License: PHP URL: http://pecl.php.net/package/APCu @@ -159,8 +157,6 @@ mv %{pecl_name}-%{version} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS -%patch0 -p1 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h) if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:-dev}"; then @@ -326,6 +322,12 @@ fi %changelog +* Mon Oct 28 2019 Remi Collet <remi@remirepo.net> - 5.1.18-1 +- update to 5.1.18 + +* Thu Oct 3 2019 Remi Collet <remi@remirepo.net> - 5.1.17-6 +- more upstream patch for test suite + * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 5.1.17-5 - rebuild for 7.4.0RC1 |