php: Update from 7.1rc6 to 7.1.0

diff --git a/packages/php/build.sh b/packages/php/build.sh
index d8204f5..a3c7c8b 100644 (file)
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@@ -1,8 +1,8 @@
-TERMUX_PKG_HOMEPAGE=http://php.net/
+TERMUX_PKG_HOMEPAGE=https://php.net
 TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
-_PHP_RC=6
-TERMUX_PKG_VERSION=7.1~rc${_PHP_RC}
-TERMUX_PKG_SRCURL=https://downloads.php.net/~krakjoe/php-7.1.0RC${_PHP_RC}.tar.xz
+TERMUX_PKG_VERSION=7.1.0
+TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=a810b3f29c21407c24caa88f50649320d20ba6892ae1923132598b8a0ca145b6
 # 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:
@@ -32,7 +32,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-sockets"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-zip"
 
 termux_step_pre_configure () {
-       LDFLAGS+=" -landroid-glob"
+       LDFLAGS+=" -landroid-glob -llog"
 
        export PATH=$PATH:$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/
        export NATIVE_PHP_EXECUTABLE=$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/php

diff --git a/packages/php/zend_accelerator_module.c.patch b/packages/php/zend_accelerator_module.c.patch
new file mode 100644 (file)
index 0000000..686eaf0
--- /dev/null
+++ b/packages/php/zend_accelerator_module.c.patch
@@ -0,0 +1,36 @@
+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;
+ }