diff options
| author | Torsten Zuehlsdorff <tz@FreeBSD.org> | 2018-01-10 16:07:02 +0000 |
|---|---|---|
| committer | Torsten Zuehlsdorff <tz@FreeBSD.org> | 2018-01-10 16:07:02 +0000 |
| commit | c687c6511458149f78f53d59d3f02653349e8deb (patch) | |
| tree | ee9b52e08228d4ec4db8c5c9624f513ea7db1abd | |
| parent | security/rubygem-six: update to 0.2.1 (diff) | |
Update PHP 7.1 from 7.1.12 to 7.1.13
Changelog: http://www.php.net/ChangeLog-7.php#7.1.13
PR: 224955
MFH: 2018Q1
Notes
Notes:
svn path=/head/; revision=458658
| -rw-r--r-- | archivers/php71-phar/Makefile | 1 | ||||
| -rw-r--r-- | lang/php71/Makefile | 4 | ||||
| -rw-r--r-- | lang/php71/distinfo | 6 | ||||
| -rw-r--r-- | www/php71-opcache/Makefile | 1 | ||||
| -rw-r--r-- | www/php71-opcache/files/patch-Optimizer_zend__inference.c | 30 |
5 files changed, 5 insertions, 37 deletions
diff --git a/archivers/php71-phar/Makefile b/archivers/php71-phar/Makefile index 8616ed2e422e..5e76f4c710bc 100644 --- a/archivers/php71-phar/Makefile +++ b/archivers/php71-phar/Makefile @@ -2,7 +2,6 @@ CATEGORIES= archivers -PORTREVISION= 2 MASTERDIR= ${.CURDIR}/../../lang/php71 PKGNAMESUFFIX= -phar diff --git a/lang/php71/Makefile b/lang/php71/Makefile index ee26bcb54442..240f6fd9ce2c 100644 --- a/lang/php71/Makefile +++ b/lang/php71/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= php71 -PORTVERSION= 7.1.12 -PORTREVISION?= 2 +PORTVERSION= 7.1.13 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} diff --git a/lang/php71/distinfo b/lang/php71/distinfo index 40cd46c878d0..87bf96d811ac 100644 --- a/lang/php71/distinfo +++ b/lang/php71/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1511442089 -SHA256 (php-7.1.12.tar.xz) = a0118850774571b1f2d4e30b4fe7a4b958ca66f07d07d65ebdc789c54ba6eeb3 -SIZE (php-7.1.12.tar.xz) = 12194772 +TIMESTAMP = 1515408503 +SHA256 (php-7.1.13.tar.xz) = 1a0b3f2fb61959b57a3ee01793a77ed3f19bde5aa90c43dcacc85ea32f64fc10 +SIZE (php-7.1.13.tar.xz) = 12194780 SHA256 (php-7.1.x-mail-header.patch) = 8f173d89672f7ebfabfcc3c5d7f8dec1c4243aba665db4b4046e67c34d9d4dc7 SIZE (php-7.1.x-mail-header.patch) = 4504 diff --git a/www/php71-opcache/Makefile b/www/php71-opcache/Makefile index 486c707f2856..6a991ff1b4f9 100644 --- a/www/php71-opcache/Makefile +++ b/www/php71-opcache/Makefile @@ -4,7 +4,6 @@ CATEGORIES= www MASTERDIR= ${.CURDIR}/../../lang/php71 -PORTREVISION= 2 PKGNAMESUFFIX= -opcache USES= php:zend diff --git a/www/php71-opcache/files/patch-Optimizer_zend__inference.c b/www/php71-opcache/files/patch-Optimizer_zend__inference.c deleted file mode 100644 index 6d24a40e8cdc..000000000000 --- a/www/php71-opcache/files/patch-Optimizer_zend__inference.c +++ /dev/null @@ -1,30 +0,0 @@ ---- Optimizer/zend_inference.c.orig 2017-12-12 12:05:15 UTC -+++ Optimizer/zend_inference.c -@@ -2928,7 +2928,7 @@ static int zend_update_type_info(const z - break; - case ZEND_FE_FETCH_R: - case ZEND_FE_FETCH_RW: -- tmp = (t2 & MAY_BE_REF); -+ tmp = t2; - if (t1 & MAY_BE_OBJECT) { - if (opline->opcode == ZEND_FE_FETCH_RW) { - tmp |= MAY_BE_REF | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; -@@ -2953,7 +2953,7 @@ static int zend_update_type_info(const z - } - UPDATE_SSA_TYPE(tmp, ssa_ops[i].op2_def); - if (ssa_ops[i].result_def >= 0) { -- tmp = 0; -+ tmp = (ssa_ops[i].result_use >= 0) ? RES_USE_INFO() : 0; - if (t1 & MAY_BE_OBJECT) { - tmp |= MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; - } -@@ -3079,7 +3079,8 @@ static int zend_update_type_info(const z - UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); - } else { - /* invalid key type */ -- UPDATE_SSA_TYPE(t1, ssa_ops[i].op1_def); -+ tmp = (tmp & (MAY_BE_RC1|MAY_BE_RCN)) | (t1 & ~(MAY_BE_RC1|MAY_BE_RCN)); -+ UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); - } - COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def); - } |