Pullup ticket #6128 - requested by taca

lang/php74: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.285
- lang/php74/Makefile                                           1.3-1.5
- lang/php74/Makefile.php                                       1.2
- lang/php74/PLIST                                              1.2
- lang/php74/distinfo                                           1.4

---
   Module Name:	pkgsrc
   Committed By:	jperkin
   Date:		Sat Jan 18 21:51:16 UTC 2020

   Modified Files:
   	pkgsrc/lang/php74: Makefile

   Log Message:
   *: Recursive revision bump for openssl 1.1.1.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Jan 21 14:16:27 UTC 2020

   Modified Files:
   	pkgsrc/lang/php74: Makefile Makefile.php PLIST

   Log Message:
   lang/php74: switch to use external pcre

   Switch to use external pcre, fixing PR pkg/54793.

   Bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat Jan 25 17:22:49 UTC 2020

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

   Log Message:
   lang/php74: update to 7.4.2

   Update php74 to 7.4.2 (PHP 7.4.2).

   23 Jan 2020, PHP 7.4.2

   - Core:
     . Preloading support on Windows has been disabled. (Nikita)
     . Fixed bug #79022 (class_exists returns True for classes that are no=
   t ready
       to be used). (Laruence)
     . Fixed bug #78929 (plus signs in cookie values are converted to spac=
   es).
       (Alexey Kachalin)
     . Fixed bug #78973 (Destructor during CV freeing causes segfault if o=
   pline
       never saved). (Nikita)
     . Fixed bug #78776 (Abstract method implementation from trait does no=
   t check
       "static"). (Nikita)
     . Fixed bug #78999 (Cycle leak when using function result as temporar=
   y).
       (Dmitry)
     . Fixed bug #79008 (General performance regression with PHP 7.4 on Wi=
   ndows).
       (cmb)
     . Fixed bug #79002 (Serializing uninitialized typed properties with _=
   _sleep
       makes unserialize throw). (Nikita)

   - CURL:
     . Fixed bug #79033 (Curl timeout error with specific url and post). (=
   cmb)
     . Fixed bug #79063 (curl openssl does not respect PKG_CONFIG_PATH). (=
   Nikita)

   - Date:
     . Fixed bug #79015 (undefined-behavior in php_date.c). (cmb)

   - DBA:
     . Fixed bug #78808 ([LMDB] MDB_MAP_FULL: Environment mapsize limit re=
   ached).
       (cmb)

   - Exif:
     . Fixed bug #79046 (NaN to int cast undefined behavior in exif). (Nik=
   ita)

   - Fileinfo:
     . Fixed bug #74170 (locale information change after mime_content_type=
   ).
       (Sergei Turchanov)

   - GD:
     . Fixed bug #79067 (gdTransformAffineCopy() may use unitialized value=
   s). (cmb)
     . Fixed bug #79068 (gdTransformAffineCopy() changes interpolation met=
   hod).
       (cmb)

   - Libxml:
     . Fixed bug #79029 (Use After Free's in XMLReader / XMLWriter). (Laru=
   ence)

   - Mbstring:
     . Fixed bug #79037 (global buffer-overflow in `mbfl_filt_conv_big5_wc=
   har`).
       (CVE-2020-7060) (Nikita)

   - OPcache:
     . Fixed bug #78961 (erroneous optimization of re-assigned $GLOBALS). =
   (Dmitry)
     . Fixed bug #78950 (Preloading trait method with static variables). (=
   Nikita)
     . Fixed bug #78903 (Conflict in RTD key for closures results in crash=
   ).
       (Nikita)
     . Fixed bug #78986 (Opcache segfaults when inheriting ctor from immut=
   able
       into mutable class). (Nikita)
     . Fixed bug #79040 (Warning Opcode handlers are unusable due to ASLR)=
   . (cmb)
     . Fixed bug #79055 (Typed property become unknown with OPcache file c=
   ache).
       (Nikita)

   - Pcntl:
     . Fixed bug #78402 (Converting null to string in error message is bad=
    DX).
       (SAT=D2 Kentar=F2)

   - PDO_PgSQL:
     . Fixed bug #78983 (pdo_pgsql config.w32 cannot find libpq-fe.h). (SA=
   T=D2
       Kentar=F2)
     . Fixed bug #78980 (pgsqlGetNotify() overlooks dead connection). (SAT=
   =D2
       Kentar=F2)
     . Fixed bug #78982 (pdo_pgsql returns dead persistent connection). (S=
   AT=D2
       Kentar=F2)

   - Session:
     . Fixed bug #79091 (heap use-after-free in session_create_id()). (cmb=
   ,
       Nikita)
     . Fixed bug #79031 (Session unserialization problem). (Nikita)

   - Shmop:
     . Fixed bug #78538 (shmop memory leak). (cmb)

   - Sqlite3:
     . Fixed bug #79056 (sqlite does not respect PKG_CONFIG_PATH during
       compilation). (Nikita)

   - Spl:
     . Fixed bug #78976 (SplFileObject::fputcsv returns -1 on failure). (c=
   mb)

   - Standard:
     . Fixed bug #79099 (OOB read in php_strip_tags_ex). (CVE-2020-7059). =
   (cmb)
     . Fixed bug #79000 (Non-blocking socket stream reports EAGAIN as erro=
   r).
       (Nikita)
     . Fixed bug #54298 (Using empty additional_headers adding extraneous =
   CRLF).
       (cmb)

4 files changed, 11 insertions, 15 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index d1f82941a70..2024db7fa07 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.283.4.1 2020/01/29 12:48:15 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.283.4.2 2020/01/29 13:34:46 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.40
 PHP72_VERSION=	7.2.26
 PHP73_VERSION=	7.3.14
-PHP74_VERSION=	7.4.1
+PHP74_VERSION=	7.4.2
 
 # Define initial release of major version.
 PHP56_RELDATE=	20140828
diff --git a/lang/php74/Makefile.php b/lang/php74/Makefile.php
index 69feee8f335..c0aed4f3463 100644
--- a/lang/php74/Makefile.php
+++ b/lang/php74/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.1 2019/12/15 17:56:34 taca Exp $
+# $NetBSD: Makefile.php,v 1.1.4.1 2020/01/29 13:34:46 bsiegert Exp $
 # used by lang/php74/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -33,8 +33,9 @@ CONFIGURE_ARGS+=	--without-mysqli
 CONFIGURE_ARGS+=	--without-iconv
 CONFIGURE_ARGS+=	--without-pear
 CONFIGURE_ARGS+=	--without-sqlite3
-#CONFIGURE_ARGS+=	--without-intl
+CONFIGURE_ARGS+=	--with-external-pcre
 
+CONFIGURE_ARGS+=	--disable-intl
 CONFIGURE_ARGS+=	--disable-posix
 CONFIGURE_ARGS+=	--disable-opcache
 CONFIGURE_ARGS+=	--disable-pdo
diff --git a/lang/php74/PLIST b/lang/php74/PLIST
index fbff154cc3f..99125070d1e 100644
--- a/lang/php74/PLIST
+++ b/lang/php74/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/12/15 17:56:34 taca Exp $
+@comment $NetBSD: PLIST,v 1.1.4.1 2020/01/29 13:34:46 bsiegert Exp $
 bin/phar
 bin/phar.phar
 bin/php
@@ -131,11 +131,6 @@ include/php/ext/mysqlnd/mysqlnd_structs.h
 include/php/ext/mysqlnd/mysqlnd_vio.h
 include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
 include/php/ext/mysqlnd/php_mysqlnd.h
-include/php/ext/pcre/pcre2lib/config.h
-include/php/ext/pcre/pcre2lib/pcre2.h
-include/php/ext/pcre/pcre2lib/pcre2_internal.h
-include/php/ext/pcre/pcre2lib/pcre2_intmodedep.h
-include/php/ext/pcre/pcre2lib/pcre2_ucp.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/phar/php_phar.h
 include/php/ext/session/mod_files.h
diff --git a/lang/php74/distinfo b/lang/php74/distinfo
index e99212ee183..b4cba701d06 100644
--- a/lang/php74/distinfo
+++ b/lang/php74/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2019/12/21 07:00:55 taca Exp $
+$NetBSD: distinfo,v 1.3.4.1 2020/01/29 13:34:46 bsiegert Exp $
 
-SHA1 (php-7.4.1.tar.xz) = 83cae8ce14f9e59e8774747e886b0bdbdce6b259
-RMD160 (php-7.4.1.tar.xz) = 7d426a5d88d4e698dc98fc42556455617dc1e897
-SHA512 (php-7.4.1.tar.xz) = 2dd152bdca52ece160feff799622fd4bdd88e0664f629e6149fd14ede6c304dfc40c164fcd9200c041b26342d6248010cf9b53e30c1a8d31640dc3b24d25c4da
-Size (php-7.4.1.tar.xz) = 10245600 bytes
+SHA1 (php-7.4.2.tar.xz) = 5267cfa7164f37228f23f96b4f048f0ba8f5c741
+RMD160 (php-7.4.2.tar.xz) = cec26ddb5de3517ff492e4211e306638da163fa2
+SHA512 (php-7.4.2.tar.xz) = e8d4b300d71e48a740b4cd96bf100206615a352bf77822dfe4a289b93738e3419f1371f2b1ec2eb9c9c4b9c87eac69c866a4c51a821e0f5b07a2fa3b0eb8d89b
+Size (php-7.4.2.tar.xz) = 10252304 bytes
 SHA1 (patch-configure) = 5e9c9c06f6d819d5ba2832d648f41363f40f3108
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd