From nobody Tue Dec 3 15:50:09 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 4Y2lTt0Gnzz5gJlN; Tue, 03 Dec 2024 15:50:10 +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 4Y2lTs6pb0z4HQQ; Tue, 3 Dec 2024 15:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733241010; 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=M3e6isMvRUSFuhCyMB3rc7u+i5nZlATJQz0ILP87tdk=; b=QC6Vukfy1YSy0iFHDtNVRSvbo38Pyj/XcpVQ8hepJ0kPKZ/Q9UutsqqzCEkJDS8EhuDGxr gDeqWTaiC2YWM/zznjELRGWXZ3LybekBeViHPZbfe0mUX8mXZOJgEAAR2Ss4Py2n40k8yt ngiXv16wdrLbUxBNFq6ZMdI8qCDjKBH/96ykIawj5I58LInInH9PQKs3NCfDsaR9UwuokV 9WkIH8Xckg6jne+Yvrgfk4Sqzk4YM/Zrw8xfzgtnob11er+sqfcMaY7JNJo/47K6c/vZe1 T/m2TALPhzlVACwdHBCCzDLpUAQSrpJRdhjsNVxrq3qGaf72qVE8rxw8y2prMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733241010; 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=M3e6isMvRUSFuhCyMB3rc7u+i5nZlATJQz0ILP87tdk=; b=BUKuwQjaj1gVr9o+ZwkulqzMNb5fzeENxYlvwVkoXeMFKxDXM4QkyoafqPX5jOr+qeLPyH Y91NNDohelJDSK/uLRthMt5WepzJCD9ryZ5LhAsL3uxqLbUnAJUb+qn5m9FosHkb/0iIXE t08GTXfqT3izvZynMHZF/CodMSXtez0JA0nBk9qZ6kvD6WZ1ZjwKwh11xXXQNWEieYTYaZ JITU2hWXQtBZcLHr6NFXaoIfAvLRTXqUQaE4R7b7ccMHurd3d2AkneKhaDWVjvT14SSZQD Shu5E03tGxydhD0W8iW15RuselIYgzjuHUzBXzKL7TF4Ur4wH1jBIJfc9DohpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733241010; a=rsa-sha256; cv=none; b=gc6k+85DBqw6mpJJknpBExl/U0G5O8pQbLNfMF63Sp6bjOtxnvK1irKQQJlsWKvSjRUbpy mcL/VSwDtGv4Dg3RYcdB+smdMaaO9Ii5+4fD+qAm/r0zZpeHKY2Qc7UFTO197DV6A8zaie 2zaLzj5D5Hm1PlFydI2uWsjrCE3ZQ6DJY8p6QrsZdNjw2t1gn0XiV40ZFeO/hUbpmhz0zq b+dIJX+1tfVIniodBgEP42roWTxw7tT4cWwdoKSoQdPuptbvJmLmEIiVQQKjvt+yhYLOEa 1ej2cy6srjA0rrny1jeu47koH/Bq4x2F4x89GGPZPAemj+AxsiYkRdevXynOVQ== 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 4Y2lTs6PsYzT3j; Tue, 3 Dec 2024 15:50:09 +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 4B3Fo9jx082829; Tue, 3 Dec 2024 15:50:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B3Fo9HH082823; Tue, 3 Dec 2024 15:50:09 GMT (envelope-from git) Date: Tue, 3 Dec 2024 15:50:09 GMT Message-Id: <202412031550.4B3Fo9HH082823@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Gmelin Subject: git: 4512883f38bd - main - devel/phabricator: Fix phpmailer with PHP 8 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: grembo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4512883f38bd8038bde15205df4afb841957a140 Auto-Submitted: auto-generated The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=4512883f38bd8038bde15205df4afb841957a140 commit 4512883f38bd8038bde15205df4afb841957a140 Author: Michael Gmelin AuthorDate: 2024-12-03 15:47:54 +0000 Commit: Michael Gmelin CommitDate: 2024-12-03 15:47:54 +0000 devel/phabricator: Fix phpmailer with PHP 8 PR: 280512 Reported by: Ivan Rozhuk --- devel/phabricator/Makefile | 5 +++-- ...atch-externals_phpmailer_class.phpmailer-lite.php | 11 +++++++++++ .../patch-externals_phpmailer_class.phpmailer.php | 11 +++++++++++ .../files/patch-externals_phpmailer_class.smtp.php | 20 ++++++++++++++++++++ 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile index 6c80d8ef0e85..10288310a0b7 100644 --- a/devel/phabricator/Makefile +++ b/devel/phabricator/Makefile @@ -1,6 +1,6 @@ PORTNAME= phabricator PORTVERSION= 20211218 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} @@ -14,8 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= arcanist-lib${PHP_PKGNAMESUFFIX}>=20210113_4:devel/arcanist-lib@${PHP_FLAVOR} \ git:devel/git -USES= cpe php:cli,flavors shebangfix +USES= cpe dos2unix php:cli,flavors shebangfix CPE_VENDOR= phacility +DOS2UNIX_FILES= externals/phpmailer/class.smtp.php externals/phpqrcode/phpqrcode.php USE_GITHUB= yes GH_ACCOUNT= phacility GH_TAGNAME= dec9522 diff --git a/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer-lite.php b/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer-lite.php new file mode 100644 index 000000000000..ec552a49b104 --- /dev/null +++ b/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer-lite.php @@ -0,0 +1,11 @@ +--- externals/phpmailer/class.phpmailer-lite.php.orig 2024-12-03 14:44:25 UTC ++++ externals/phpmailer/class.phpmailer-lite.php +@@ -1492,7 +1492,7 @@ class PHPMailerLite { + $eol = "\r\n"; + $escape = '='; + $output = ''; +- while( list(, $line) = each($lines) ) { ++ foreach ($lines as $line) { + $linlen = strlen($line); + $newline = ''; + for($i = 0; $i < $linlen; $i++) { diff --git a/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer.php b/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer.php new file mode 100644 index 000000000000..eed5581a6b8f --- /dev/null +++ b/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer.php @@ -0,0 +1,11 @@ +--- externals/phpmailer/class.phpmailer.php.orig 2024-12-03 14:44:25 UTC ++++ externals/phpmailer/class.phpmailer.php +@@ -1624,7 +1624,7 @@ class PHPMailer { + $eol = "\r\n"; + $escape = '='; + $output = ''; +- while( list(, $line) = each($lines) ) { ++ foreach ($lines as $line) { + $linlen = strlen($line); + $newline = ''; + for($i = 0; $i < $linlen; $i++) { diff --git a/devel/phabricator/files/patch-externals_phpmailer_class.smtp.php b/devel/phabricator/files/patch-externals_phpmailer_class.smtp.php new file mode 100644 index 000000000000..69047be742ef --- /dev/null +++ b/devel/phabricator/files/patch-externals_phpmailer_class.smtp.php @@ -0,0 +1,20 @@ +--- externals/phpmailer/class.smtp.php.orig 2024-12-03 14:44:25 UTC ++++ externals/phpmailer/class.smtp.php +@@ -385,7 +385,7 @@ class SMTP { + + $max_line_length = 998; // used below; set here for ease in change + +- while(list(,$line) = @each($lines)) { ++ foreach($lines as $line) { + $lines_out = null; + if($line == "" && $in_headers) { + $in_headers = false; +@@ -414,7 +414,7 @@ class SMTP { + $lines_out[] = $line; + + // send the lines to the server +- while(list(,$line_out) = @each($lines_out)) { ++ foreach($lines_out as $line_out) { + if(strlen($line_out) > 0) + { + if(substr($line_out, 0, 1) == ".") {