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

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Jun 28 19:35:58 UTC 2016

Modified Files:
        pkgsrc/lang/php [pkgsrc-2016Q1]: phpversion.mk
        pkgsrc/lang/php55 [pkgsrc-2016Q1]: Makefile distinfo

Log Message:
Pullup ticket #5050 - requested by taca
lang/php55: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.139
- lang/php55/Makefile                                           1.27
- lang/php55/distinfo                                           1.54

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Jun 24 15:23:00 UTC 2016

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

   Log Message:
   Update php55 to 5.5.37 (PHP 5.5.37), including security fixes.

   pkgsrc change: remove confiugre from SUBST_FILES.path.

   23 Jun 2016, PHP 5.5.37

   - Core:
     . Fixed bug #72268 (Integer Overflow in nl2br()). (Stas)
     . Fixed bug #72275 (Integer Overflow in json_encode()/json_decode()/
       json_utf8_to_utf16()). (Stas)
     . Fixed bug #72400 (Integer Overflow in addcslashes/addslashes). (Stas)
     . Fixed bug #72403 (Integer Overflow in Length of String-typed ZVAL). (Stas)

   - GD:
     . Fixed bug #66387 (Stack overflow with imagefilltoborder) (CVE-2015-8874).
       (cmb)
     . Fixed bug #72298 (pass2_no_dither out-of-bounds access). (Stas)
     . Fixed bug #72339 (Integer Overflow in _gd2GetHeader() resulting in
       heap overflow). (Pierre)
     . Fixed bug #72407 (NULL Pointer Dereference at _gdScaleVert). (Stas)
     . Fixed bug #72446 (Integer Overflow in gdImagePaletteToTrueColor() resulting
       in heap overflow). (Pierre)

   - mbstring:
      . Fixed bug #72402 (_php_mb_regex_ereg_replace_exec - double free). (Stas)

   - mcrypt:
      . Fixed bug #72455 (Heap Overflow due to integer overflows). (Stas)

   - SPL:
     . Fixed bug #72262 (int/size_t confusion in SplFileObject::fread). (Stas)
     . Fixed bug #72433 (Use After Free Vulnerability in PHP's GC algorithm and
       unserialize). (Dmitry)

   - WDDX:
     . Fixed bug #72340 (Double Free Courruption in wddx_deserialize). (Stas)

   - zip:
     . Fixed bug #72434 (ZipArchive class Use After Free Vulnerability in PHP's GC
       algorithm and unserialize). (Dmitry)


To generate a diff of this commit:
cvs rdiff -u -r1.131.2.6 -r1.131.2.7 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.26 -r1.26.2.1 pkgsrc/lang/php55/Makefile
cvs rdiff -u -r1.51.2.2 -r1.51.2.3 pkgsrc/lang/php55/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.131.2.6 pkgsrc/lang/php/phpversion.mk:1.131.2.7
--- pkgsrc/lang/php/phpversion.mk:1.131.2.6     Sat Jun  4 19:56:36 2016
+++ pkgsrc/lang/php/phpversion.mk       Tue Jun 28 19:35:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.131.2.6 2016/06/04 19:56:36 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.131.2.7 2016/06/28 19:35:57 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
@@ -81,7 +81,7 @@
 PHPVERSION_MK= defined
 
 # Define each PHP's version.
-PHP55_VERSION= 5.5.36
+PHP55_VERSION= 5.5.37
 PHP56_VERSION= 5.6.22
 PHP70_VERSION= 7.0.7
 

Index: pkgsrc/lang/php55/Makefile
diff -u pkgsrc/lang/php55/Makefile:1.26 pkgsrc/lang/php55/Makefile:1.26.2.1
--- pkgsrc/lang/php55/Makefile:1.26     Sat Apr  2 08:59:24 2016
+++ pkgsrc/lang/php55/Makefile  Tue Jun 28 19:35:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/04/02 08:59:24 taca Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2016/06/28 19:35:57 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -39,7 +39,7 @@ PLIST_SUBST+=         PHPEXTDIR="${PHP_EXTENSIO
 SUBST_CLASSES+=                path
 SUBST_MESSAGE.path=    Fixing common paths.
 SUBST_STAGE.path=      pre-configure
-SUBST_FILES.path=      configure ext/phar/phar/phar.php
+SUBST_FILES.path=      ext/phar/phar/phar.php
 SUBST_FILES.path+=     php.ini-development php.ini-production run-tests.php
 SUBST_FILES.path+=     sapi/cgi/Makefile.frag
 SUBST_SED.path=                -e 's,@CGIDIR@,${CGIDIR},g'

Index: pkgsrc/lang/php55/distinfo
diff -u pkgsrc/lang/php55/distinfo:1.51.2.2 pkgsrc/lang/php55/distinfo:1.51.2.3
--- pkgsrc/lang/php55/distinfo:1.51.2.2 Sat Jun  4 19:45:18 2016
+++ pkgsrc/lang/php55/distinfo  Tue Jun 28 19:35:57 2016
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.51.2.2 2016/06/04 19:45:18 bsiegert Exp $
+$NetBSD: distinfo,v 1.51.2.3 2016/06/28 19:35:57 bsiegert Exp $
 
-SHA1 (php-5.5.36.tar.bz2) = eeb87629e55cbb4e8650f522307167541f1ed409
-RMD160 (php-5.5.36.tar.bz2) = 31a8313f7e8b051bdcb5f5273d80858e0d2d5d9b
-SHA512 (php-5.5.36.tar.bz2) = 5521ef8bec1720e3df49f5b002c93726d1b52a7b551acf414e32dfd8ca88f8d661b9f011408d7f9f451fb29b06385365d2975bb14ed6d3c10cdc5546543af485
-Size (php-5.5.36.tar.bz2) = 13686345 bytes
+SHA1 (php-5.5.37.tar.bz2) = f999bf46a6b3a1adee8239c40e13e8ce06fd470a
+RMD160 (php-5.5.37.tar.bz2) = 349fbe9ea88423a2f6b0b8b47468401c3537ff8c
+SHA512 (php-5.5.37.tar.bz2) = d2da921f3efd858e1cb8004873e377ca9c5821d5269d5b8e7c9be830b183f4d18f737b14653f65a43c0957bdca994e09a476d77e3a29a11e357abc24618c4c0f
+Size (php-5.5.37.tar.bz2) = 13699851 bytes
 SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
 SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2
 SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2