diff options
| author | ale <ale@FreeBSD.org> | 2009-07-30 20:40:39 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2009-07-30 20:40:39 +0800 |
| commit | 7c5133d417a69697e3279de1a25ec3b6ba87f505 (patch) | |
| tree | fa9cd8078694ef58caf5cb31f6b398ef16149f6b /mail/roundcube | |
| parent | 9fd20f03884f4d84a72b65ee54f395273c21083e (diff) | |
| download | freebsd-ports-graphics-7c5133d417a69697e3279de1a25ec3b6ba87f505.tar.gz freebsd-ports-graphics-7c5133d417a69697e3279de1a25ec3b6ba87f505.tar.zst freebsd-ports-graphics-7c5133d417a69697e3279de1a25ec3b6ba87f505.zip | |
Fix parsing malformed attachments.
Diffstat (limited to 'mail/roundcube')
| -rw-r--r-- | mail/roundcube/Makefile | 2 | ||||
| -rw-r--r-- | mail/roundcube/files/patch-program_include_rcube_message.php | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile index a6eb1ee4043..9938f9c5cf5 100644 --- a/mail/roundcube/Makefile +++ b/mail/roundcube/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: @${RM} ${WRKSRC}/bin/*.sh - @${RM} ${WRKSRC}/config/main.inc.php.dist.orig + @${FIND} ${WRKSRC} -name \*.orig -type f -delete .if defined(WITH_AUTOCOMP) @${REINPLACE_CMD} "s/ autocomplete=\"off\"//g" \ ${WRKSRC}/skins/default/templates/login.html diff --git a/mail/roundcube/files/patch-program_include_rcube_message.php b/mail/roundcube/files/patch-program_include_rcube_message.php new file mode 100644 index 00000000000..d35f8801433 --- /dev/null +++ b/mail/roundcube/files/patch-program_include_rcube_message.php @@ -0,0 +1,11 @@ +--- ./program/include/rcube_message.php.orig 2009-07-30 14:35:17.000000000 +0200 ++++ ./program/include/rcube_message.php 2009-07-30 14:35:35.000000000 +0200 +@@ -373,7 +373,7 @@ + + // part is file/attachment + else if ($mail_part->disposition == 'attachment' || $mail_part->disposition == 'inline' || +- $mail_part->headers['content-id'] || (empty($mail_part->disposition) && $mail_part->filename)) { ++ $mail_part->headers['content-id'] || $mail_part->filename) { + // skip apple resource forks + if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') + continue; |