Index: branches/2016Q4/graphics/php56-gd/Makefile =================================================================== --- branches/2016Q4/graphics/php56-gd/Makefile (revision 424420) +++ branches/2016Q4/graphics/php56-gd/Makefile (revision 424421) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 2 CATEGORIES= graphics MASTERDIR= ${.CURDIR}/../../lang/php56 PKGNAMESUFFIX= -gd .include "${MASTERDIR}/Makefile" Index: branches/2016Q4/graphics/php56-gd/files/patch-libgd_gd_webp.c =================================================================== --- branches/2016Q4/graphics/php56-gd/files/patch-libgd_gd_webp.c (revision 424420) +++ branches/2016Q4/graphics/php56-gd/files/patch-libgd_gd_webp.c (nonexistent) @@ -1,18 +0,0 @@ ---- libgd/gd_webp.c.orig 2016-09-28 10:07:06.092196000 +0200 -+++ libgd/gd_webp.c 2016-09-28 10:08:12.429030000 +0200 -@@ -180,6 +180,15 @@ void gdImageWebpCtx (gdImagePtr im, gdIO - /* Conversion to Y,U,V buffer */ - yuv_width = (width + 1) >> 1; - yuv_height = (height + 1) >> 1; -+ -+ if (overflow2(width, height)) { -+ return; -+ } -+ /* simplification possible, because WebP must not be larger than 16384**2 */ -+ if (overflow2(width * height, 2 * sizeof(unsigned char))) { -+ return; -+ } -+ - yuv_nbytes = width * height + 2 * yuv_width * yuv_height; - - if ((Y = (unsigned char *)gdCalloc(yuv_nbytes, sizeof(unsigned char))) == NULL) { Property changes on: branches/2016Q4/graphics/php56-gd/files/patch-libgd_gd_webp.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/2016Q4/lang/php56/Makefile =================================================================== --- branches/2016Q4/lang/php56/Makefile (revision 424420) +++ branches/2016Q4/lang/php56/Makefile (revision 424421) @@ -1,210 +1,210 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.26 +PORTVERSION= 5.6.27 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} MAINTAINER= ale@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 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} \ --with-zlib-dir=/usr \ --program-prefix="" USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM LINKTHR # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips=FPM OPTIONS_EXCLUDE_mips64=FPM OPTIONS_SUB= yes CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library DEBUG_DESC= Enable debug DTRACE_DESC= Enable DTrace support IPV6_DESC= Enable ipv6 support MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build CONFLICTS= php55-5* php70-* DESTDIRNAME= INSTALL_ROOT .include PATCH_DIST_STRIP= -p1 PATCH_SITES+= LOCAL/ale .if ${PORT_OPTIONS:MMAILHEAD} PATCHFILES+= php-5.5.x-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail .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+= php PHP_VER= 56 IGNORE_WITH_PHP=53 54 5 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= libphp5 SHORTMODNAME= php5 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_pthreads_lib="" \ ac_cv_pthreads_cflags="" \ ac_cv_decimal_fp_supported="no" \ pthreads_working="yes" \ 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 .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=56" > ${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/2016Q4/lang/php56/distinfo =================================================================== --- branches/2016Q4/lang/php56/distinfo (revision 424420) +++ branches/2016Q4/lang/php56/distinfo (revision 424421) @@ -1,5 +1,5 @@ -TIMESTAMP = 1474538003 -SHA256 (php-5.6.26.tar.xz) = 203a854f0f243cb2810d1c832bc871ff133eccdf1ff69d32846f93bc1bef58a8 -SIZE (php-5.6.26.tar.xz) = 12412992 +TIMESTAMP = 1477040451 +SHA256 (php-5.6.27.tar.xz) = 16eb544498339d1d855292826e2e547ab01a31600141094959073e5e10e93ab5 +SIZE (php-5.6.27.tar.xz) = 12439168 SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed SIZE (php-5.5.x-mail-header.patch) = 4426 Index: branches/2016Q4 =================================================================== --- branches/2016Q4 (revision 424420) +++ branches/2016Q4 (revision 424421) Property changes on: branches/2016Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r424397