From ad7728b35d0b59c724c591a10eb97b8677cc85be Mon Sep 17 00:00:00 2001 From: Torsten Zuehlsdorff Date: Wed, 8 May 2019 06:45:13 +0000 Subject: [PATCH] lang/php72: Upgrade from 7.2.17 to 7.2.18 Changelog: CLI: Fixed bug #77794 (Incorrect Date header format in built-in server). EXIF: Fixed bug #77950 (Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG). Interbase: Fixed bug #72175 (Impossibility of creating multiple connections to Interbase with php 7.x). Intl: Fixed bug #77895 (IntlDateFormatter::create fails in strict mode if $locale = null). litespeed: LiteSpeed SAPI 7.3.1, better process management, new API function litespeed_finish_request(). Mail: Fixed bug #77821 (Potential heap corruption in TSendMail()). PCRE: Fixed bug #77827 (preg_match does not ignore \r in regex flags). PDO: Fixed bug #77849 (Disable cloning of PDO handle/connection objects). phpdbg: Fixed bug #76801 (too many open files). Fixed bug #77800 (phpdbg segfaults on listing some conditional breakpoints). Fixed bug #77805 (phpdbg build fails when readline is shared). Reflection: Fixed bug #77772 (ReflectionClass::getMethods(null) doesn't work). Fixed bug #77882 (Different behavior: always calls destructor). Standard: Fixed bug #77680 (recursive mkdir on ftp stream wrapper is incorrect). Fixed bug #77844 (Crash due to null pointer in parse_ini_string with INI_SCANNER_TYPED). Fixed bug #77853 (Inconsistent substr_compare behaviour with empty haystack). Changelog taken from: https://www.php.net/ChangeLog-7.php#7.2.18 MFH: 2019Q2 --- databases/php72-interbase/files/patch-interbase.c | 11 ----------- lang/php72/Makefile | 6 +++--- lang/php72/distinfo | 6 +++--- lang/php72/files/patch-acinclude.m4 | 2 +- 4 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 databases/php72-interbase/files/patch-interbase.c diff --git a/databases/php72-interbase/files/patch-interbase.c b/databases/php72-interbase/files/patch-interbase.c deleted file mode 100644 index 0f8791beb793..000000000000 --- a/databases/php72-interbase/files/patch-interbase.c +++ /dev/null @@ -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++; diff --git a/lang/php72/Makefile b/lang/php72/Makefile index 464090c59b3b..6766bd36a6c4 100644 --- a/lang/php72/Makefile +++ b/lang/php72/Makefile @@ -1,8 +1,8 @@ # $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} @@ -58,7 +58,7 @@ 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 diff --git a/lang/php72/distinfo b/lang/php72/distinfo index 1d104058039f..2f27de060fde 100644 --- a/lang/php72/distinfo +++ b/lang/php72/distinfo @@ -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 diff --git a/lang/php72/files/patch-acinclude.m4 b/lang/php72/files/patch-acinclude.m4 index 859880c2c676..18832d5ce8c8 100644 --- a/lang/php72/files/patch-acinclude.m4 +++ b/lang/php72/files/patch-acinclude.m4 @@ -5,7 +5,7 @@ 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" - ;;