From d01595ce2d81ff92eae16488491f1e9a9eb293ec Mon Sep 17 00:00:00 2001 From: Torsten Zuehlsdorff Date: Sun, 10 Jan 2021 21:02:28 +0000 Subject: [PATCH] MFH: r560906 lang/php74: Upgrade from 7.4.13 to 7.4.14 Core: Fixed bug #74558 (Can't rebind closure returned by Closure::fromCallable()). Fixed bug #80345 (PHPIZE configuration has outdated PHP_RELEASE_VERSION). Fixed bug #72964 (White space not unfolded for CC/Bcc headers). Fixed bug #80362 (Running dtrace scripts can cause php to crash). Fixed bug #80393 (Build of PHP extension fails due to configuration gap with libtool). Fixed bug #80402 (configure filtering out -lpthread). Fixed bug #77069 (stream filter loses final block of data). Fileinfo: Fixed bug #77961 (finfo_open crafted magic parsing SIGABRT). FPM: Fixed bug #69625 (FPM returns 200 status on request without SCRIPT_FILENAME env). Intl: Fixed bug #80425 (MessageFormatAdapter::getArgTypeList redefined). OpenSSL: Fixed bug #80368 (OpenSSL extension fails to build against LibreSSL due to lack of OCB support). Phar: Fixed bug #73809 (Phar Zip parse crash - mmap fail). Fixed bug #75102 (`PharData` says invalid checksum for valid tar). Fixed bug #77322 (PharData::addEmptyDir('/') Possible integer overflow). PDO MySQL: Fixed bug #80458 (PDOStatement::fetchAll() throws for upsert queries). Fixed bug #63185 (nextRowset() ignores MySQL errors with native prepared statements). Fixed bug #78152 (PDO::exec() - Bad error handling with multiple commands). Fixed bug #70066 (Unexpected "Cannot execute queries while other unbuffered queries"). Fixed bug #71145 (Multiple statements in init command triggers unbuffered query error). Fixed bug #76815 (PDOStatement cannot be GCed/closeCursor-ed when a PROCEDURE resultset SIGNAL). Standard: Fixed bug #77423 (FILTER_VALIDATE_URL accepts URLs with invalid userinfo). (CVE-2020-7071) Fixed bug #80366 (Return Value of zend_fstat() not Checked). Fixed bug #80411 (References to null-serialized object break serialize()). Tidy: Fixed bug #77594 (ob_tidyhandler is never reset). Zlib: Fixed #48725 (Support for flushing in zlib stream). PR: 252509 Submitted by: --- lang/php74/Makefile | 4 ++-- lang/php74/distinfo | 6 +++--- security/php74-openssl/files/patch-openssl.c | 11 ----------- 3 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 security/php74-openssl/files/patch-openssl.c diff --git a/lang/php74/Makefile b/lang/php74/Makefile index 74a607744cf6..03fd77184a46 100644 --- a/lang/php74/Makefile +++ b/lang/php74/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= php74 -DISTVERSION= 7.4.13 -PORTREVISION?= 2 +DISTVERSION= 7.4.14 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${DISTVERSION} diff --git a/lang/php74/distinfo b/lang/php74/distinfo index 31f9cb837159..460fd9d5d1a8 100644 --- a/lang/php74/distinfo +++ b/lang/php74/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606917205 -SHA256 (php-7.4.13.tar.xz) = aead303e3abac23106529560547baebbedba0bb2943b91d5aa08fff1f41680f4 -SIZE (php-7.4.13.tar.xz) = 10319848 +TIMESTAMP = 1610219227 +SHA256 (php-7.4.14.tar.xz) = f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 +SIZE (php-7.4.14.tar.xz) = 10326868 diff --git a/security/php74-openssl/files/patch-openssl.c b/security/php74-openssl/files/patch-openssl.c deleted file mode 100644 index 4e2489a03ed1..000000000000 --- a/security/php74-openssl/files/patch-openssl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- openssl.c.orig 2020-12-04 10:00:27.778868000 +0000 -+++ openssl.c 2020-12-04 10:01:36.820415000 +0000 -@@ -6496,7 +6496,7 @@ - int cipher_mode = EVP_CIPHER_mode(cipher_type); - memset(mode, 0, sizeof(struct php_openssl_cipher_mode)); - switch (cipher_mode) { --#if PHP_OPENSSL_API_VERSION >= 0x10100 -+#ifdef EVP_CIPH_OCB_MODE - case EVP_CIPH_GCM_MODE: - case EVP_CIPH_OCB_MODE: - case EVP_CIPH_CCM_MODE: