php-pecl-apcu: 5.1.6

3 files changed, 8 insertions, 45 deletions

diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7
index 0c8f5d1..4a946c6 100644
--- a/REFLECTION-PHP7
+++ b/REFLECTION-PHP7
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #59 apcu version 5.1.5 ] {
+Extension [ <persistent> extension #73 apcu version 5.1.6 ] {
 
   - INI {
     Entry [ apc.enabled <SYSTEM> ]
@@ -23,7 +23,7 @@ Extension [ <persistent> extension #59 apcu version 5.1.5 ] {
       Current = '0'
     }
     Entry [ apc.mmap_file_mask <SYSTEM> ]
-      Current = '/tmp/apc.xbIfwt'
+      Current = '/tmp/apc.Gxldqf'
     }
     Entry [ apc.enable_cli <SYSTEM> ]
       Current = '1'
@@ -49,7 +49,7 @@ Extension [ <persistent> extension #59 apcu version 5.1.5 ] {
   }
 
   - Constants [16] {
-    Constant [ integer  ] { 140193821331984 }
+    Constant [ integer  ] { 140364501230496 }
     Constant [ integer APC_LIST_ACTIVE ] { 1 }
     Constant [ integer APC_LIST_DELETED ] { 2 }
     Constant [ integer APC_ITER_TYPE ] { 1 }
diff --git a/apcu-upstream.patch b/apcu-upstream.patch
deleted file mode 100644
index 72e15fd..0000000
--- a/apcu-upstream.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 563c4573d439d5371f7f331b5117b7e6b648ed17 Mon Sep 17 00:00:00 2001
-From: Tyson Andre <tysonandre775@hotmail.com>
-Date: Sun, 24 Jul 2016 19:05:10 -0700
-Subject: [PATCH] Fixes #188: Fix Segfault in ZTS build when locking
-
-In ZTS builds with static TSRMLS,
-blocking interruptions requires TSRMLS to be initialized.
-
-(WLOCK will block signal interruptions, then acquire a lock)
-
-The code initialized it in RINIT (per-request), but did not initialize
-it in MINIT(module init).
-But module init needed to lock in order to not be interrupted while
-allocating an arena in shared memory.
-
-Fixed this by calling ZEND_TSRMLS_CACHE_UPDATE();
-
-Other extensions do this in MINIT in both php-7.0 and php-7.1
-E.g.  https://github.com/php/php-src/blob/PHP-7.0.9/ext/mbstring/mbstring.c#L1550
----
- php_apc.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/php_apc.c b/php_apc.c
-index 83fd758..d79338e 100644
---- a/php_apc.c
-+++ b/php_apc.c
-@@ -210,6 +210,9 @@ static PHP_MINFO_FUNCTION(apcu)
- /* {{{ PHP_MINIT_FUNCTION(apcu) */
- static PHP_MINIT_FUNCTION(apcu)
- {
-+#if defined(ZTS) && defined(COMPILE_DL_APCU)
-+    ZEND_TSRMLS_CACHE_UPDATE();
-+#endif
-     ZEND_INIT_MODULE_GLOBALS(apcu, php_apc_init_globals, NULL);
- 
-     REGISTER_INI_ENTRIES();
diff --git a/php-pecl-apcu-php7.spec b/php-pecl-apcu-php7.spec
index c2f1048..7ba081b 100644
--- a/php-pecl-apcu-php7.spec
+++ b/php-pecl-apcu-php7.spec
@@ -26,20 +26,18 @@
 
 Name:           %{?sub_prefix}php-pecl-apcu
 Summary:        APC User Cache
-Version:        5.1.5
+Version:        5.1.6
 %if 0%{?gh_date:1}
 Release:        0.3.%{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:        4%{?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:         %{pecl_name}-upstream.patch
-
 License:        PHP
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/APCu
@@ -153,7 +151,6 @@ mv %{pecl_name}-%{version} NTS
 %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
 
 cd NTS
-%patch0 -p1 -b .upstream
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_APCU_VERSION/{s/.* "//;s/".*$//;p}' php_apc.h)
@@ -315,6 +312,9 @@ fi
 
 
 %changelog
+* Thu Oct  6 2016 Remi Collet <remi@fedoraproject.org> - 5.1.6-1
+- Update to 5.1.6 (php 7, stable)
+
 * Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 5.1.5-4
 - rebuild for PHP 7.1 new API version