From nobody Sat Nov 20 19:32:37 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DFE24189C055; Sat, 20 Nov 2021 19:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HxNwP5GxYz3LvG; Sat, 20 Nov 2021 19:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9310321C86; Sat, 20 Nov 2021 19:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AKJWbsd057157; Sat, 20 Nov 2021 19:32:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AKJWbk9057156; Sat, 20 Nov 2021 19:32:37 GMT (envelope-from git) Date: Sat, 20 Nov 2021 19:32:37 GMT Message-Id: <202111201932.1AKJWbk9057156@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Torsten Zuehlsdorff Subject: git: d2b83425d582 - 2021Q4 - lang/php74: Upgrade from 7.4.25 to 7.4.26 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tz X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: d2b83425d5824041c4d1f609e8a8ebec765e0def Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tz: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2b83425d5824041c4d1f609e8a8ebec765e0def commit d2b83425d5824041c4d1f609e8a8ebec765e0def Author: Torsten Zuehlsdorff AuthorDate: 2021-11-20 19:27:05 +0000 Commit: Torsten Zuehlsdorff CommitDate: 2021-11-20 19:32:18 +0000 lang/php74: Upgrade from 7.4.25 to 7.4.26 Core: Fixed bug #81518 (Header injection via default_mimetype / default_charset). Date: Fixed bug #81500 (Interval serialization regression since 7.3.14 / 7.4.2). MBString: Fixed bug #76167 (mbstring may use pointer from some previous request). MySQLi: Fixed bug #81494 (Stopped unbuffered query does not throw error). PCRE: Fixed bug #81424 (PCRE2 10.35 JIT performance regression). Streams: Fixed bug #54340 (Memory corruption with user_filter). XML: Fixed bug #79971 (special character is breaking the path in xml function). (CVE-2021-21707) Also include a patch to fix issue 259725: dns_get_record fails when requested record doesn't exist PR: 259725 Reported by: fsbruva@yahoo.com Sponsored by: Bounce Experts (cherry picked from commit 11d48ddebb9c0951afead066cdb578270182010a) --- lang/php74/Makefile | 2 +- lang/php74/distinfo | 6 +++--- lang/php74/files/patch-ext_standard_dns.c | 21 +++++++++++++++++++++ lang/php74/files/patch-ext_standard_php__dns.h | 24 ++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/lang/php74/Makefile b/lang/php74/Makefile index a415b7b2a151..b5b337cc73f2 100644 --- a/lang/php74/Makefile +++ b/lang/php74/Makefile @@ -1,5 +1,5 @@ PORTNAME= php74 -DISTVERSION= 7.4.25 +DISTVERSION= 7.4.26 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions diff --git a/lang/php74/distinfo b/lang/php74/distinfo index 761533b3c767..0c166044ea81 100644 --- a/lang/php74/distinfo +++ b/lang/php74/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635020178 -SHA256 (php-7.4.25.tar.xz) = 12a758f1d7fee544387a28d3cf73226f47e3a52fb3049f07fcc37d156d393c0a -SIZE (php-7.4.25.tar.xz) = 10376304 +TIMESTAMP = 1637348951 +SHA256 (php-7.4.26.tar.xz) = e305b3aafdc85fa73a81c53d3ce30578bc94d1633ec376add193a1e85e0f0ef8 +SIZE (php-7.4.26.tar.xz) = 10420236 diff --git a/lang/php74/files/patch-ext_standard_dns.c b/lang/php74/files/patch-ext_standard_dns.c new file mode 100644 index 000000000000..19e539a41b1e --- /dev/null +++ b/lang/php74/files/patch-ext_standard_dns.c @@ -0,0 +1,21 @@ +--- ext/standard/dns.c.orig 2021-10-19 15:18:17 UTC ++++ ext/standard/dns.c +@@ -808,6 +808,7 @@ PHP_FUNCTION(dns_get_record) + zend_long type_param = PHP_DNS_ANY; + zval *authns = NULL, *addtl = NULL; + int type_to_fetch; ++ int dns_errno; + #if defined(HAVE_DNS_SEARCH) + struct sockaddr_storage from; + uint32_t fromsize = sizeof(from); +@@ -957,8 +958,9 @@ PHP_FUNCTION(dns_get_record) + n = php_dns_search(handle, hostname, C_IN, type_to_fetch, answer.qb2, sizeof answer); + + if (n < 0) { ++ dns_errno = php_dns_errno(handle); + php_dns_free_handle(handle); +- switch (h_errno) { ++ switch (dns_errno) { + case NO_DATA: + case HOST_NOT_FOUND: + continue; diff --git a/lang/php74/files/patch-ext_standard_php__dns.h b/lang/php74/files/patch-ext_standard_php__dns.h new file mode 100644 index 000000000000..4fadb68eda60 --- /dev/null +++ b/lang/php74/files/patch-ext_standard_php__dns.h @@ -0,0 +1,24 @@ +--- ext/standard/php_dns.h.orig 2021-10-19 15:18:17 UTC ++++ ext/standard/php_dns.h +@@ -26,6 +26,7 @@ + ((int)dns_search(res, dname, class, type, (char *) answer, anslen, (struct sockaddr *)&from, &fromsize)) + #define php_dns_free_handle(res) \ + dns_free(res) ++#define php_dns_errno(handle) h_errno + + #elif defined(HAVE_RES_NSEARCH) + #define php_dns_search(res, dname, class, type, answer, anslen) \ +@@ -39,11 +40,13 @@ + res_nclose(res); \ + php_dns_free_res(res) + #endif ++#define php_dns_errno(handle) handle->res_h_errno + + #elif defined(HAVE_RES_SEARCH) + #define php_dns_search(res, dname, class, type, answer, anslen) \ + res_search(dname, class, type, answer, anslen) + #define php_dns_free_handle(res) /* noop */ ++#define php_dns_errno(handle) h_errno + + #endif +