MFH: r468354

lang/php72: Update from 7.2.4 to 7.2.5

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

Security:	CVE-2018-5712

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

View File

@ -1,11 +0,0 @@
--- php_mbregex.c.orig 2018-02-27 16:33:04 UTC
+++ php_mbregex.c
@@ -449,7 +449,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/php72

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= php72
DISTVERSION= 7.2.4
DISTVERSION= 7.2.5
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1522326444
SHA256 (php-7.2.4.tar.xz) = 7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88
SIZE (php-7.2.4.tar.xz) = 12031892
TIMESTAMP = 1524645231
SHA256 (php-7.2.5.tar.xz) = af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2
SIZE (php-7.2.5.tar.xz) = 12034928