diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2021-10-22 15:02:02 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2021-10-22 15:03:04 +0000 |
| commit | af7ede723ad6ee0447b27300dd3a0d043deb4472 (patch) | |
| tree | f94fa1b8d85dca6603d0f584c98a3889890df826 | |
| parent | eb8ddc4ec15c032a275ee4d4dad861db1388b69a (diff) | |
| download | ports-af7ede723ad6ee0447b27300dd3a0d043deb4472.tar.gz ports-af7ede723ad6ee0447b27300dd3a0d043deb4472.zip | |
mail/roundcube: update to 1.5.0 release and add php8 support
PR: 259347
Submitted by: brnrd
| -rw-r--r-- | mail/roundcube/Makefile | 4 | ||||
| -rw-r--r-- | mail/roundcube/distinfo | 6 | ||||
| -rw-r--r-- | mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php | 19 |
3 files changed, 13 insertions, 16 deletions
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..c15d2dc1e6b0 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 = 1634624815 +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..081df4ae93da 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-19 08:32:55.709205000 +0200 ++++ program/lib/Roundcube/rcube_message.php 2021-10-19 08:34:30.613574000 +0200 +@@ -910,8 +910,7 @@ + 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') { |