Attachment #228929 for bug #259347

View | Details | Raw Unified | Return to bug 259347
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/mail/roundcube/Makefile (-3 / +1 lines)
1	PORTNAME= roundcube	1	PORTNAME= roundcube
2	DISTVERSION= 1.4.11	2	DISTVERSION= 1.5.0
3	PORTREVISION= 1
4	PORTEPOCH= 1	3	PORTEPOCH= 1
5	CATEGORIES?= mail www	4	CATEGORIES?= mail www
6	MASTER_SITES= https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/	5	MASTER_SITES= https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/
Lines 27-33 CPE_PRODUCT= webmail Link Here
27	CPE_VENDOR= roundcube	26	CPE_VENDOR= roundcube
28		27
29	USE_PHP= pcre mbstring session iconv dom xml json intl zip filter openssl fileinfo exif ctype	28	USE_PHP= pcre mbstring session iconv dom xml json intl zip filter openssl fileinfo exif ctype
30	IGNORE_WITH_PHP=80
31		29
32	OPTIONS_DEFINE= LDAP GD PSPELL NSC DOCS EXAMPLES	30	OPTIONS_DEFINE= LDAP GD PSPELL NSC DOCS EXAMPLES
33	OPTIONS_MULTI= DB	31	OPTIONS_MULTI= DB

Lines 1-3 Link Here

(-)b/mail/roundcube/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1613048846	1	TIMESTAMP = 1634841365
2	SHA256 (roundcubemail-1.4.11-complete.tar.gz) = ac7319070c305fc2c88c7723605562d8607030732beee931cdb4091cf05e69b7	2	SHA256 (roundcubemail-1.5.0-complete.tar.gz) = 2fdc7b1663e5e99706bff34093aa4731d4bf22a58cb555a2520ed1bde78d012c
3	SIZE (roundcubemail-1.4.11-complete.tar.gz) = 7048262	3	SIZE (roundcubemail-1.5.0-complete.tar.gz) = 7802014




--- 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 &&
-                    ($mail_part->filename &&
-                        (empty($mail_part->disposition) || preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
+                    || $mail_part->filename
                 ) {
                     // skip apple resource forks
                     if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') {

Return to bug 259347

Lines 1-13 Link Here

(-)b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php (-10 / +9 lines)
1	--- program/lib/Roundcube/rcube_message.php.orig 2017-06-26 20:56:48.000000000 +0200	1	--- program/lib/Roundcube/rcube_message.php.orig 2021-10-17 20:38:04 UTC
2	+++ program/lib/Roundcube/rcube_message.php 2017-06-30 10:20:36.889381000 +0200	2	+++ program/lib/Roundcube/rcube_message.php
3	@@ -830,9 +830,7 @@ class rcube_message	3	@@ -910,8 +910,7 @@ class rcube_message
4	}	4	else if (
5	// part is a file/attachment	5	preg_match('/^(inline\|attach)/', $mail_part->disposition)
6	else if (preg_match('/^(inline\|attach)/', $mail_part->disposition) \|\|	6	\|\| $mail_part->headers['content-id']
7	- $mail_part->headers['content-id'] \|\|	7	- \|\| ($mail_part->filename &&
8	- ($mail_part->filename &&
9	- (empty($mail_part->disposition) \|\| preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))	8	- (empty($mail_part->disposition) \|\| preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
10	+ $mail_part->headers['content-id'] \|\| $mail_part->filename	9	+ \|\| $mail_part->filename
11	) {	10	) {
12	// skip apple resource forks	11	// skip apple resource forks
13	if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')	12	if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') {