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

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Aug 23 18:52:28 UTC 2020

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

Log Message:
Pullup ticket #6300 - requested by taca
lang/php72: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.306
- lang/php72/Makefile                                           1.28
- lang/php72/distinfo                                           1.56-1.57

---
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Sat Jul 11 04:06:07 UTC 2020

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

   Log Message:
   lang/php72: update to 7.2.

   Update php72 to 7.2

   09 Jul 2020, PHP 7.2.32

   - Core:
     . No source changes to this release.
       Vesion number added for reproduction of Windows builds. (cmb)

   14 May 2020, PHP 7.2.31

   - Core:
     . Fixed bug #78875 (Long filenames cause OOM and temp files are not cleaned).
       (CVE-2019-11048) (cmb)
     . Fixed bug #78876 (Long variables in multipart/form-data cause OOM and temp
       files are not cleaned). (CVE-2019-11048) (cmb)

---
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Sat Aug  8 13:32:57 UTC 2020

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

   Log Message:
   lang/php72: update to 7.2.33

   Update php72 to 7.2.33 (PHP 7.2.33).

   06 Aug 2020, PHP 7.2.33

   - Core:
     . Fixed bug #79877 (getimagesize function silently truncates after a null
       byte) (cmb)

   - Phar:
     . Fixed bug #79797 (Use of freed hash key in the phar_parse_zipfile
       function). (CVE-2020-7068) (cmb)


To generate a diff of this commit:
cvs rdiff -u -r1.300.2.2 -r1.300.2.3 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.27 -r1.27.2.1 pkgsrc/lang/php72/Makefile
cvs rdiff -u -r1.55 -r1.55.2.1 pkgsrc/lang/php72/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.300.2.2 pkgsrc/lang/php/phpversion.mk:1.300.2.3
--- pkgsrc/lang/php/phpversion.mk:1.300.2.2     Sun Aug 23 18:42:13 2020
+++ pkgsrc/lang/php/phpversion.mk       Sun Aug 23 18:52:28 2020
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.300.2.2 2020/08/23 18:42:13 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.300.2.3 2020/08/23 18:52:28 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.40
-PHP72_VERSION= 7.2.31
+PHP72_VERSION= 7.2.33
 PHP73_VERSION= 7.3.21
 PHP74_VERSION= 7.4.9
 

Index: pkgsrc/lang/php72/Makefile
diff -u pkgsrc/lang/php72/Makefile:1.27 pkgsrc/lang/php72/Makefile:1.27.2.1
--- pkgsrc/lang/php72/Makefile:1.27     Tue Jun  2 08:22:46 2020
+++ pkgsrc/lang/php72/Makefile  Sun Aug 23 18:52:28 2020
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2020/06/02 08:22:46 adam Exp $
+# $NetBSD: Makefile,v 1.27.2.1 2020/08/23 18:52:28 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
-PKGREVISION=           1
 
 COMMENT=               PHP Hypertext Preprocessor version 7.2
 LICENSE=               php

Index: pkgsrc/lang/php72/distinfo
diff -u pkgsrc/lang/php72/distinfo:1.55 pkgsrc/lang/php72/distinfo:1.55.2.1
--- pkgsrc/lang/php72/distinfo:1.55     Thu May 14 14:26:59 2020
+++ pkgsrc/lang/php72/distinfo  Sun Aug 23 18:52:28 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.55 2020/05/14 14:26:59 taca Exp $
+$NetBSD: distinfo,v 1.55.2.1 2020/08/23 18:52:28 bsiegert Exp $
 
-SHA1 (php-7.2.31.tar.xz) = b575c1ca634b80218021a6addb49a004bc5260f8
-RMD160 (php-7.2.31.tar.xz) = 4785209f87e29a61a395c1fe0ddbaf3488f9ca04
-SHA512 (php-7.2.31.tar.xz) = b21c504d0af2c095e4ae5a62c810af96171b927a27ea4694f59555c0d47798d61c3491a92941099cd9c978b3b0f41852ca2cf745e42ee3d9a6d107a5a884c9ee
-Size (php-7.2.31.tar.xz) = 12309936 bytes
+SHA1 (php-7.2.33.tar.xz) = 5297d7594af3950f395b775bbf7470c8e6f89683
+RMD160 (php-7.2.33.tar.xz) = 83b1f02ef406228ef3a3d1b0371246843d84c26e
+SHA512 (php-7.2.33.tar.xz) = 1c28e741fc6de88a33e1307bc88ba8dddf1ba767ce6eb9c1f0da35482c7d3ee1154831b997fa746340c4b7ec8de9196b21a9b1cf319c8e69eca2c92602ceee4a
+Size (php-7.2.33.tar.xz) = 12310624 bytes
 SHA1 (patch-configure) = 6e66a79e691a84aa7ae461f8dec1752443ad6b61
 SHA1 (patch-disable-filter-url) = e9e92d686ddd1d1a1ece10fe4feee4e368fe510c
 SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335