CVS commit: pkgsrc/www/php-apcu

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Thu Oct  6 14:28:43 UTC 2022

Modified Files:
        pkgsrc/www/php-apcu: Makefile distinfo
Added Files:
        pkgsrc/www/php-apcu/patches: patch-config.m4

Log Message:
www/php-apcu: update to 5.1.22

pkgsrc change:

* Allow build with enabling PKG_OPTIONS: maintainer-zts.
* Remove trailing whitespace.

5.1.22 (2022-09-19)

- PHP 8.2 compatibility
- PHP 8.1 compatibility in apc.php
- Fix --enable-apcu-rwlocks configure option
- Enable transparent huge pages for mmap memory
- Use monotonic clock for TTL


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/php-apcu/Makefile \
    pkgsrc/www/php-apcu/distinfo
cvs rdiff -u -r0 -r1.6 pkgsrc/www/php-apcu/patches/patch-config.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/php-apcu/Makefile
diff -u pkgsrc/www/php-apcu/Makefile:1.21 pkgsrc/www/php-apcu/Makefile:1.22
--- pkgsrc/www/php-apcu/Makefile:1.21   Sun Dec 12 15:25:53 2021
+++ pkgsrc/www/php-apcu/Makefile        Thu Oct  6 14:28:43 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2021/12/12 15:25:53 taca Exp $
+# $NetBSD: Makefile,v 1.22 2022/10/06 14:28:43 taca Exp $
 
 MODNAME=       apcu
-PECL_VERSION=  5.1.21
+PECL_VERSION=  5.1.22
 CATEGORIES+=   sysutils
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,7 +14,7 @@ GNU_CONFIGURE_STRICT= no # --with-pcre-d
 CONFIGURE_ARGS+=       --enable-${MODNAME}
 
 # Use spinlocks if available
-# XXX Default is fnctl, and implentation leaks 
+# XXX Default is fnctl, and implentation leaks
 # file descriptors on apachectl graceful
 .if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
 CONFIGURE_ARGS+=       --enable-apcu-spinlocks
Index: pkgsrc/www/php-apcu/distinfo
diff -u pkgsrc/www/php-apcu/distinfo:1.21 pkgsrc/www/php-apcu/distinfo:1.22
--- pkgsrc/www/php-apcu/distinfo:1.21   Sun Dec 12 15:25:53 2021
+++ pkgsrc/www/php-apcu/distinfo        Thu Oct  6 14:28:43 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2021/12/12 15:25:53 taca Exp $
+$NetBSD: distinfo,v 1.22 2022/10/06 14:28:43 taca Exp $
 
-BLAKE2s (php-apcu/apcu-5.1.21.tgz) = 41fc7d5c316aed24b431b73ccceac01a23a70bed608b340a3706bab57508aca5
-SHA512 (php-apcu/apcu-5.1.21.tgz) = a6ffe8349760d27cde0d86017a59a68e9639bf385e606622d807094f4e5fb305bb25b9ce00077d0856f4d223d44329f7a6314c229b62c78d8e2b085593c92bb3
-Size (php-apcu/apcu-5.1.21.tgz) = 92516 bytes
+BLAKE2s (php-apcu/apcu-5.1.22.tgz) = 91200e629bbff1fcf167960374299c6f5f4b64ed8a3df765758242ac7df187b8
+SHA512 (php-apcu/apcu-5.1.22.tgz) = 8f2f4292679bc359ea680ecaf397d69de32bf67d57d719a4839a026ab1b96d5ec4725e92c5c0d1972a117a7cd3d3c456a1f4ec03192fda4657e685de60b9e93e
+Size (php-apcu/apcu-5.1.22.tgz) = 93926 bytes
 SHA1 (patch-config.m4) = b64b6270bf500f3681d69441e584fceb6a2b6ef9

Added files:

Index: pkgsrc/www/php-apcu/patches/patch-config.m4
diff -u /dev/null pkgsrc/www/php-apcu/patches/patch-config.m4:1.6
--- /dev/null   Thu Oct  6 14:28:43 2022
+++ pkgsrc/www/php-apcu/patches/patch-config.m4 Thu Oct  6 14:28:43 2022
@@ -0,0 +1,22 @@
+$NetBSD: patch-config.m4,v 1.6 2022/10/06 14:28:43 taca Exp $
+
+Allow build with enabling PKG_OPTIONS: maintainer-zts.
+
+--- config.m4.orig     2021-10-07 08:47:52.000000000 +0000
++++ config.m4
+@@ -127,6 +127,7 @@ if test "$PHP_APCU" != "no"; then
+                           AC_DEFINE(APC_NATIVE_RWLOCK, 1, [ ])
+                           AC_MSG_RESULT([yes])
+                   ],[ dnl -Failure-
++                          APCU_CFLAGS="-D_GNU_SOURCE -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
+                           AC_MSG_RESULT([no])
+                       PHP_APCU_RWLOCKS=no
+                   ],[
+@@ -178,6 +179,7 @@ if test "$PHP_APCU" != "no"; then
+                                 AC_MSG_RESULT([yes])
+                                 AC_DEFINE(APC_HAS_PTHREAD_MUTEX, 1, [ ])
+                         ],[ dnl -Failure-
++                                APCU_CFLAGS="-D_GNU_SOURCE -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
+                                 AC_MSG_RESULT([no])
+                       PHP_APCU_MUTEX=no
+                         ],[