MFH: r468353

Update PHP 7.1 from 7.1.16 to 7.1.17

Changelog: http://www.php.net/ChangeLog-7.php#7.1.17

Security:	CVE-2018-5712

Approved by:	ports-secteam (riggs)
This commit is contained in:
Torsten Zuehlsdorff 2018-04-30 08:59:27 +00:00
parent 9aa5ce18de
commit 3cc5e839b4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q2/; revision=468677
4 changed files with 4 additions and 16 deletions

View File

@ -1,11 +0,0 @@
--- php_mbregex.c.orig 2018-02-28 11:19:22 UTC
+++ php_mbregex.c
@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compi
OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN];
rc = zend_hash_str_find_ptr(&MBREX(ht_rc), (char *)pattern, patlen);
- if (!rc || rc->options != options || rc->enc != enc || rc->syntax != syntax) {
+ if (!rc || onig_get_options(rc) != options || onig_get_encoding(rc) != enc || onig_get_syntax(rc) != syntax) {
if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) {
onig_error_code_to_str(err_str, err_code, &err_info);
php_error_docref(NULL, E_WARNING, "mbregex compile err: %s", err_str);

View File

@ -1,6 +1,5 @@
# $FreeBSD$
PORTREVISION= 1
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php71

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= php71
PORTVERSION= 7.1.16
PORTVERSION= 7.1.17
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions

View File

@ -1,5 +1,5 @@
TIMESTAMP = 1522326423
SHA256 (php-7.1.16.tar.xz) = a5d67e477248a3911af7ef85c8400c1ba8cd632184186fd31070b96714e669f1
SIZE (php-7.1.16.tar.xz) = 12211512
TIMESTAMP = 1524645206
SHA256 (php-7.1.17.tar.xz) = 1a784806866e06367f7a5c88775d239d6f30041c7ce65a8232d03a3d4de56d56
SIZE (php-7.1.17.tar.xz) = 12213536
SHA256 (php-7.1.x-mail-header.patch) = 8f173d89672f7ebfabfcc3c5d7f8dec1c4243aba665db4b4046e67c34d9d4dc7
SIZE (php-7.1.x-mail-header.patch) = 4504