Attachment 228929 Details for Bug 259347 – git diff for mail/roundcube

[patch] git diff for mail/roundcube

patch-mail_roundcube-1.5[1].0 (text/plain), 2.86 KB, created by Bernard Spil on 2021-10-21 18:55:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2021-10-21 18:55:18 UTC

Size: 2.86 KB

patch

obsolete

>diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
>index 5399b164f1f8..21bb081cd188 100644
>--- a/mail/roundcube/Makefile
>+++ b/mail/roundcube/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	roundcube
>-DISTVERSION=	1.4.11
>-PORTREVISION=	1
>+DISTVERSION=	1.5.0
> PORTEPOCH=	1
> CATEGORIES?=	mail www
> MASTER_SITES=	https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/
>@@ -27,7 +26,6 @@ CPE_PRODUCT=	webmail
> CPE_VENDOR=	roundcube
> 
> USE_PHP=	pcre mbstring session iconv dom xml json intl zip filter openssl fileinfo exif ctype
>-IGNORE_WITH_PHP=80
> 
> OPTIONS_DEFINE=	LDAP GD PSPELL NSC DOCS EXAMPLES
> OPTIONS_MULTI=	DB
>diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
>index 7457d45c1475..04eb59a2958b 100644
>--- a/mail/roundcube/distinfo
>+++ b/mail/roundcube/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1613048846
>-SHA256 (roundcubemail-1.4.11-complete.tar.gz) = ac7319070c305fc2c88c7723605562d8607030732beee931cdb4091cf05e69b7
>-SIZE (roundcubemail-1.4.11-complete.tar.gz) = 7048262
>+TIMESTAMP = 1634841365
>+SHA256 (roundcubemail-1.5.0-complete.tar.gz) = 2fdc7b1663e5e99706bff34093aa4731d4bf22a58cb555a2520ed1bde78d012c
>+SIZE (roundcubemail-1.5.0-complete.tar.gz) = 7802014
>diff --git a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
>index d260db921a29..3da662a9b855 100644
>--- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
>+++ b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
>@@ -1,13 +1,12 @@
>---- program/lib/Roundcube/rcube_message.php.orig	2017-06-26 20:56:48.000000000 +0200
>-+++ program/lib/Roundcube/rcube_message.php	2017-06-30 10:20:36.889381000 +0200
>-@@ -830,9 +830,7 @@ class rcube_message
>-                 }
>-                 // part is a file/attachment
>-                 else if (preg_match('/^(inline|attach)/', $mail_part->disposition) ||
>--                    $mail_part->headers['content-id'] ||
>--                    ($mail_part->filename &&
>+--- program/lib/Roundcube/rcube_message.php.orig	2021-10-17 20:38:04 UTC
>++++ program/lib/Roundcube/rcube_message.php
>+@@ -910,8 +910,7 @@ class rcube_message
>+                 else if (
>+                     preg_match('/^(inline|attach)/', $mail_part->disposition)
>+                     || $mail_part->headers['content-id']
>+-                    || ($mail_part->filename &&
> -                        (empty($mail_part->disposition) || preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
>-+                    $mail_part->headers['content-id'] || $mail_part->filename
>++                    || $mail_part->filename
>                  ) {
>                      // skip apple resource forks
>-                     if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
>+                     if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') {

Actions: View | Diff

Attachments on bug 259347: 228929