From nobody Tue Nov 26 12:35:34 2024 X-Original-To: dev-commits-ports-main@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 4XyMVZ4wRSz5fPT2; Tue, 26 Nov 2024 12:35:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XyMVZ481fz49FD; Tue, 26 Nov 2024 12:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732624534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vKXKRS4GwmEhm55B5Qqqg+7wlzcGO5xmuJUGlCWuMvY=; b=vmB0mpjOzvZ5f9z3ODhBt5Hck4vcHyd0EiJHafabryjhyKN1UHRX3LTa1rMNB5bL96v+5h IUC3cL+ht3vkIuSYLziB3L+F6Cd77U/+TwVNmGxeFdCbxHmWeqGQP5Y+pKUI8mzhzpAdP2 Oqyb2esj/8K/w44mT8/6sWGf8g8wi8ImsBymm+6cRUBskVt+fi/0bVro5qvcKzvyzMyH0q XPMs9E5qMYkAm/AdMEnfpX9pD95L2a0zW1LUnCjrZNXMdffCRCEs5MKPX1Iaw/FMdKJVok RhAHHn7xLN/N9rPjJk8gZDlVHVOJJWH9HP78U/zp4CDKQJQ3OW0PrEu/dHLfsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732624534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vKXKRS4GwmEhm55B5Qqqg+7wlzcGO5xmuJUGlCWuMvY=; b=RYRcPZJeWMy1acS1stZQ8ySn3ZN9RUhlHSX1LvWB37H2PTJB2bUQgWujODdLplhd3bt61i o/woxldLNje55w6aYnC7HdJ5XNHmhi+wC23F0buIFaf3eqovjl1WsBU/8Zp6MgNhEkM3Lf C7ljF58GFgqM81OJzuOqtQ99gBzl69lIy96LS9nV2alFWtn0yNgSdabSww8vl+UHHBj9y4 sUUWHTIK0iBjJtRlbxV6ogkwn8Y+pBxKy/7Wtvx91T+KNfcm526Xt7h9A2QyffRRZPTRWi OAGss2BmQCTlYQMrFUUxUQPXfwcC9FFcJGiMI10IOxOGNFliGEF9Pij57995jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732624534; a=rsa-sha256; cv=none; b=P7rmVsgCkKWQae3LCI6RB0oAfAg4s4TyOBm8EdFox47+SVhUwLMG+77yezKMQDSgw/eDZY uc0wXi/Qvdl4GCZup+h7mPh3RNTA4blNB1yUaf/O7AxIH47V9oUHCiamsGzgqIZnYLyyt6 +MAQf1Fwl+vy5nf7tCEl21tI/nTnzHeknoqXs177tFRuhUJeyEw1WtKXaYyBVTOk41pCC/ 7aD13uR9JPdYhm2EhRUpjMKCAyzcP9C4dx7aktjvclFd0a/npXPS+7WS0D8fikkSZZtuvG GqFkw/sHFpSPenVLQXZtSY8TUJVAP2iHJfBRcnTeogqJfWK8pjwoPvvQ1vvy9A== 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 4XyMVZ3l1QzPmm; Tue, 26 Nov 2024 12:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AQCZYuc039380; Tue, 26 Nov 2024 12:35:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AQCZYHL039377; Tue, 26 Nov 2024 12:35:34 GMT (envelope-from git) Date: Tue, 26 Nov 2024 12:35:34 GMT Message-Id: <202411261235.4AQCZYHL039377@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: f1d4462ab885 - main - mail/snappymail: Add upstream patch to fix runtime error with PHP 8.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1d4462ab88578a5d3315b6ddcec7a31a7ecc26e Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1d4462ab88578a5d3315b6ddcec7a31a7ecc26e commit f1d4462ab88578a5d3315b6ddcec7a31a7ecc26e Author: Yasuhiro Kimura AuthorDate: 2024-11-26 11:37:08 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-11-26 12:34:13 +0000 mail/snappymail: Add upstream patch to fix runtime error with PHP 8.4 MFH: 2024Q4 --- mail/snappymail/Makefile | 1 + mail/snappymail/files/patch-php84 | 237 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 238 insertions(+) diff --git a/mail/snappymail/Makefile b/mail/snappymail/Makefile index e27fa44aec7a..9790a10ae3cb 100644 --- a/mail/snappymail/Makefile +++ b/mail/snappymail/Makefile @@ -1,5 +1,6 @@ PORTNAME= snappymail DISTVERSION= 2.38.2 +PORTREVISION= 1 CATEGORIES= mail www MASTER_SITES= https://github.com/the-djmaze/snappymail/releases/download/v${DISTVERSION}/ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/mail/snappymail/files/patch-php84 b/mail/snappymail/files/patch-php84 new file mode 100644 index 000000000000..f12297cd537c --- /dev/null +++ b/mail/snappymail/files/patch-php84 @@ -0,0 +1,237 @@ +From cd3398db20a314d8700f25b4ec62ff87301736e1 Mon Sep 17 00:00:00 2001 +From: the-djmaze <> +Date: Tue, 26 Nov 2024 01:47:34 +0100 +Subject: [PATCH] Resolve #1850 + +--- + snappymail/v/2.38.2/app/libraries/MailSo/Log/Logger.php | 4 ++-- + .../v/2.38.2/app/libraries/RainLoop/Plugins/Helper.php | 2 +- + snappymail/v/2.38.2/app/libraries/snappymail/gpg/base.php | 6 +++--- + snappymail/v/2.38.2/app/libraries/snappymail/gpg/pgp.php | 6 +++--- + snappymail/v/2.38.2/app/libraries/snappymail/gpg/smime.php | 6 +++--- + .../v/2.38.2/app/libraries/snappymail/http/request.php | 2 +- + .../v/2.38.2/app/libraries/snappymail/http/request/curl.php | 5 ++--- + .../v/2.38.2/app/libraries/snappymail/http/response.php | 2 +- + snappymail/v/2.38.2/app/libraries/snappymail/pgp/pecl.php | 6 +++--- + .../v/2.38.2/app/libraries/snappymail/pgp/pgpinterface.php | 6 +++--- + 10 files changed, 22 insertions(+), 23 deletions(-) + +diff --git snappymail/v/2.38.2/app/libraries/MailSo/Log/Logger.php snappymail/v/2.38.2/app/libraries/MailSo/Log/Logger.php +index e1cec4c16..4f48b340a 100644 +--- snappymail/v/2.38.2/app/libraries/MailSo/Log/Logger.php ++++ snappymail/v/2.38.2/app/libraries/MailSo/Log/Logger.php +@@ -150,7 +150,7 @@ class Logger extends \SplFixedArray + \E_USER_ERROR => \LOG_ERR, + \E_USER_WARNING => \LOG_WARNING, + \E_USER_NOTICE => \LOG_NOTICE, +- \E_STRICT => \LOG_CRIT, ++// \E_STRICT => \LOG_CRIT, + \E_RECOVERABLE_ERROR => \LOG_ERR, + \E_DEPRECATED => \LOG_INFO, + \E_USER_DEPRECATED => \LOG_INFO +@@ -168,7 +168,7 @@ class Logger extends \SplFixedArray + \E_USER_ERROR => '-USER', + \E_USER_WARNING => '-USER', + \E_USER_NOTICE => '-USER', +- \E_STRICT => '-STRICT', ++// \E_STRICT => '-STRICT', + \E_RECOVERABLE_ERROR => '-RECOVERABLE', + \E_DEPRECATED => '-DEPRECATED', + \E_USER_DEPRECATED => '-USER_DEPRECATED' +diff --git snappymail/v/2.38.2/app/libraries/RainLoop/Plugins/Helper.php snappymail/v/2.38.2/app/libraries/RainLoop/Plugins/Helper.php +index b4168bf80..9f85f9659 100644 +--- snappymail/v/2.38.2/app/libraries/RainLoop/Plugins/Helper.php ++++ snappymail/v/2.38.2/app/libraries/RainLoop/Plugins/Helper.php +@@ -4,7 +4,7 @@ namespace RainLoop\Plugins; + + class Helper + { +- static public function ValidateWildcardValues(string $sString, string $sWildcardValues, string &$sFoundValue = null) : bool ++ static public function ValidateWildcardValues(string $sString, string $sWildcardValues, ?string &$sFoundValue = null) : bool + { + $sFoundValue = ''; + +diff --git snappymail/v/2.38.2/app/libraries/snappymail/gpg/base.php snappymail/v/2.38.2/app/libraries/snappymail/gpg/base.php +index d94de5454..122d51ae6 100644 +--- snappymail/v/2.38.2/app/libraries/snappymail/gpg/base.php ++++ snappymail/v/2.38.2/app/libraries/snappymail/gpg/base.php +@@ -251,7 +251,7 @@ abstract class Base + /** + * Verifies a signed text + */ +- public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/ ++ public function verify(string $signed_text, string $signature, ?string &$plaintext = null) /*: array|false*/ + { + return false; + } +@@ -259,7 +259,7 @@ abstract class Base + /** + * Verifies a signed file + */ +- public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/ ++ public function verifyFile(string $filename, string $signature, ?string &$plaintext = null) /*: array|false*/ + { + return false; + } +@@ -267,7 +267,7 @@ abstract class Base + /** + * Verifies a signed file + */ +- public function verifyStream($fp, string $signature, string &$plaintext = null) /*: array|false*/ ++ public function verifyStream($fp, string $signature, ?string &$plaintext = null) /*: array|false*/ + { + return false; + } +diff --git snappymail/v/2.38.2/app/libraries/snappymail/gpg/pgp.php snappymail/v/2.38.2/app/libraries/snappymail/gpg/pgp.php +index 2815c8010..f3921112f 100644 +--- snappymail/v/2.38.2/app/libraries/snappymail/gpg/pgp.php ++++ snappymail/v/2.38.2/app/libraries/snappymail/gpg/pgp.php +@@ -739,7 +739,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface + /** + * Verifies a signed text + */ +- public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/ ++ public function verify(string $signed_text, string $signature, ?string &$plaintext = null) /*: array|false*/ + { + return $this->_verify($signed_text, $signature); + } +@@ -747,7 +747,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface + /** + * Verifies a signed file + */ +- public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/ ++ public function verifyFile(string $filename, string $signature, ?string &$plaintext = null) /*: array|false*/ + { + $fp = \fopen($filename, 'rb'); + try { +@@ -763,7 +763,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface + /** + * Verifies a signed file + */ +- public function verifyStream($fp, string $signature, string &$plaintext = null) /*: array|false*/ ++ public function verifyStream($fp, string $signature, ?string &$plaintext = null) /*: array|false*/ + { + if (!$fp || !\is_resource($fp)) { + throw new \Exception('Invalid stream resource'); +diff --git snappymail/v/2.38.2/app/libraries/snappymail/gpg/smime.php snappymail/v/2.38.2/app/libraries/snappymail/gpg/smime.php +index 203a180b0..bc66c7291 100644 +--- snappymail/v/2.38.2/app/libraries/snappymail/gpg/smime.php ++++ snappymail/v/2.38.2/app/libraries/snappymail/gpg/smime.php +@@ -589,7 +589,7 @@ class SMIME extends Base + /** + * Verifies a signed text + */ +- public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/ ++ public function verify(string $signed_text, string $signature, ?string &$plaintext = null) /*: array|false*/ + { + return $this->_verify($signed_text, $signature); + } +@@ -597,7 +597,7 @@ class SMIME extends Base + /** + * Verifies a signed file + */ +- public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/ ++ public function verifyFile(string $filename, string $signature, ?string &$plaintext = null) /*: array|false*/ + { + $fp = \fopen($filename, 'rb'); + try { +@@ -613,7 +613,7 @@ class SMIME extends Base + /** + * Verifies a signed file + */ +- public function verifyStream($fp, string $signature, string &$plaintext = null) /*: array|false*/ ++ public function verifyStream($fp, string $signature, ?string &$plaintext = null) /*: array|false*/ + { + if (!$fp || !\is_resource($fp)) { + throw new \Exception('Invalid stream resource'); +diff --git snappymail/v/2.38.2/app/libraries/snappymail/http/request.php snappymail/v/2.38.2/app/libraries/snappymail/http/request.php +index 0bdf9468e..8c1c3604a 100644 +--- snappymail/v/2.38.2/app/libraries/snappymail/http/request.php ++++ snappymail/v/2.38.2/app/libraries/snappymail/http/request.php +@@ -111,7 +111,7 @@ abstract class Request + + abstract protected function __doRequest(string &$method, string &$request_url, &$body, array $extra_headers) : Response; + +- public function doRequest($method, $request_url, $body = null, array $extra_headers = array()) : ?Response ++ public function doRequest($method, $request_url, /*string|array*/$body = null, array $extra_headers = array()) : ?Response + { + $method = \strtoupper($method); + $url = $request_url; +diff --git snappymail/v/2.38.2/app/libraries/snappymail/http/request/curl.php snappymail/v/2.38.2/app/libraries/snappymail/http/request/curl.php +index 2185d0c8f..f25fef1c0 100644 +--- snappymail/v/2.38.2/app/libraries/snappymail/http/request/curl.php ++++ snappymail/v/2.38.2/app/libraries/snappymail/http/request/curl.php +@@ -6,9 +6,8 @@ use SnappyMail\HTTP\Response; + + class CURL extends \SnappyMail\HTTP\Request + { +- private +- $response_headers = array(), +- $response_body = ''; ++ private array $response_headers = array(); ++ private string $response_body = ''; + + public function supportsSSL() : bool + { +diff --git snappymail/v/2.38.2/app/libraries/snappymail/http/response.php snappymail/v/2.38.2/app/libraries/snappymail/http/response.php +index d52624415..18411512f 100644 +--- snappymail/v/2.38.2/app/libraries/snappymail/http/response.php ++++ snappymail/v/2.38.2/app/libraries/snappymail/http/response.php +@@ -12,7 +12,7 @@ class Response + $headers = array(), # The headers returned from the final_uri + $body; # The body returned from the final_uri + +- function __construct(string $request_uri, int $status = 0, ?array $headers = null, $body = null) ++ function __construct(string $request_uri, int $status = 0, ?array $headers = null, string $body = '') + { + if ($headers) { + $name = null; +diff --git snappymail/v/2.38.2/app/libraries/snappymail/pgp/pecl.php snappymail/v/2.38.2/app/libraries/snappymail/pgp/pecl.php +index d89ba02cc..4b311d3ae 100644 +--- snappymail/v/2.38.2/app/libraries/snappymail/pgp/pecl.php ++++ snappymail/v/2.38.2/app/libraries/snappymail/pgp/pecl.php +@@ -365,7 +365,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface + /** + * Verifies a signed text + */ +- public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/ ++ public function verify(string $signed_text, string $signature, ?string &$plaintext = null) /*: array|false*/ + { + $result = $this->GnuPG->verify($signed_text, $signature ?: false, $plaintext) ?: $this->gnupgError(); + if (!$result) { +@@ -378,7 +378,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface + /** + * Verifies a signed file + */ +- public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/ ++ public function verifyFile(string $filename, string $signature, ?string &$plaintext = null) /*: array|false*/ + { + return $this->GnuPG->verify(\file_get_contents($filename), $signature, $plaintext) ?: $this->gnupgError(); + } +@@ -386,7 +386,7 @@ class PECL implements \SnappyMail\PGP\PGPInterface + /** + * Verifies a given resource + */ +- public function verifyStream(/*resource*/ $fp, string $signature, string &$plaintext = null) /*: array|false */ ++ public function verifyStream(/*resource*/ $fp, string $signature, ?string &$plaintext = null) /*: array|false */ + { + if (!$fp || !\is_resource($fp)) { + throw new \Exception('Invalid stream resource'); +diff --git snappymail/v/2.38.2/app/libraries/snappymail/pgp/pgpinterface.php snappymail/v/2.38.2/app/libraries/snappymail/pgp/pgpinterface.php +index 3a5dd2ad6..75ee2e58f 100644 +--- snappymail/v/2.38.2/app/libraries/snappymail/pgp/pgpinterface.php ++++ snappymail/v/2.38.2/app/libraries/snappymail/pgp/pgpinterface.php +@@ -39,7 +39,7 @@ interface PGPInterface + public function sign(string $plaintext) /*: string|false*/; + public function signFile(string $filename) /*: string|false*/; + public function signStream($fp, /*string|resource*/ $output = null) /*: string|false*/; +- public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/; +- public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/; +- public function verifyStream(/*resource*/ $fp, string $signature, string &$plaintext = null) /*: array|false */; ++ public function verify(string $signed_text, string $signature, ?string &$plaintext = null) /*: array|false*/; ++ public function verifyFile(string $filename, string $signature, ?string &$plaintext = null) /*: array|false*/; ++ public function verifyStream(/*resource*/ $fp, string $signature, ?string &$plaintext = null) /*: array|false */; + } +-- +2.47.1 +