Index: head/devel/php70-readline/Makefile =================================================================== --- head/devel/php70-readline/Makefile (revision 445230) +++ head/devel/php70-readline/Makefile (revision 445231) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -readline .include "${MASTERDIR}/Makefile" Index: head/lang/php70/Makefile =================================================================== --- head/lang/php70/Makefile (revision 445230) +++ head/lang/php70/Makefile (revision 445231) @@ -1,205 +1,191 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= php70 -PORTVERSION= 7.0.20 -PORTREVISION?= 1 +PORTVERSION= 7.0.21 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} MAINTAINER= tz@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 USES+= tar:xz cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) USE_AUTOTOOLS= autoconf #NOTE: libtools ends with Version mismatch error #USES+= autoreconf gmake #GNU_CONFIGURE= yes LIB_DEPENDS= libpcre.so:devel/pcre CONFIGURE_ARGS+=--with-layout=GNU \ --localstatedir=/var \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ --enable-mysqlnd \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --program-prefix="" USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM LINKTHR DTRACE # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips=FPM OPTIONS_EXCLUDE_mips64=FPM OPTIONS_SUB= yes OPTIONS_EXCLUDE_DragonFly= DTRACE # ld(1) fails to link probes: Relocations in generic ELF (EM: 0) OPTIONS_EXCLUDE_aarch64= DTRACE CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library DEBUG_DESC= Enable debug PHPDBG_DESC= Interactive PHP debugger DTRACE_DESC= Enable DTrace support LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build CONFLICTS= php55-5* php56-* DESTDIRNAME= INSTALL_ROOT .include .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+= php PHP_VER= 70 IGNORE_WITH_PHP= 56 USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.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 - -.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" -CONFIGURE_ARGS+=--with-regex=php -.elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system" -CONFIGURE_ARGS+=--with-regex=system -.endif - -.if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL" -CONFIGURE_ARGS+=--with-zend-vm=CALL -.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH" -CONFIGURE_ARGS+=--with-zend-vm=SWITCH -.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO" -CONFIGURE_ARGS+=--with-zend-vm=GOTO .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" USES= localhost .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 # Work around issues with newer (>=2.64) autoconf pre-configure: @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=70" > ${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: head/lang/php70/distinfo =================================================================== --- head/lang/php70/distinfo (revision 445230) +++ head/lang/php70/distinfo (revision 445231) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497260078 -SHA256 (php-7.0.20.tar.xz) = 31b9cf1fb83fe3cd82c2f6603a0ae81ae6abacb5286827e362d8f85e68908e0a -SIZE (php-7.0.20.tar.xz) = 12604260 +TIMESTAMP = 1499416619 +SHA256 (php-7.0.21.tar.xz) = 6713fe3024365d661593235b525235045ef81f18d0043654658c9de1bcb8b9e3 +SIZE (php-7.0.21.tar.xz) = 12626276 Index: head/lang/php70/files/patch-main_php__ini.c =================================================================== --- head/lang/php70/files/patch-main_php__ini.c (revision 445230) +++ head/lang/php70/files/patch-main_php__ini.c (nonexistent) @@ -1,31 +0,0 @@ ---- main/php_ini.c.orig 2017-06-14 13:27:29 UTC -+++ main/php_ini.c -@@ -280,7 +280,7 @@ static void php_ini_parser_cb(zval *arg1 - size_t key_len; - - /* PATH sections */ -- if (zend_string_equals_literal_ci(Z_STR_P(arg1), "PATH")) { -+ if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "PATH", sizeof("PATH") - 1, sizeof("PATH") - 1)) { - key = Z_STRVAL_P(arg1); - key = key + sizeof("PATH") - 1; - key_len = Z_STRLEN_P(arg1) - sizeof("PATH") + 1; -@@ -291,7 +291,7 @@ static void php_ini_parser_cb(zval *arg1 - TRANSLATE_SLASHES_LOWER(key); - - /* HOST sections */ -- } else if (zend_string_equals_literal_ci(Z_STR_P(arg1), "HOST")) { -+ } else if (!zend_binary_strncasecmp(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), "HOST", sizeof("HOST") - 1, sizeof("HOST") - 1)) { - key = Z_STRVAL_P(arg1); - key = key + sizeof("HOST") - 1; - key_len = Z_STRLEN_P(arg1) - sizeof("HOST") + 1; -@@ -328,7 +328,9 @@ static void php_ini_parser_cb(zval *arg1 - zend_hash_init(Z_ARRVAL(section_arr), 8, NULL, (dtor_func_t) config_zval_dtor, 1); - entry = zend_hash_str_update(target_hash, key, key_len, §ion_arr); - } -- active_ini_hash = Z_ARRVAL_P(entry); -+ if (Z_TYPE_P(entry) == IS_ARRAY) { -+ active_ini_hash = Z_ARRVAL_P(entry); -+ } - } - } - break; Property changes on: head/lang/php70/files/patch-main_php__ini.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