Pullup ticket #6076 - requested by taca

lang/php73: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.270,1.272
- lang/php73/Makefile                                           1.6
- lang/php73/Makefile.php                                       1.2
- lang/php73/distinfo                                           1.12-1.13

---
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Wed Oct  2 14:08:05 UTC 2019

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

   Log Message:
   lang/php73: update to 7.3.10

   Update lang/php73 to 7.3.10.

   pkgsrc changes

   * Clean two pkglint's warnings.

   26 Sep 2019, PHP 7.3.10

   - Core:
     . Fixed bug #78220 (Can't access OneDrive folder). (cmb, ab)
     . Fixed bug #77922 (Double release of doc comment on inherited shadow
       property). (Nikita)
     . Fixed bug #78441 (Parse error due to heredoc identifier followed by digit).
       (cmb)
     . Fixed bug #77812 (Interactive mode does not support PHP 7.3-style heredoc).
       (cmb, Nikita)

   - FastCGI:
     . Fixed bug #78469 (FastCGI on_accept hook is not called when using named
       pipes on Windows). (Sergei Turchanov)

   - FPM:
     . Fixed bug #78334 (fpm log prefix message includes wrong stdout/stderr
       notation). (Tsuyoshi Sadakata)

   - Intl:
     . Ensure IDNA2003 rules are used with idn_to_ascii() and idn_to_utf8()
       when requested. (Sara)

   - MBString:
     . Fixed bug #78559 (Heap buffer overflow in mb_eregi). (cmb)

   - MySQLnd:
     . Fixed connect_attr issues and added the _server_host connection attribute.
       (Qianqian Bu)

   - ODBC:
     . Fixed bug #78473 (odbc_close() closes arbitrary resources). (cmb)

   - PDO_MySQL:
     . Fixed bug #41997 (SP call yields additional empty result set). (cmb)

   - sodium:
     . Fixed bug #78510 (Partially uninitialized buffer returned by
       sodium_crypto_generichash_init()). (Frank Denis, cmb)

---
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Fri Oct 25 02:57:04 UTC 2019

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

   Log Message:
   lang/php73: update to 7.3.11

   Update php73 to 7.3.11.

   24 Oct 2019, PHP 7.3.11

   - Core:
     . Fixed bug #78535 (auto_detect_line_endings value not parsed as bool).
       (bugreportuser)
     . Fixed bug #78620 (Out of memory error). (cmb, Nikita)

   - Exif :
     . Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
           (Kalle)

   - FPM:
     . Fixed bug #78599 (env_path_info underflow in fpm_main.c can lead to RCE).
       (CVE-2019-11043) (Jakub Zelenka)
     . Fixed bug #78413 (request_terminate_timeout does not take effect after
       fastcgi_finish_request). (Sergei Turchanov)

   - MBString:
     . Fixed bug #78633 (Heap buffer overflow (read) in mb_eregi). (cmb)
     . Fixed bug #78579 (mb_decode_numericentity: args number inconsistency).
       (cmb)
     . Fixed bug #78609 (mb_check_encoding() no longer supports stringable
       objects). (cmb)

   - MySQLi:
     . Fixed bug #76809 (SSL settings aren't respected when persistent connections
       are used). (fabiomsouto)

   - Mysqlnd:
     . Fixed bug #78525 (Memory leak in pdo when reusing native prepared
       statements). (Nikita)

   - PCRE:
     . Fixed bug #78272 (calling preg_match() before pcntl_fork() will freeze
       child process). (Nikita)

   - PDO_MySQL:
     . Fixed bug #78623 (Regression caused by "SP call yields additional empty
       result set"). (cmb)

   - Session:
     . Fixed bug #78624 (session_gc return value for user defined session
       handlers). (bshaffer)

   - Standard:
     . Fixed bug #76342 (file_get_contents waits twice specified timeout).
       (Thomas Calvet)
     . Fixed bug #78612 (strtr leaks memory when integer keys are used and the
       subject string shorter). (Nikita)
     . Fixed bug #76859 (stream_get_line skips data if used with data-generating
       filter). (kkopachev)

   - Zip:
     . Fixed bug #78641 (addGlob can modify given remove_path value). (cmb)

4 files changed, 9 insertions, 11 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 5c5771717c2..eac37b2974d 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.268.2.1 2019/10/25 11:10:20 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.268.2.2 2019/10/25 11:59:44 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
 PHP71_VERSION=	7.1.32
 PHP72_VERSION=	7.2.24
-PHP73_VERSION=	7.3.9
+PHP73_VERSION=	7.3.11
 
 # Define initial release of major version.
 PHP56_RELDATE=	20140828
diff --git a/lang/php73/Makefile b/lang/php73/Makefile
index baf37ece10d..9865672446c 100644
--- a/lang/php73/Makefile
+++ b/lang/php73/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2019/07/03 07:30:50 nia Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2019/10/25 11:59:44 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=		php-${PHP_VERSION:S/RC/rc/}
 
-HOMEPAGE=		https://www.php.net/
 COMMENT=		PHP Hypertext Preprocessor version 7.3
 LICENSE=		php
 
diff --git a/lang/php73/Makefile.php b/lang/php73/Makefile.php
index d15e08f5be9..03bc6af1966 100644
--- a/lang/php73/Makefile.php
+++ b/lang/php73/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.1 2018/12/15 17:12:44 taca Exp $
+# $NetBSD: Makefile.php,v 1.1.8.1 2019/10/25 11:59:44 bsiegert Exp $
 # used by lang/php73/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -86,7 +86,6 @@ CONFIGURE_ARGS+=	--enable-maintainer-zts
 .endif
 
 .if !empty(PKG_OPTIONS:Mreadline)
-USE_GNU_READLINE=	yes
 .include "../../devel/readline/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 .else
diff --git a/lang/php73/distinfo b/lang/php73/distinfo
index 669899ec62e..fcb92077598 100644
--- a/lang/php73/distinfo
+++ b/lang/php73/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2019/09/01 13:03:17 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2019/10/25 11:59:44 bsiegert Exp $
 
-SHA1 (php-7.3.9.tar.bz2) = d8d75fee3bed961f26e1beb8144ebb064fdc2ca4
-RMD160 (php-7.3.9.tar.bz2) = 1dff6e84af9cad3d505aee87e562416f57b26d55
-SHA512 (php-7.3.9.tar.bz2) = a46beb28a91f7ee99f37215ddf5f65ab1743373ba98a703ed45615625ee6b4cbda1be8495901da54089f7cb285a6ac21773a29d32871e0a9540c43b57ea41b97
-Size (php-7.3.9.tar.bz2) = 14947152 bytes
+SHA1 (php-7.3.11.tar.bz2) = 01f6747706b6c33983e558acb733c87d3a39b557
+RMD160 (php-7.3.11.tar.bz2) = a48e8604393b96b98b3bcb673768d2bf21d7b0ec
+SHA512 (php-7.3.11.tar.bz2) = 287d79953148fef5194502f0895faf7482202200e79366e65e0569dfb38efd9bb180555b9f31f180e5c0c679254396d00bb924f895cd5641868838319956b679
+Size (php-7.3.11.tar.bz2) = 14988439 bytes
 SHA1 (patch-configure) = 08b80528ba90c705398e8841c232382663479a3b
 SHA1 (patch-disable-filter-url) = d7e450380b584e01e2f01e9c91c864d01991cdbf
 SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335