CVS commit: pkgsrc/lang/php84

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jun  4 11:10:06 UTC 2025

Modified Files:
        pkgsrc/lang/php84: distinfo
        pkgsrc/lang/php84/patches: patch-sapi_apache2handler_config.m4

Log Message:
php84: Restore zts patch.

This somehow got lost during the update from php83, and results in a threaded
ap-php being built even with the zts option off, and ultimately segfaults on
startup.  Reported in TritonDataCenter/pkgsrc#402.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/php84/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/php84/patches/patch-sapi_apache2handler_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/lang/php84/distinfo
diff -u pkgsrc/lang/php84/distinfo:1.5 pkgsrc/lang/php84/distinfo:1.6
--- pkgsrc/lang/php84/distinfo:1.5      Mon May 19 15:04:50 2025
+++ pkgsrc/lang/php84/distinfo  Wed Jun  4 11:10:06 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2025/05/19 15:04:50 taca Exp $
+$NetBSD: distinfo,v 1.6 2025/06/04 11:10:06 jperkin Exp $
 
 BLAKE2s (php-8.4.7.tar.xz) = b2bd74d0027d3913c531cb113ee97b36ef6290542d137d48bc1fc85449c19dc4
 SHA512 (php-8.4.7.tar.xz) = aec14be1bd6025609e8e4fdacb7010e6b51f40b1592cf5e71fa5d09bed73f938ae2b29e4166b117edc74834c14cbe4de2bd80c9fb5d45a2f2cc27eebab8c9898
@@ -11,7 +11,7 @@ SHA1 (patch-ext_standard_php__fopen__wra
 SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483
 SHA1 (patch-php.ini-development) = 73ff10ef292404e2788897ce893a99758cf4962c
 SHA1 (patch-php.ini-production) = dbffa0ccc84b604f9efb58d9fee0b9dd0295801f
-SHA1 (patch-sapi_apache2handler_config.m4) = db6fa5d5d4f48d6f8b49411e31c3a761c930ed67
+SHA1 (patch-sapi_apache2handler_config.m4) = 6b1834b9c212887fbcc1b6679858d5dd8eb4e19b
 SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
 SHA1 (patch-sapi_cgi_config9.m4) = 473d5bd351138538bb6f2c394982df35b6543714
 SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3

Index: pkgsrc/lang/php84/patches/patch-sapi_apache2handler_config.m4
diff -u pkgsrc/lang/php84/patches/patch-sapi_apache2handler_config.m4:1.1 pkgsrc/lang/php84/patches/patch-sapi_apache2handler_config.m4:1.2
--- pkgsrc/lang/php84/patches/patch-sapi_apache2handler_config.m4:1.1   Sat Feb 22 15:27:56 2025
+++ pkgsrc/lang/php84/patches/patch-sapi_apache2handler_config.m4       Wed Jun  4 11:10:06 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-sapi_apache2handler_config.m4,v 1.1 2025/02/22 15:27:56 taca Exp $
+$NetBSD: patch-sapi_apache2handler_config.m4,v 1.2 2025/06/04 11:10:06 jperkin Exp $
 
 * Don't autodetect maintainer-zts.
 * Add $PHP_VER suffix.
 
---- sapi/apache2handler/config.m4.orig 2025-01-15 01:03:17.000000000 +0000
+--- sapi/apache2handler/config.m4.orig 2025-05-06 12:31:58.000000000 +0000
 +++ sapi/apache2handler/config.m4
 @@ -72,14 +72,14 @@ if test "$PHP_APXS2" != "no"; then
    if test -z $($APXS -q SYSCONFDIR); then
@@ -22,3 +22,26 @@ $NetBSD: patch-sapi_apache2handler_confi
    fi
  
    LIBPHP_CFLAGS="-shared"
+@@ -119,22 +119,4 @@ if test "$PHP_APXS2" != "no"; then
+       $APU_CFLAGS
+       -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1
+     ])
+-
+-  AS_IF([$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1], [
+-    APACHE_THREADED_MPM=yes
+-    enable_zts=yes
+-  ], [APACHE_THREADED_MPM=no])
+-
+-AC_CONFIG_COMMANDS([apache2handler], [AS_VAR_IF([enable_zts], [yes],,
+-  [AS_VAR_IF([APACHE_THREADED_MPM], [no],
+-    [AC_MSG_WARN([
+-+--------------------------------------------------------------------+
+-|                        *** WARNING ***                             |
+-|                                                                    |
+-| You have built PHP for Apache's current non-threaded MPM.          |
+-| If you change Apache to use a threaded MPM you must reconfigure    |
+-| PHP with --enable-zts                                              |
+-+--------------------------------------------------------------------+
+-  ])])])],
+-  [APACHE_THREADED_MPM="$APACHE_THREADED_MPM"; enable_zts="$enable_zts"])
+ fi