CVS commit: [pkgsrc-2017Q2] pkgsrc/lang

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Aug 13 19:01:25 UTC 2017

Modified Files:
        pkgsrc/lang/php [pkgsrc-2017Q2]: phpversion.mk
        pkgsrc/lang/php70 [pkgsrc-2017Q2]: Makefile.php distinfo

Log Message:
Pullup ticket #5531 - requested by taca
lang/php70: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.185
- lang/php70/Makefile.php                                       1.7
- lang/php70/distinfo                                           1.36

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Aug  4 23:07:28 UTC 2017

   Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php70: Makefile.php distinfo

   Log Message:
   Update php70 to 7.0.22.

   * pkgsrc change: enable readline PKG_OPTIONS default.

   03 Aug 2017 PHP 7.0.22

   - Core:
     . Fixed bug #74832 (Loading PHP extension with already registered function
       name leads to a crash). (jpauli)
     . Fixed bug #74780 (parse_url() borken when query string contains colon).
       (jhdxr)
     . Fixed bug #74761 (Unary operator expected error on some systems). (petk)
     . Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic)
     . Fixed bug #74913 (fixed incorrect poll.h include). (petk)
     . Fixed bug #74906 (fixed incorrect errno.h include). (petk)

   - Date:
     . Fixed bug #74852 (property_exists returns true on unknown DateInterval
       property). (jhdxr)

   - OCI8:
     . Fixed bug #74625 (Integer overflow in oci_bind_array_by_name). (Ingmar Runge)

   - Opcache:
     . Fixed bug #74840 (Opcache overwrites argument of GENERATOR_RETURN within
       finally). (Bob)

   - PDO:
     . Fixed bug #69356 (PDOStatement::debugDumpParams() truncates query). (Adam
       Baratz)

   - SPL:
     . Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr)

   - SQLite3:
     . Fixed bug #74883 (SQLite3::__construct() produces "out of memory" exception
       with invalid flags). (Anatol)

   - Wddx:
     . Fixed bug #73173 (huge memleak when wddx_unserialize).
       (tloi at fortinet dot com)

   - zlib:
     . Fixed bug #73944 (dictionary option of inflate_init() does not work).
       (wapmorgan)


To generate a diff of this commit:
cvs rdiff -u -r1.181.2.3 -r1.181.2.4 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.4 -r1.4.2.1 pkgsrc/lang/php70/Makefile.php
cvs rdiff -u -r1.34.2.1 -r1.34.2.2 pkgsrc/lang/php70/distinfo

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.181.2.3 pkgsrc/lang/php/phpversion.mk:1.181.2.4
--- pkgsrc/lang/php/phpversion.mk:1.181.2.3     Sat Jul 15 19:23:43 2017
+++ pkgsrc/lang/php/phpversion.mk       Sun Aug 13 19:01:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.181.2.3 2017/07/15 19:23:43 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.181.2.4 2017/08/13 19:01:25 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
@@ -88,7 +88,7 @@ PHPVERSION_MK=        defined
 
 # Define each PHP's version.
 PHP56_VERSION= 5.6.31
-PHP70_VERSION= 7.0.21
+PHP70_VERSION= 7.0.22
 PHP71_VERSION= 7.1.7
 
 # Define initial release of major version.

Index: pkgsrc/lang/php70/Makefile.php
diff -u pkgsrc/lang/php70/Makefile.php:1.4 pkgsrc/lang/php70/Makefile.php:1.4.2.1
--- pkgsrc/lang/php70/Makefile.php:1.4  Tue Jun 20 07:24:08 2017
+++ pkgsrc/lang/php70/Makefile.php      Sun Aug 13 19:01:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.4 2017/06/20 07:24:08 manu Exp $
+# $NetBSD: Makefile.php,v 1.4.2.1 2017/08/13 19:01:25 bsiegert Exp $
 # used by lang/php70/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+=      --with-libxml-dir=${PRE
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
 PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline
-PKG_SUGGESTED_OPTIONS+=        inet6 ssl
+PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
 PKG_SUPPORTED_OPTIONS+=        dtrace

Index: pkgsrc/lang/php70/distinfo
diff -u pkgsrc/lang/php70/distinfo:1.34.2.1 pkgsrc/lang/php70/distinfo:1.34.2.2
--- pkgsrc/lang/php70/distinfo:1.34.2.1 Sat Jul 15 18:58:04 2017
+++ pkgsrc/lang/php70/distinfo  Sun Aug 13 19:01:25 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.34.2.1 2017/07/15 18:58:04 bsiegert Exp $
+$NetBSD: distinfo,v 1.34.2.2 2017/08/13 19:01:25 bsiegert Exp $
 
-SHA1 (php-7.0.21.tar.bz2) = c86add3ae2207fde3dcc4d41d5adb786fe676c30
-RMD160 (php-7.0.21.tar.bz2) = 8b6281735ae92a2549b3891f2e17f940eb5e1447
-SHA512 (php-7.0.21.tar.bz2) = c3c439fc79bef5492d3be94afea11125768cdd10f09f26caa140a6946c82eb2e49c817af616048c723bf9d6456d4ed1d9de844cfba862761b1cfc54f495367dd
-Size (php-7.0.21.tar.bz2) = 15342611 bytes
+SHA1 (php-7.0.22.tar.bz2) = aae18d98dd47b340fcbd140d6065e06f54091dcc
+RMD160 (php-7.0.22.tar.bz2) = 74e40d94a2d57a48a764445eca4afb18c2f5315d
+SHA512 (php-7.0.22.tar.bz2) = d22f716bddf4af9c4e6fa41efcf2179ffe8acbf1ec34742043dd4f60a202d3c20465368f392f7401f6c1354629f98f7f9c9381acb5134620151bc80d2610fda6
+Size (php-7.0.22.tar.bz2) = 15391136 bytes
 SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56
 SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
 SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76