Update php-apcu to 5.1.10 - small bugfixes

Changes since 5.1.9:

- fix gh#247 when a NUL char is used as key, apcu_fetch(array) truncates the key
- fix gh#248 apcu_fetch may return values causing zend_mm_corruption or segfaults
when custom serializer is used
- fix gh#260 apcu.serializer=default results in segfault
- fix gh#274 non-portable shell == in config.m4
- fix crash when passing bad array to apcu_delete
- improve fix gh#266 refcounting errors in APCIterator
- fix for PHP 7.3 compatibility

4 files changed, 7 insertions, 53 deletions

diff --git a/www/php-apcu/Makefile b/www/php-apcu/Makefile
index c07ba1371bd..8af2bbdc0a1 100644
--- a/www/php-apcu/Makefile
+++ b/www/php-apcu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2018/01/10 10:05:17 jdolecek Exp $
+# $NetBSD: Makefile,v 1.11 2018/02/16 06:58:53 jdolecek Exp $
 
 MODNAME=	apcu
-PECL_VERSION=	5.1.9
+PECL_VERSION=	5.1.10
 CATEGORIES+=	sysutils
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/php-apcu/distinfo b/www/php-apcu/distinfo
index a4accc724e9..18da9384358 100644
--- a/www/php-apcu/distinfo
+++ b/www/php-apcu/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.10 2018/02/08 22:15:12 jdolecek Exp $
+$NetBSD: distinfo,v 1.11 2018/02/16 06:58:53 jdolecek Exp $
 
-SHA1 (php-apcu/apcu-5.1.9.tgz) = 4dd5ec78809e9bf1a349d1e785372ed7edfd5706
-RMD160 (php-apcu/apcu-5.1.9.tgz) = 827ac171425e8036dd2be4138761e2011550e9ca
-SHA512 (php-apcu/apcu-5.1.9.tgz) = 3e9b29a293b5bfb29283dd650907bfb9f31a1cb99ef908021d3869c3e3ae4051a2c45aab27275e90b0a2fa94c35cc9e170637dc539184d955f3f13dc09cba060
-Size (php-apcu/apcu-5.1.9.tgz) = 111049 bytes
-SHA1 (patch-.._package.xml) = 4052d3a47314eb76c33a92ee3abda807f656f144
-SHA1 (patch-config.m4) = b01f8d940322830c2766a77d1a14880dd34aec0d
+SHA1 (php-apcu/apcu-5.1.10.tgz) = 1ba89d533e44411ace5088e611138006007c1bb4
+RMD160 (php-apcu/apcu-5.1.10.tgz) = d877ffce72bf66ca21f196a46a21237ad7e1dc7a
+SHA512 (php-apcu/apcu-5.1.10.tgz) = fdf82f2b46231849b373f50d1255bcedab8fbefa7ded7c157649cf6406fb593cc2f4e63ca7d3cecfbadb4533ecd8d0ad80e198626dc1489cea8a22ba87ca583a
+Size (php-apcu/apcu-5.1.10.tgz) = 111937 bytes
diff --git a/www/php-apcu/patches/patch-.._package.xml b/www/php-apcu/patches/patch-.._package.xml
deleted file mode 100644
index 4b5780cac19..00000000000
--- a/www/php-apcu/patches/patch-.._package.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-.._package.xml,v 1.3 2018/01/10 10:05:17 jdolecek Exp $
-
-Update md5 sum. Remove once the config.m4 patch is merged, reported
-upstream as #75791.
-
---- ../package.xml.orig	2018-01-02 14:08:16.000000000 +0000
-+++ ../package.xml
-@@ -121,7 +121,7 @@
-    <file md5sum="9ef781739883eec8bb8743df9083152b" name="pgsql_s_lock.h" role="src" />
-    <file md5sum="c95208eaf18327335d822da86eaa5bcf" name="pgsql_s_lock.c" role="src" />
-    <file md5sum="610c03c9de0306986a66f3c6d2d97b9c" name="apc_serializer.h" role="src" />
--   <file md5sum="13d18fe32d6b8ed48f276349e54355aa" name="config.m4" role="src" />
-+   <file md5sum="7c0ecf1beafb4f5a61aa6ba34498beb7" name="config.m4" role="src" />
-    <file md5sum="e76c6931b54dc5fb3f55b20cd53aea04" name="config.w32" role="src" />
-    <file md5sum="d6c836c279b1fbabf69ada700dd5cdfc" name="INSTALL" role="doc" />
-    <file md5sum="52dd90569008fee5bcdbb22d945b1108" name="LICENSE" role="doc" />
diff --git a/www/php-apcu/patches/patch-config.m4 b/www/php-apcu/patches/patch-config.m4
deleted file mode 100644
index 5623c9601dc..00000000000
--- a/www/php-apcu/patches/patch-config.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-config.m4,v 1.4 2018/02/08 22:15:12 jdolecek Exp $
-
-Fix bashism. Reported upstream as #75791.
-
-Reported also as GH#274 - https://github.com/krakjoe/apcu/issues/274
-
---- config.m4.orig	2016-06-07 12:41:02.000000000 +0000
-+++ config.m4
-@@ -149,7 +149,7 @@ if test "$PHP_APCU" != "no"; then
- 		fi
- 	fi
-   
--  if test "$PHP_APCU_RWLOCKS" == "no"; then
-+  if test "$PHP_APCU_RWLOCKS" = "no"; then
-     orig_LIBS="$LIBS"
- 	  LIBS="$LIBS -lpthread"
- 	  AC_TRY_RUN(
-@@ -202,8 +202,8 @@ if test "$PHP_APCU" != "no"; then
- 	  LIBS="$orig_LIBS"
-   fi
-   
--  if test "$PHP_APCU_RWLOCKS" == "no"; then
--   if test "$PHP_APCU_MUTEX" == "no"; then
-+  if test "$PHP_APCU_RWLOCKS" = "no"; then
-+   if test "$PHP_APCU_MUTEX" = "no"; then
-     if test "$PHP_APCU_SPINLOCK" != "no"; then
-       AC_DEFINE(APC_SPIN_LOCK, 1, [ ])
-       AC_MSG_WARN([APCu spin locking enabled])