CVS commit: pkgsrc/lang/php56

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Dec  1 16:11:56 UTC 2024

Modified Files:
        pkgsrc/lang/php56: Makefile Makefile.php distinfo options.mk
        pkgsrc/lang/php56/patches: patch-disable-filter-url
Added Files:
        pkgsrc/lang/php56/patches: patch-TSRM_threads.m4
            patch-ext_sqlite3_config0.m4 patch-sapi_apache2handler_config.m4
Removed Files:
        pkgsrc/lang/php56/patches: patch-configure

Log Message:
lang/php56: fix build problem

* Switch to using autoconf269 instead of manually patch configure.
* Make php-embed PHP_OPTIONS noop excep lang/php56 package.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/lang/php56/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/php56/Makefile.php
cvs rdiff -u -r1.61 -r1.62 pkgsrc/lang/php56/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php56/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php56/patches/patch-TSRM_threads.m4 \
    pkgsrc/lang/php56/patches/patch-ext_sqlite3_config0.m4 \
    pkgsrc/lang/php56/patches/patch-sapi_apache2handler_config.m4
cvs rdiff -u -r1.4 -r0 pkgsrc/lang/php56/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php56/patches/patch-disable-filter-url

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

Modified files:

Index: pkgsrc/lang/php56/Makefile
diff -u pkgsrc/lang/php56/Makefile:1.38 pkgsrc/lang/php56/Makefile:1.39
--- pkgsrc/lang/php56/Makefile:1.38     Thu Nov 14 22:20:30 2024
+++ pkgsrc/lang/php56/Makefile  Sun Dec  1 16:11:56 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2024/11/14 22:20:30 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2024/12/01 16:11:56 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               php-${PHP_VERSION}
-PKGREVISION=           15
+PKGREVISION=           16
 CATEGORIES=            lang
 
 HOMEPAGE=              https://www.php.net/
@@ -13,7 +13,7 @@ LICENSE=              php
 
 TEST_TARGET=           test
 
-USE_TOOLS+=            gmake lex pkg-config
+USE_TOOLS+=            autoconf269 gmake lex pkg-config
 LIBTOOL_OVERRIDE=      # empty
 PHP_CHECK_INSTALLED=   No
 
@@ -25,6 +25,7 @@ CGIDIR=                       ${PREFIX}/libexec/cgi-bin
 EGDIR=                 ${PREFIX}/share/examples/php
 MESSAGE_SUBST+=                CGIDIR=${CGIDIR}
 
+CONFIGURE_ARGS+=       --enable-cgi
 CONFIGURE_ENV+=                lt_cv_path_SED=${SED:Q}
 MAKE_ENV+=             INSTALL_ROOT=${DESTDIR}
 
@@ -48,6 +49,9 @@ INSTALLATION_DIRS+=   ${CGIDIR} ${PHP_EXTE
 CFLAGS+=       -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
 .endif
 
+pre-configure:
+       cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
+
 post-install:
 #      ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
 #      ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \

Index: pkgsrc/lang/php56/Makefile.php
diff -u pkgsrc/lang/php56/Makefile.php:1.8 pkgsrc/lang/php56/Makefile.php:1.9
--- pkgsrc/lang/php56/Makefile.php:1.8  Sat Aug  1 09:52:51 2020
+++ pkgsrc/lang/php56/Makefile.php      Sun Dec  1 16:11:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.8 2020/08/01 09:52:51 wiz Exp $
+# $NetBSD: Makefile.php,v 1.9 2024/12/01 16:11:56 taca Exp $
 # used by lang/php56/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -36,7 +36,6 @@ CONFIGURE_ARGS+=      --disable-opcache
 CONFIGURE_ARGS+=       --disable-pdo
 CONFIGURE_ARGS+=       --disable-json
 
-CONFIGURE_ARGS+=       --enable-cgi
 CONFIGURE_ARGS+=       --enable-mysqlnd
 CONFIGURE_ARGS+=       --enable-xml
 CONFIGURE_ARGS+=       --with-libxml-dir=${PREFIX}

Index: pkgsrc/lang/php56/distinfo
diff -u pkgsrc/lang/php56/distinfo:1.61 pkgsrc/lang/php56/distinfo:1.62
--- pkgsrc/lang/php56/distinfo:1.61     Thu Dec  9 00:13:07 2021
+++ pkgsrc/lang/php56/distinfo  Sun Dec  1 16:11:56 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2021/12/09 00:13:07 tnn Exp $
+$NetBSD: distinfo,v 1.62 2024/12/01 16:11:56 taca Exp $
 
 BLAKE2s (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 9eaf6505d80e90147fd0b993fb501620030eea24ccd69e42c49d8faf50d47775
 SHA512 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = bbe39ad27a5a82c705692c921b214c5630227ed9852f0432340f74533b5e618d9bea01bff75a4b7a1f1b72876b6d092d2db4533758d9a927f274cff7361f3eb4
@@ -6,9 +6,9 @@ Size (PHP-5.6.31-OpenSSL-1.1.0-compatibi
 BLAKE2s (php-5.6.40.tar.xz) = f2355f12a336fe65b3ebeb904ed1899c82c065477533d0c34a23293e901a877a
 SHA512 (php-5.6.40.tar.xz) = 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329
 Size (php-5.6.40.tar.xz) = 12472236 bytes
+SHA1 (patch-TSRM_threads.m4) = 83c51ef32371598689f2610726a2902e503b1d55
 SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0
-SHA1 (patch-configure) = a5623b0cbb3331fd0a537b26c0ae48315d52dbe2
-SHA1 (patch-disable-filter-url) = a2b08912d81f2872bf1834fa4cefddb044c9d0f8
+SHA1 (patch-disable-filter-url) = bfb8e968062d848e7496aeaaf2347a0341f0f468
 SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19
 SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577
 SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = 98ff92cbc5e4a92310a168e9959dd702b18e0783
@@ -31,6 +31,7 @@ SHA1 (patch-ext_pdo_config.m4) = f6deef3
 SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
 SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
 SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
+SHA1 (patch-ext_sqlite3_config0.m4) = 2435e1518a88c7d05eb93cf3c8e716fe4ea0748b
 SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
 SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda
 SHA1 (patch-ext_tidy_tidy.c) = dd66f203196af544dcc06fe2229ba23c3086d3e8
@@ -39,6 +40,7 @@ SHA1 (patch-makedist) = 8e8660b2e0a34f06
 SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f
 SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d
 SHA1 (patch-run-tests.php) = 3b682267825a87f501a9f3dbd526dca2be9f2807
+SHA1 (patch-sapi_apache2handler_config.m4) = fea8c89a6b1d357f966b95d7ff80189fb85394a0
 SHA1 (patch-sapi_cgi_Makefile.frag) = 0bdf3e3e5f658ee834671307d7fb7ad36d41d48f
 SHA1 (patch-sapi_fpm_fpm_events_port.c) = e68f6307869d39364087c18ebf19e86e07d9c82a
 SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 564b0a059cb58c671632c6ee8f404f46fe2299f0

Index: pkgsrc/lang/php56/options.mk
diff -u pkgsrc/lang/php56/options.mk:1.1 pkgsrc/lang/php56/options.mk:1.2
--- pkgsrc/lang/php56/options.mk:1.1    Sat Aug  1 09:52:51 2020
+++ pkgsrc/lang/php56/options.mk        Sun Dec  1 16:11:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/08/01 09:52:51 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2024/12/01 16:11:56 taca Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
 PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline disable-filter-url php-embed
@@ -57,6 +57,8 @@ CFLAGS+=              -DDISABLE_FILTER_URL
 
 PLIST_VARS+=   embed
 
+.if !empty(PKGNAME:Mphp-5*)
+
 .if !empty(PKG_OPTIONS:Mphp-embed)
 CONFIGURE_ARGS+=       --enable-embed
 INSTALLATION_DIRS+=    include/php/sapi/embed
@@ -68,3 +70,4 @@ post-install-embed:
        ${INSTALL_DATA} ${WRKSRC}/sapi/embed/php_embed.h ${DESTDIR}${PREFIX}/include/php/sapi/embed/
        ${INSTALL_LIB} ${WRKSRC}/libs/libphp5.so ${DESTDIR}${PREFIX}/lib/
 .endif
+.endif

Index: pkgsrc/lang/php56/patches/patch-disable-filter-url
diff -u pkgsrc/lang/php56/patches/patch-disable-filter-url:1.1 pkgsrc/lang/php56/patches/patch-disable-filter-url:1.2
--- pkgsrc/lang/php56/patches/patch-disable-filter-url:1.1      Wed Jul 18 07:33:12 2018
+++ pkgsrc/lang/php56/patches/patch-disable-filter-url  Sun Dec  1 16:11:56 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-disable-filter-url,v 1.1 2018/07/18 07:33:12 manu Exp $
+$NetBSD: patch-disable-filter-url,v 1.2 2024/12/01 16:11:56 taca Exp $
 
 Add build-time disable option for dangerous php://filter URL
 
@@ -10,10 +10,9 @@ beyond what many developpers expected, e
 PHP source files. The administrator may want to disable the
 feature for security sake, and this patch makes that possible.
 
---- ./ext/standard/php_fopen_wrapper.c.orig
-+++ ./ext/standard/php_fopen_wrapper.c
-@@ -333,8 +333,9 @@
-                               "Error duping file descriptor %ld; possibly it doesn't exist: "
+--- ext/standard/php_fopen_wrapper.c.orig      2019-01-09 09:54:13.000000000 +0000
++++ ext/standard/php_fopen_wrapper.c
+@@ -334,6 +334,7 @@ php_stream * php_stream_url_wrap_php(php
                                "[%d]: %s", fildes_ori, errno, strerror(errno));
                        return NULL;
                }
@@ -21,9 +20,7 @@ feature for security sake, and this patc
        } else if (!strncasecmp(path, "filter/", 7)) {
                /* Save time/memory when chain isn't specified */
                if (strchr(mode, 'r') || strchr(mode, '+')) {
-                       mode_rw |= PHP_STREAM_FILTER_READ;
-@@ -369,8 +370,9 @@
-               }
+@@ -370,6 +371,7 @@ php_stream * php_stream_url_wrap_php(php
                efree(pathdup);
  
                return stream;
@@ -31,4 +28,3 @@ feature for security sake, and this patc
        } else {
                /* invalid php://thingy */
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid php:// URL specified");
-               return NULL;

Added files:

Index: pkgsrc/lang/php56/patches/patch-TSRM_threads.m4
diff -u /dev/null pkgsrc/lang/php56/patches/patch-TSRM_threads.m4:1.1
--- /dev/null   Sun Dec  1 16:11:56 2024
+++ pkgsrc/lang/php56/patches/patch-TSRM_threads.m4     Sun Dec  1 16:11:56 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-TSRM_threads.m4,v 1.1 2024/12/01 16:11:56 taca Exp $
+
+Fix shell syntax.
+
+--- TSRM/threads.m4.orig       2019-01-09 09:54:13.000000000 +0000
++++ TSRM/threads.m4
+@@ -90,6 +90,7 @@ int main() {
+   case $host_alias in
+   *netware*)
+     pthreads_working=yes
++    ;;
+   esac
+ ]
+ ) ] )dnl
Index: pkgsrc/lang/php56/patches/patch-ext_sqlite3_config0.m4
diff -u /dev/null pkgsrc/lang/php56/patches/patch-ext_sqlite3_config0.m4:1.1
--- /dev/null   Sun Dec  1 16:11:56 2024
+++ pkgsrc/lang/php56/patches/patch-ext_sqlite3_config0.m4      Sun Dec  1 16:11:56 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_sqlite3_config0.m4,v 1.1 2024/12/01 16:11:56 taca Exp $
+
+* Do try to install sqlite3 header.
+
+--- ext/sqlite3/config0.m4.orig        2019-01-09 09:54:13.000000000 +0000
++++ ext/sqlite3/config0.m4
+@@ -83,7 +83,7 @@ if test $PHP_SQLITE3 != "no"; then
+     fi
+ 
+     PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
+-    PHP_INSTALL_HEADERS([ext/sqlite3/libsqlite/sqlite3.h])
++    PHP_INSTALL_HEADERS([])
+   fi
+ 
+   AC_DEFINE(HAVE_SQLITE3,1,[ ])
Index: pkgsrc/lang/php56/patches/patch-sapi_apache2handler_config.m4
diff -u /dev/null pkgsrc/lang/php56/patches/patch-sapi_apache2handler_config.m4:1.1
--- /dev/null   Sun Dec  1 16:11:56 2024
+++ pkgsrc/lang/php56/patches/patch-sapi_apache2handler_config.m4       Sun Dec  1 16:11:56 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-sapi_apache2handler_config.m4,v 1.1 2024/12/01 16:11:56 taca Exp $
+
+Don't autodetect maintainer-zts.
+
+--- sapi/apache2handler/config.m4.orig 2019-01-09 09:54:13.000000000 +0000
++++ sapi/apache2handler/config.m4
+@@ -116,17 +116,6 @@ if test "$PHP_APXS2" != "no"; then
+     ;;
+   esac
+ 
+-  if test "$APACHE_VERSION" -lt 2004001; then
+-    APXS_MPM=`$APXS -q MPM_NAME`
+-    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+-      PHP_BUILD_THREAD_SAFE
+-    fi
+-  else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+-    if test -n "$APACHE_THREADED_MPM"; then
+-      PHP_BUILD_THREAD_SAFE
+-    fi
+-  fi
+   AC_MSG_RESULT(yes)
+   PHP_SUBST(APXS)
+ else