Attachment 252372 Details for Bug 280512 – patch

[patch] patch

c6c6ed5742.patch (text/plain), 3.83 KB, created by Ivan Rozhuk on 2024-07-30 15:57:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2024-07-30 15:57:54 UTC

Size: 3.83 KB

patch

obsolete

>From c6c6ed5742727e95d6f93bd1f7a92afc2078bb72 Mon Sep 17 00:00:00 2001
>From: Rozhuk Ivan <rozhuk.im@gmail.com>
>Date: Tue, 30 Jul 2024 18:51:03 +0300
>Subject: [PATCH] devel/phabricator: fix PHPMailer for PHP 8+
>
>---
> devel/phabricator/Makefile                    |  4 ++--
> ...ternals_phpmailer_class.phpmailer-lite.php | 11 ++++++++++
> ...ch-externals_phpmailer_class.phpmailer.php | 11 ++++++++++
> .../patch-externals_phpmailer_class.smtp.php  | 20 +++++++++++++++++++
> 4 files changed, 44 insertions(+), 2 deletions(-)
> create mode 100644 devel/phabricator/files/patch-externals_phpmailer_class.phpmailer-lite.php
> create mode 100644 devel/phabricator/files/patch-externals_phpmailer_class.phpmailer.php
> create mode 100644 devel/phabricator/files/patch-externals_phpmailer_class.smtp.php
>
>diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile
>index 6c80d8ef0e85..2d64271a12cd 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,7 +14,7 @@ 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
> USE_GITHUB=	yes
> GH_ACCOUNT=	phacility
>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..cf0d173533f2
>--- /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-07-30 15:40:58 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 $i => $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..acee5e144d98
>--- /dev/null
>+++ b/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer.php
>@@ -0,0 +1,11 @@
>+--- externals/phpmailer/class.phpmailer.php.orig	2024-07-30 15:40:58 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 $i => $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..2dea199c3767
>--- /dev/null
>+++ b/devel/phabricator/files/patch-externals_phpmailer_class.smtp.php
>@@ -0,0 +1,20 @@
>+--- externals/phpmailer/class.smtp.php.orig	2024-07-30 15:40:58 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 $i => $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 $i => $line_out) {
>+         if(strlen($line_out) > 0)
>+         {
>+           if(substr($line_out, 0, 1) == ".") {

Actions: View | Diff

Attachments on bug 280512: 252371 | 252372 | 252379