php: Update from 7.1.0 to 7.1.1

diff --git a/packages/php/build.sh b/packages/php/build.sh
index b4ae26f094967b9a636cf8bca5109a34f4a440be..b746e73bc9d421c3b3110f7c83f8f2bca1c748de 100644 (file)
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://php.net
 TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
 TERMUX_PKG_HOMEPAGE=https://php.net
 TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"

-TERMUX_PKG_VERSION=7.1.0
+TERMUX_PKG_VERSION=7.1.1

 TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz

-TERMUX_PKG_SHA256=a810b3f29c21407c24caa88f50649320d20ba6892ae1923132598b8a0ca145b6
+TERMUX_PKG_SHA256=b3565b0c1441064eba204821608df1ec7367abff881286898d900c2c2a5ffe70

 # Build native php for phar to build (see pear-Makefile.frag.patch):
 TERMUX_PKG_HOSTBUILD=true
 # Build the native php without xml support as we only need phar:
 # Build native php for phar to build (see pear-Makefile.frag.patch):
 TERMUX_PKG_HOSTBUILD=true
 # Build the native php without xml support as we only need phar:

diff --git a/packages/php/zend_accelerator_module.c.patch b/packages/php/zend_accelerator_module.c.patch
deleted file mode 100644 (file)
index 686eaf0..0000000
--- a/packages/php/zend_accelerator_module.c.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 003346c450b58a07af9e0061bffb14c287c39be8 Mon Sep 17 00:00:00 2001
-From: Dmitry Stogov <dmitry@zend.com>
-Date: Thu, 1 Dec 2016 10:30:02 +0300
-Subject: [PATCH] Simpler overflow check
-
----
- ext/opcache/zend_accelerator_module.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
-index b6c8e13..cbc3f24 100644
---- a/ext/opcache/zend_accelerator_module.c
-+++ b/ext/opcache/zend_accelerator_module.c
-@@ -107,8 +107,6 @@ static ZEND_INI_MH(OnUpdateMemoryConsumption)
- #else
-       char *base = (char *) ts_resource(*((int *) mh_arg2));
- #endif
--      zend_long megabyte, overflow;
--      double dummy;
- 
-       /* keep the compiler happy */
-       (void)entry; (void)mh_arg2; (void)mh_arg3; (void)stage;
-@@ -132,10 +130,10 @@ static ZEND_INI_MH(OnUpdateMemoryConsumption)
- 
-               ini_entry->value = zend_string_init(new_new_value, 1, 1);
-       }
--      megabyte = 1024 * 1024;
--      ZEND_SIGNED_MULTIPLY_LONG(memsize, megabyte, *p, dummy, overflow);
--      if (UNEXPECTED(overflow)) {
-+      if (UNEXPECTED(memsize > ZEND_ULONG_MAX / (1024 * 1024))) {
-               *p = ZEND_ULONG_MAX;
-+      } else {
-+              *p = memsize * (1024 * 1024);
-       }
-       return SUCCESS;
- }