php: Update from 7.1.12 to 7.2.1

diff --git a/packages/php/Zend-zend_multiply.h.patch b/packages/php/Zend-zend_multiply.h.patch
deleted file mode 100644 (file)
index 9c8ad58..0000000
--- a/packages/php/Zend-zend_multiply.h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Backport of:
-
-https://github.com/php/php-src/commit/8c8679207ae5ada8751288e75b78c928a4d34d1d
-
-diff -u -r ../php-7.1.7/Zend/zend_multiply.h ./Zend/zend_multiply.h
---- ../php-7.1.7/Zend/zend_multiply.h  2017-07-06 11:30:11.000000000 +0200
-+++ ./Zend/zend_multiply.h     2017-07-10 00:54:43.550300703 +0200
-@@ -53,8 +53,8 @@
-       __asm__("mul %0, %2, %3\n"                                                                              \
-               "smulh %1, %2, %3\n"                                                                            \
-               "sub %1, %1, %0, asr #63\n"                                                                     \
--                      : "=X"(__tmpvar), "=X"(usedval)                                                 \
--                      : "X"(a), "X"(b));                                                                              \
-+                      : "=&r"(__tmpvar), "=&r"(usedval)                                               \
-+                      : "r"(a), "r"(b));                                                                              \
-       if (usedval) (dval) = (double) (a) * (double) (b);                              \
-       else (lval) = __tmpvar;                                                                                 \
- } while (0)

diff --git a/packages/php/build.sh b/packages/php/build.sh
index 3e0e210..e663240 100644 (file)
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@@ -1,8 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://php.net
 TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
-TERMUX_PKG_VERSION=7.1.12
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=a0118850774571b1f2d4e30b4fe7a4b958ca66f07d07d65ebdc789c54ba6eeb3
+TERMUX_PKG_VERSION=7.2.1
+TERMUX_PKG_SHA256=6c6cf82fda6660ed963821eb0525214bb3547e8e29f447b9c15b2d8e6efd8822
 TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
 # Build native php for phar to build (see pear-Makefile.frag.patch):
 TERMUX_PKG_HOSTBUILD=true

diff --git a/packages/php/ext-sockets-sockets.c.patch b/packages/php/ext-sockets-sockets.c.patch
new file mode 100644 (file)
index 0000000..d4333a8
--- /dev/null
+++ b/packages/php/ext-sockets-sockets.c.patch
@@ -0,0 +1,12 @@
+diff -u -r ../php-7.2.1/ext/sockets/sockets.c ./ext/sockets/sockets.c
+--- ../php-7.2.1/ext/sockets/sockets.c 2018-01-02 23:36:00.000000000 +0100
++++ ./ext/sockets/sockets.c    2018-01-08 16:39:57.150438080 +0100
+@@ -796,7 +796,7 @@
+       REGISTER_LONG_CONSTANT("AI_ALL",                        AI_ALL,                         CONST_CS | CONST_PERSISTENT);
+ #endif
+       REGISTER_LONG_CONSTANT("AI_ADDRCONFIG",         AI_ADDRCONFIG,          CONST_CS | CONST_PERSISTENT);
+-#ifdef __USE_GNU
++#if defined(__USE_GNU) && !defined(__ANDROID__)
+       REGISTER_LONG_CONSTANT("AI_IDN",                        AI_IDN,                         CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("AI_CANONIDN",           AI_CANONIDN,            CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("AI_IDN_ALLOW_UNASSIGNED",               AI_IDN_ALLOW_UNASSIGNED, CONST_CS | CONST_PERSISTENT);