CVS commit: pkgsrc/lang/php56

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jul  9 10:22:20 UTC 2025

Modified Files:
        pkgsrc/lang/php56: Makefile distinfo
        pkgsrc/lang/php56/patches: patch-aclocal.m4
Added Files:
        pkgsrc/lang/php56/patches: patch-ext_fileinfo_libmagic_funcs.c

Log Message:
php56: Various GCC 14 fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/php56/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/lang/php56/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php56/patches/patch-aclocal.m4
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/php56/patches/patch-ext_fileinfo_libmagic_funcs.c

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.44 pkgsrc/lang/php56/Makefile:1.45
--- pkgsrc/lang/php56/Makefile:1.44     Sat Jun  7 15:51:49 2025
+++ pkgsrc/lang/php56/Makefile  Wed Jul  9 10:22:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2025/06/07 15:51:49 taca Exp $
+# $NetBSD: Makefile,v 1.45 2025/07/09 10:22:20 jperkin Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -44,6 +44,12 @@ INSTALLATION_DIRS+=  ${CGIDIR} ${PHP_EXTE
 CFLAGS+=       -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
 .endif
 
+.include "../../mk/compiler.mk"
+
+.if ${PKGSRC_COMPILER:Mgcc}
+CFLAGS+=       -Wno-error=incompatible-pointer-types   # libxml2 API
+.endif
+
 pre-configure:
        cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
 

Index: pkgsrc/lang/php56/distinfo
diff -u pkgsrc/lang/php56/distinfo:1.65 pkgsrc/lang/php56/distinfo:1.66
--- pkgsrc/lang/php56/distinfo:1.65     Sat Jun  7 15:51:49 2025
+++ pkgsrc/lang/php56/distinfo  Wed Jul  9 10:22:20 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2025/06/07 15:51:49 taca Exp $
+$NetBSD: distinfo,v 1.66 2025/07/09 10:22:20 jperkin 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
@@ -9,9 +9,10 @@ Size (php-5.6.40.tar.xz) = 12472236 byte
 SHA1 (patch-Makefile.global) = cf4dec0e4adf4ceceffb498919c1b463db9c6e66
 SHA1 (patch-TSRM_threads.m4) = 83c51ef32371598689f2610726a2902e503b1d55
 SHA1 (patch-acinclude.m4) = 46ee41b151927673b0d17fbd13a3159b2f7aab0a
-SHA1 (patch-aclocal.m4) = 25908282ba74c7c592d913573c2945aa20717d51
+SHA1 (patch-aclocal.m4) = f24f25d8da5d846902ba94ec59fe4838bd24dda1
 SHA1 (patch-configure.in) = 67ed9f97785ba4bf3f6405d4af07fc32b972ba4e
 SHA1 (patch-disable-filter-url) = bfb8e968062d848e7496aeaaf2347a0341f0f468
+SHA1 (patch-ext_fileinfo_libmagic_funcs.c) = a8ecfed0c4a6f5b4155d6096f8e92a60b20c0de5
 SHA1 (patch-ext_gd_config.m4) = 28e2551602ef0150ab8010a800aac4d1d421271e
 SHA1 (patch-ext_imap_config.m4) = a61bc2287e8b114099da93a1ce8cb5c5459a5473
 SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = 98ff92cbc5e4a92310a168e9959dd702b18e0783

Index: pkgsrc/lang/php56/patches/patch-aclocal.m4
diff -u pkgsrc/lang/php56/patches/patch-aclocal.m4:1.3 pkgsrc/lang/php56/patches/patch-aclocal.m4:1.4
--- pkgsrc/lang/php56/patches/patch-aclocal.m4:1.3      Sat Feb  8 02:57:59 2025
+++ pkgsrc/lang/php56/patches/patch-aclocal.m4  Wed Jul  9 10:22:20 2025
@@ -1,7 +1,8 @@
-$NetBSD: patch-aclocal.m4,v 1.3 2025/02/08 02:57:59 taca Exp $
+$NetBSD: patch-aclocal.m4,v 1.4 2025/07/09 10:22:20 jperkin Exp $
 
 * Adjust PHP directories.
 * Adjust PHP library name.
+* GCC 14 -Werror fixes.
 
 --- aclocal.m4.orig    2019-01-09 10:25:55.000000000 +0000
 +++ aclocal.m4
@@ -32,7 +33,21 @@ $NetBSD: patch-aclocal.m4,v 1.3 2025/02/
    php_sapi_module=static
  ])
  
-@@ -2771,8 +2771,8 @@ AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
+@@ -1362,11 +1362,13 @@ AC_DEFUN([PHP_READDIR_R_TYPE],[
+ #define _REENTRANT
+ #include <sys/types.h>
+ #include <dirent.h>
++#include <stdlib.h>
+ 
+ #ifndef PATH_MAX
+ #define PATH_MAX 1024
+ #endif
+ 
++int
+ main() {
+   DIR *dir;
+   char entry[sizeof(struct dirent)+PATH_MAX];
+@@ -2771,8 +2773,8 @@ AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
        pdo_cv_inc_path=$abs_srcdir/ext
      elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
        pdo_cv_inc_path=$abs_srcdir/ext

Added files:

Index: pkgsrc/lang/php56/patches/patch-ext_fileinfo_libmagic_funcs.c
diff -u /dev/null pkgsrc/lang/php56/patches/patch-ext_fileinfo_libmagic_funcs.c:1.1
--- /dev/null   Wed Jul  9 10:22:20 2025
+++ pkgsrc/lang/php56/patches/patch-ext_fileinfo_libmagic_funcs.c       Wed Jul  9 10:22:20 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-ext_fileinfo_libmagic_funcs.c,v 1.1 2025/07/09 10:22:20 jperkin Exp $
+
+Fix GCC 14 -Werror=implicit-int.
+
+--- ext/fileinfo/libmagic/funcs.c.orig 2025-07-09 10:13:17.906598156 +0000
++++ ext/fileinfo/libmagic/funcs.c
+@@ -437,6 +437,7 @@ file_printedlen(const struct magic_set *
+       return ms->o.buf == NULL ? 0 : strlen(ms->o.buf);
+ }
+ 
++int
+ file_replace(struct magic_set *ms, const char *pat, const char *rep)
+ {
+       zval *patt;