CVS commit: [pkgsrc-2018Q1] pkgsrc/lang

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sun May  6 10:48:47 UTC 2018

Modified Files:
        pkgsrc/lang/php [pkgsrc-2018Q1]: phpversion.mk
        pkgsrc/lang/php71 [pkgsrc-2018Q1]: distinfo
        pkgsrc/lang/php71/patches [pkgsrc-2018Q1]: patch-ext_intl_config.m4

Log Message:
Pullup ticket #5747 - requested by taca
lang/php71: security update

Revisions pulled up:
- lang/php/phpversion.mk                                        1.214
- lang/php71/distinfo                                           1.36
- lang/php71/patches/patch-ext_intl_config.m4                   1.2

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Thu Apr 26 15:41:04 UTC 2018

   Modified Files:
        pkgsrc/lang/php71: distinfo
        pkgsrc/lang/php71/patches: patch-ext_intl_config.m4

   Log Message:
   lang/php71: update to 7.1.17

   26 Apr 2018, PHP 7.1.17

   - Date:
     . Fixed bug #76131 (mismatch arginfo for date_create). (carusogabriel)

   - Exif:
     . Fixed bug#76130 (Heap Buffer Overflow (READ: 1786) in exif_iif_add_value).
       (Stas)

   - FPM:
     . Fixed bug #68440 (ERROR: failed to reload: execvp() failed: Argument list
       too long). (Jacob Hipps)
     . Fixed incorrect write to getenv result in FPM reload. (Jakub Zelenka)

   - GD:
     . Fixed bug #52070 (imagedashedline() - dashed line sometimes is not visible).
       (cmb)

   - iconv:
     . Fixed bug #76249 (stream filter convert.iconv leads to infinite loop on
       invalid sequence). (Stas)

   - intl:
     . Fixed bug #76153 (Intl compilation fails with icu4c 61.1). (Anatol)

   - ldap:
     . Fixed bug #76248 (Malicious LDAP-Server Response causes Crash). (Stas)

   - mbstring:
     . Fixed bug #75944 (Wrong cp1251 detection). (dmk001)
     . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1).
       (chrullrich, cmb)

   - Phar:
     . Fixed bug #76129 (fix for CVE-2018-5712 may not be complete). (Stas)

   - phpdbg:
     . Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite). (Laruence)

   - SPL:
     . Fixed bug #76131 (mismatch arginfo for splarray constructor).
       (carusogabriel)

   - standard:
     . Fixed bug #75996 (incorrect url in header for mt_rand). (tatarbj)

   To generate a diff of this commit:
   cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/php71/distinfo
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php71/patches/patch-ext_intl_config.m4

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Thu Apr 26 15:42:15 UTC 2018

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

   Log Message:
   lang/php: update php71 to 7.1.17

   Oops, should be commited with previous one.

   To generate a diff of this commit:
   cvs rdiff -u -r1.213 -r1.214 pkgsrc/lang/php/phpversion.mk


To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.213.2.1 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.35 -r1.35.2.1 pkgsrc/lang/php71/distinfo
cvs rdiff -u -r1.1 -r1.1.12.1 \
    pkgsrc/lang/php71/patches/patch-ext_intl_config.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php/phpversion.mk
diff -u pkgsrc/lang/php/phpversion.mk:1.213 pkgsrc/lang/php/phpversion.mk:1.213.2.1
--- pkgsrc/lang/php/phpversion.mk:1.213 Fri Mar 30 00:37:16 2018
+++ pkgsrc/lang/php/phpversion.mk       Sun May  6 10:48:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.213 2018/03/30 00:37:16 taca Exp $
+# $NetBSD: phpversion.mk,v 1.213.2.1 2018/05/06 10:48:47 spz 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
@@ -89,7 +89,7 @@ PHPVERSION_MK=        defined
 # Define each PHP's version.
 PHP56_VERSION= 5.6.35
 PHP70_VERSION= 7.0.29
-PHP71_VERSION= 7.1.16
+PHP71_VERSION= 7.1.17
 PHP72_VERSION= 7.2.4
 
 # Define initial release of major version.

Index: pkgsrc/lang/php71/distinfo
diff -u pkgsrc/lang/php71/distinfo:1.35 pkgsrc/lang/php71/distinfo:1.35.2.1
--- pkgsrc/lang/php71/distinfo:1.35     Thu Mar 29 16:19:39 2018
+++ pkgsrc/lang/php71/distinfo  Sun May  6 10:48:47 2018
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.35 2018/03/29 16:19:39 taca Exp $
+$NetBSD: distinfo,v 1.35.2.1 2018/05/06 10:48:47 spz Exp $
 
-SHA1 (php-7.1.16.tar.bz2) = 07419a1902450bc857af4696c4942d1c200e19b8
-RMD160 (php-7.1.16.tar.bz2) = 811bed87e9929e3add210706e8ff1f2014f316fe
-SHA512 (php-7.1.16.tar.bz2) = c933275c41755d27562203972ee463ae6f009aa47d6c843ef19f945bcae8ec114a60d8f0daae326d3ed491c8f90c3097c96f30b3848cc06db51553ac262f1ef2
-Size (php-7.1.16.tar.bz2) = 15129147 bytes
+SHA1 (php-7.1.17.tar.bz2) = bdf16f742e3fb0764ec458e362d056d1bedc7c23
+RMD160 (php-7.1.17.tar.bz2) = fc2a789f1f7a409374b3ec207084dc4e3790a64d
+SHA512 (php-7.1.17.tar.bz2) = 6a3d7e93ee3d167a16b95de88929509fa4a4a053bbf793f3919850065f46169488301a1a11e72a69829793dd51190eb035c56ed9330184d7084a738671538e14
+Size (php-7.1.17.tar.bz2) = 15141088 bytes
 SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
 SHA1 (patch-configure) = 862707ff3fd8b8d7312104bb44a48fe8379951bd
 SHA1 (patch-ext_gd_config.m4) = 93b62daad93b9ee6dc28e06016f739bc26b0dc9f
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
-SHA1 (patch-ext_intl_config.m4) = 1ea3d3e6f05d5fed0bd4ca4518440199aec0954d
+SHA1 (patch-ext_intl_config.m4) = 5192f8e8fa32939c62a734421463edd294372282
 SHA1 (patch-ext_pcre_pcrelib_config.h) = c5fba95856628f68639fe63feeef04a5f83d3916
 SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
 SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244

Index: pkgsrc/lang/php71/patches/patch-ext_intl_config.m4
diff -u pkgsrc/lang/php71/patches/patch-ext_intl_config.m4:1.1 pkgsrc/lang/php71/patches/patch-ext_intl_config.m4:1.1.12.1
--- pkgsrc/lang/php71/patches/patch-ext_intl_config.m4:1.1      Mon Feb 20 03:23:13 2017
+++ pkgsrc/lang/php71/patches/patch-ext_intl_config.m4  Sun May  6 10:48:47 2018
@@ -1,15 +1,15 @@
-$NetBSD: patch-ext_intl_config.m4,v 1.1 2017/02/20 03:23:13 taca Exp $
+$NetBSD: patch-ext_intl_config.m4,v 1.1.12.1 2018/05/06 10:48:47 spz Exp $
 
 Work around for build problem.
 
---- ext/intl/config.m4.orig    2017-02-14 18:35:43.000000000 +0000
+--- ext/intl/config.m4.orig    2018-04-24 16:17:57.000000000 +0000
 +++ ext/intl/config.m4
-@@ -86,7 +86,7 @@ if test "$PHP_INTL" != "no"; then
-     breakiterator/codepointiterator_methods.cpp \
+@@ -68,7 +68,7 @@ if test "$PHP_INTL" != "no"; then
+     transliterator/transliterator_methods.c \
      uchar/uchar.c \
      idn/idn.c \
--    $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,cxx)
-+    $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-   PHP_ADD_BUILD_DIR($ext_builddir/collator)
-   PHP_ADD_BUILD_DIR($ext_builddir/converter)
-   PHP_ADD_BUILD_DIR($ext_builddir/common)
+-    $icu_spoof_src, $ext_shared,,$INTL_COMMON_FLAGS,cxx)
++    $icu_spoof_src, $ext_shared,,$INTL_COMMON_FLAGS)
+ 
+   PHP_INTL_CXX_SOURCES="intl_convertcpp.cpp \
+     common/common_enum.cpp \