Index: branches/2019Q2/databases/php72-interbase/files/patch-interbase.c =================================================================== --- branches/2019Q2/databases/php72-interbase/files/patch-interbase.c (revision 501022) +++ branches/2019Q2/databases/php72-interbase/files/patch-interbase.c (nonexistent) @@ -1,11 +0,0 @@ ---- interbase.c.orig 2016-12-16 10:59:02 UTC -+++ interbase.c -@@ -940,7 +940,7 @@ static void _php_ibase_connect(INTERNAL_ - xlink = (zend_resource*) le->ptr; - if ((!persistent && xlink->type == le_link) || xlink->type == le_plink) { - if (IBG(default_link)) { -- zend_list_close(IBG(default_link)); -+ zend_list_delete(IBG(default_link)); - } - xlink->gc.refcount++; - xlink->gc.refcount++; Property changes on: branches/2019Q2/databases/php72-interbase/files/patch-interbase.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q2/lang/php72/Makefile =================================================================== --- branches/2019Q2/lang/php72/Makefile (revision 501022) +++ branches/2019Q2/lang/php72/Makefile (revision 501023) @@ -1,188 +1,188 @@ # $FreeBSD$ PORTNAME= php72 -DISTVERSION= 7.2.17 -PORTREVISION?= 2 +DISTVERSION= 7.2.18 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${DISTVERSION} MAINTAINER= tz@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 USES+= tar:xz cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) LIB_DEPENDS= libpcre.so:devel/pcre \ libargon2.so:security/libargon2 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-layout=GNU \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --with-password-argon2=${LOCALBASE} \ --program-prefix="" USES+= autoreconf:build USE_GNOME= libxml2 # PR230207 Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-z,notext OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE OPTIONS_EXCLUDE_DragonFly= DTRACE # ld(1) fails to link probes: Relocations in generic ELF (EM: 0) OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips= DTRACE FPM OPTIONS_EXCLUDE_mips64= DTRACE FPM OPTIONS_EXCLUDE_sparc64= DTRACE OPTIONS_SUB= yes CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library PHPDBG_DESC= Interactive PHP debugger MYSQLND_DESC= Build with MySQL Native Driver LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php56-* php70-* php71-* php73-* +#CONFLICTS= php56-* php70-* php71-* php73-* DESTDIRNAME= INSTALL_ROOT .include .if ${PORT_OPTIONS:MMYSQLND} CONFIGURE_ARGS+=--enable-mysqlnd .endif .if ${PORT_OPTIONS:MCLI} PHP_SAPI+= cli .else CONFIGURE_ARGS+=--disable-cli .endif .if ${PORT_OPTIONS:MCGI} PHP_SAPI+= cgi .else CONFIGURE_ARGS+=--disable-cgi .endif .if ${PORT_OPTIONS:MFPM} PHP_SAPI+= fpm USE_RC_SUBR+= php-fpm CONFIGURE_ARGS+=--enable-fpm \ --with-fpm-user=${WWWOWN} \ --with-fpm-group=${WWWGRP} .endif .if defined(PKGNAMEPREFIX) USES+= apache:2.2+ .include "${PORTSDIR}/Mk/Uses/apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} .else CONFIGURE_ARGS+=--with-apxs2=${APXS} .endif PLIST= ${PKGDIR}/pkg-plist.mod PKGMESSAGE= ${PKGDIR}/pkg-message.mod MODULENAME= libphp7 SHORTMODNAME= php7 WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!" .endif .if ${PORT_OPTIONS:MEMBED} PHP_SAPI+= embed CONFIGURE_ARGS+=--enable-embed .endif .if ${PORT_OPTIONS:MPHPDBG} PHP_SAPI+= phpdbg CONFIGURE_ARGS+=--enable-phpdbg .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-phpdbg-debug .endif .endif .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED} PLIST_SUB+= SAPI_INC="" .else PLIST_SUB+= SAPI_INC="@comment " .endif CONFIGURE_ENV+= ac_cv_decimal_fp_supported="no" \ lt_cv_path_SED="sed" .if ${PORT_OPTIONS:MLINKTHR} LIBS+= -lpthread .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .endif .if ${PORT_OPTIONS:MZTS} CONFIGURE_ARGS+=--enable-maintainer-zts CONFIGURE_ENV+= pthreads_working="yes" .endif .if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--enable-dtrace PLIST_SUB+= DTRACE="" .else PLIST_SUB+= DTRACE="@comment " .endif .if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--disable-ipv6 .endif post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* .if ${PORT_OPTIONS:MFPM} @${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \ ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif pre-configure: @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force) .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=72" > ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf @${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf @${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf test: build @(cd ${WRKSRC} && ${MAKE} test) post-install: ${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc .else do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .endif .else .include "${MASTERDIR}/Makefile.ext" .endif .include Index: branches/2019Q2/lang/php72/distinfo =================================================================== --- branches/2019Q2/lang/php72/distinfo (revision 501022) +++ branches/2019Q2/lang/php72/distinfo (revision 501023) @@ -1,3 +1,3 @@ -TIMESTAMP = 1554455753 -SHA256 (php-7.2.17.tar.xz) = a3e5f51a9ae08813b3925bea3a4de02cd4906fcccf75646e267a213bb63bcf84 -SIZE (php-7.2.17.tar.xz) = 12144120 +TIMESTAMP = 1557174681 +SHA256 (php-7.2.18.tar.xz) = 9970dbb3ab1298c9e6aac54bebfa841c8ad14b18eead65594a68fa841364cb8d +SIZE (php-7.2.18.tar.xz) = 12172696 Index: branches/2019Q2/lang/php72/files/patch-acinclude.m4 =================================================================== --- branches/2019Q2/lang/php72/files/patch-acinclude.m4 (revision 501022) +++ branches/2019Q2/lang/php72/files/patch-acinclude.m4 (revision 501023) @@ -1,68 +1,68 @@ --- acinclude.m4.orig 2016-07-20 13:11:26 UTC +++ acinclude.m4 @@ -985,15 +985,9 @@ dnl ------------------------------------ if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then dnl ---------------------------------------------- CLI static module [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no - case "$PHP_SAPI" in -- cgi|embed[)] +- cgi|embed|phpdbg[)] - PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,) - EXT_STATIC="$EXT_STATIC $1;$ext_dir" - ;; - *[)] - PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cli) - ;; - esac + + PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi) + PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm) EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir" fi PHP_ADD_BUILD_DIR($ext_builddir) @@ -1043,12 +1037,6 @@ You either need to build $1 shared or bu build to be successful. ]) fi - if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then - AC_MSG_ERROR([ -You've configured extension $1, which depends on extension $2, -but you've either not enabled $2, or have disabled it. -]) - fi dnl Some systems require that we link $2 to $1 when building ]) @@ -2975,8 +2963,7 @@ dnl in GNU Make which causes the .d file $abs_srcdir/$ac_provsrc:; $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc - CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ - + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@ \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj EOF @@ -2995,12 +2982,12 @@ dnl Always attempt to create both PIC an $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS) echo "[#] Generated by Makefile for libtool" > \$[]@ @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir - if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\] + if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\] echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\] else [\\] echo "pic_object='none'" >> \$[]@ [;\\] fi - if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\] + if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\] echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\] else [\\] echo "non_pic_object='none'" >> \$[]@ [;\\] @@ -3012,7 +2999,7 @@ EOF *) cat>>Makefile.objects<