Pullup ticket #5833 - requested by taca

lang/php72: security fix

Revisions pulled up:
- lang/php72/Makefile                                           1.13
- lang/php72/Makefile.php                                       1.7-1.8
- lang/php72/distinfo                                           1.29-1.30

---
   Module Name:	pkgsrc
   Committed By:	manu
   Date:		Mon Jul 30 07:17:16 UTC 2018

   Modified Files:
   	pkgsrc/lang/php70: Makefile.php
   	pkgsrc/lang/php71: Makefile.php
   	pkgsrc/lang/php72: Makefile.php

   Log Message:
   Fix PHP buidl on i386

   The --disable-gcc-global-regs fix is not enough, we really need
   GCC 6 to avoid php crashing during www/ap-ph build.

---
   Module Name:	pkgsrc
   Committed By:	maya
   Date:		Tue Jul 31 01:17:56 UTC 2018

   Modified Files:
   	pkgsrc/lang/php70: Makefile Makefile.php
   	pkgsrc/lang/php71: Makefile Makefile.php
   	pkgsrc/lang/php72: Makefile Makefile.php

   Log Message:
   move --disable-gcc-global-regs to Makefile.php.
   Seems to make a previously segfaulting netbsd-8/i386's build not segfau=
   lt.
   ap-php runs PHP's configure and builds some of its code, so it needs th=
   e
   same flag.

   Now we can stop requiring an arbitrary GCC version. The test case in th=
   e
   GCC bugzilla fails on all GCC versions I tested, but magically some
   versions of GCC manage to build a working PHP.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Aug 19 13:56:59 UTC 2018

   Modified Files:
   	pkgsrc/lang/php: phpversion.mk
   	pkgsrc/lang/php72: distinfo

   Log Message:
   lang/php72: update to 7.2.9

   16 Aug 2018, PHP 7.2.9

   - Calendar:
     . Fixed bug #52974 (jewish.c: compile error under Windows with GBK ch=
   arset).
       (cmb)

   - Filter:
     . Fixed bug #76366 (References in sub-array for filtering breaks the =
   filter).
       (ZiHang Gao)

   - PDO_Firebird:
     . Fixed bug #76488 (Memory leak when fetching a BLOB field). (Simonov=
    Denis)

   - PDO_PgSQL:
     . Fixed bug #75402 (Possible Memory Leak using PDO::CURSOR_SCROLL opt=
   ion).
       (Anatol)

   - SQLite3:
     . Fixed #76665 (SQLite3Stmt::bindValue() with SQLITE3_FLOAT doesn't j=
   uggle).
       (cmb)

   - Standard:
     . Fixed bug #73817 (Incorrect entries in get_html_translation_table).=
    (cmb)
     . Fixed bug #68553 (array_column: null values in $index_key become in=
   crementing
       keys in result). (Laruence)
     . Fixed bug #76643 (Segmentation fault when using `output_add_rewrite=
   _var`).
       (cmb)

   - Zip:
     . Fixed bug #76524 (ZipArchive memory leak (OVERWRITE flag and empty =
   archive)).
       (Timur Ibragimov)

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Sep 13 15:45:33 UTC 2018

   Modified Files:
   	pkgsrc/lang/php: phpversion.mk
   	pkgsrc/lang/php72: distinfo

   Log Message:
   lang/php72: Update to 7.2.10

   13 Sep 2018, PHP 7.2.10

   - Core:
     . Fixed bug #76754 (parent private constant in extends class memory l=
   eak).
       (Laruence)
     . Fixed bug #72443 (Generate enabled extension). (petk)
     . Fixed bug #75797 (Memory leak when using class_alias() in non-debug=
    mode).
       (Massimiliano Braglia)

   - Apache2:
     . Fixed bug #76582 (Apache bucket brigade sometimes becomes invalid).=
    (stas)

   - Bz2:
     . Fixed arginfo for bzcompress. (Tyson Andre)

   - gettext:
     . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji)

   - iconv:
     . Fixed bug #68180 (iconv_mime_decode can return extra characters in =
   a
       header). (cmb)
     . Fixed bug #63839 (iconv_mime_decode_headers function is skipping he=
   aders).
       (cmb)
     . Fixed bug #60494 (iconv_mime_decode does ignore special characters)=
   . (cmb)
     . Fixed bug #55146 (iconv_mime_decode_headers() skips some headers). =
   (cmb)

   - intl:
     . Fixed bug #74484 (MessageFormatter::formatMessage memory corruption=
    with
       11+ named placeholders). (Anatol)

   - libxml:
     . Fixed bug #76777 ("public id" parameter of libxml_set_external_enti=
   ty_loader
       callback undefined). (Ville Hukkam=E4ki)

   - mbstring:
     . Fixed bug #76704 (mb_detect_order return value varies based on argu=
   ment
       type). (cmb)

   - Opcache:
     . Fixed bug #76747 (Opcache treats path containing "test.pharma.tld" =
   as a phar
       file). (Laruence)

   - OpenSSL:
     . Fixed bug #76705 (unusable ssl =3D> peer_fingerprint in
       stream_context_create()). (Jakub Zelenka)

   - phpdbg:
     . Fixed bug #76595 (phpdbg man page contains outdated information).
       (Kevin Abel)

   - SPL:
     . Fixed bug #68825 (Exception in DirectoryIterator::getLinkTarget()).=
    (cmb)
     . Fixed bug #68175 (RegexIterator pregFlags are NULL instead of 0). (=
   Tim
       Siebels)

   - Standard:
     . Fixed bug #76778 (array_reduce leaks memory if callback throws exce=
   ption).
       (cmb)

   - zlib:
     . Fixed bug #65988 (Zlib version check fails when an include/zlib/ st=
   yle dir
       is passed to the --with-zlib configure option). (Jay Bonci)
     . Fixed bug #76709 (Minimal required zlib library is 1.2.0.4). (petk)=

4 files changed, 16 insertions, 15 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 000cec065c5..b3a1fcf9d80 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.221.2.5 2018/09/18 18:15:50 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.221.2.6 2018/09/18 18:34:08 bsiegert Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -90,7 +90,7 @@ PHPVERSION_MK=	defined
 PHP56_VERSION=	5.6.37
 PHP70_VERSION=	7.0.31
 PHP71_VERSION=	7.1.22
-PHP72_VERSION=	7.2.8
+PHP72_VERSION=	7.2.10
 
 # Define initial release of major version.
 PHP56_RELDATE=	20140828
diff --git a/lang/php72/Makefile b/lang/php72/Makefile
index 6d825481f3e..2b171aea510 100644
--- a/lang/php72/Makefile
+++ b/lang/php72/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8.2.1 2018/08/17 16:08:38 bsiegert Exp $
+# $NetBSD: Makefile,v 1.8.2.2 2018/09/18 18:34:08 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -40,12 +40,6 @@ SUBST_SED.path+=	-e 's,@PREFIX@,${PREFIX},g'
 
 INSTALLATION_DIRS+=	${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 
-# segfaults when buidling with many compilers
-# https://bugs.php.net/bug.php?id=74527
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=	--disable-gcc-global-regs
-.endif
-
 # Make sure modules can link correctly
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=	yes
diff --git a/lang/php72/Makefile.php b/lang/php72/Makefile.php
index e1988591478..3d220c5659f 100644
--- a/lang/php72/Makefile.php
+++ b/lang/php72/Makefile.php
@@ -1,8 +1,15 @@
-# $NetBSD: Makefile.php,v 1.4.4.1 2018/08/17 16:08:38 bsiegert Exp $
+# $NetBSD: Makefile.php,v 1.4.4.2 2018/09/18 18:34:08 bsiegert Exp $
 # used by lang/php72/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
 
+# segfaults when buidling with many compilers
+# https://bugs.php.net/bug.php?id=74527
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236
+.if ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS+=	--disable-gcc-global-regs
+.endif
+
 # the binary actually needs full dep on PCRE
 BUILDLINK_DEPMETHOD.pcre=	full
 
diff --git a/lang/php72/distinfo b/lang/php72/distinfo
index 0701ff72289..08be47695a7 100644
--- a/lang/php72/distinfo
+++ b/lang/php72/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26.2.1 2018/08/17 16:08:38 bsiegert Exp $
+$NetBSD: distinfo,v 1.26.2.2 2018/09/18 18:34:08 bsiegert Exp $
 
-SHA1 (php-7.2.8.tar.bz2) = b0aa50ba30be0e93bf4b1087f6a6326ffe0dd06f
-RMD160 (php-7.2.8.tar.bz2) = b73b220a5ef91d3d17de726adbe9fc04abc6c0ba
-SHA512 (php-7.2.8.tar.bz2) = 4eaab35ff99c6829e4e67b99d0dbc1d25b83210c9d894fbb9e6810dd3de8b7d5bd62b2d8a9f2ecb3c1f2f5a9c28116a22b36f019a21b8770f02fe1e3149728d9
-Size (php-7.2.8.tar.bz2) = 15035638 bytes
+SHA1 (php-7.2.10.tar.bz2) = 9f71b88c30e5113eb1fd4ebc53adbb9a2354b39a
+RMD160 (php-7.2.10.tar.bz2) = b588ca29b96a3478afc507e43f529fc336dcea40
+SHA512 (php-7.2.10.tar.bz2) = de1c22ee37cd0e6d1682091d9735f292cb5c6be653c5ce5771fdcd43522122dfebecab474fe2b29f94a757942513569916ebff59f3a8e63b6fc61830dabb3e47
+Size (php-7.2.10.tar.bz2) = 15043712 bytes
 SHA1 (patch-configure) = 47f2ede97390cc7e46d04c2769dd97459b19450a
 SHA1 (patch-disable-filter-url) = e9e92d686ddd1d1a1ece10fe4feee4e368fe510c
 SHA1 (patch-ext_gd_config.m4) = 67730ccc13410adaf8829f77a6b044f16e412489