cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix update to Roundcube 0.8.5, rolling in previous patches

Browse Source
This commit is contained in:
sthen 2013-01-26 14:36:16 +00:00
parent 73ddbb1ef4
commit abcbbf6f92
7 changed files with 10 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/roundcubemail/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.60 2013/01/03 20:05:15 sthen Exp $
# $OpenBSD: Makefile,v 1.61 2013/01/26 14:36:16 sthen Exp $
COMMENT= imap4 webmail client
DISTNAME= roundcubemail-0.8.4
REVISION= 0
DISTNAME= roundcubemail-0.8.5
CATEGORIES= mail www
HOMEPAGE= http://www.roundcube.net/

4
mail/roundcubemail/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (roundcubemail-0.8.4.tar.gz) = n1Kg9K1p3y2pY2MErDwHKhP72hl+fPvJijUW3aD9wjQ=
SIZE (roundcubemail-0.8.4.tar.gz) = 3723638
SHA256 (roundcubemail-0.8.5.tar.gz) = zTXXyMeIavfShT3dCXDFe12wN9x1dkeFinqQbYdOmCQ=
SIZE (roundcubemail-0.8.5.tar.gz) = 3724025

15
mail/roundcubemail/patches/patch-config_main_inc_php_dist
View File

@ -1,15 +1,6 @@
$OpenBSD: patch-config_main_inc_php_dist,v 1.18 2012/10/07 11:15:44 sthen Exp $
--- config/main.inc.php.dist.orig Fri Oct 5 18:14:22 2012
+++ config/main.inc.php.dist Sun Oct 7 10:47:37 2012
@@ -356,7 +356,7 @@ $rcmail_config['identities_level'] = 0;
$rcmail_config['client_mimetypes'] = null; # null == default
// mime magic database
-$rcmail_config['mime_magic'] = '/usr/share/misc/magic';
+$rcmail_config['mime_magic'] = '../conf/magic';
// path to imagemagick identify binary
$rcmail_config['im_identify_path'] = null;
$OpenBSD: patch-config_main_inc_php_dist,v 1.19 2013/01/26 14:36:16 sthen Exp $
--- config/main.inc.php.dist.orig Fri Jan 25 17:00:48 2013
+++ config/main.inc.php.dist Sat Jan 26 14:27:03 2013
@@ -458,7 +458,7 @@ $rcmail_config['spellcheck_dictionary'] = false;
// Set the spell checking engine. 'googie' is the default. 'pspell' is also available,

6
mail/roundcubemail/patches/patch-plugins_managesieve_config_inc_php_dist
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-plugins_managesieve_config_inc_php_dist,v 1.1 2011/10/11 22:04:28 sthen Exp $
--- plugins/managesieve/config.inc.php.dist.orig Thu Sep 8 14:23:44 2011
+++ plugins/managesieve/config.inc.php.dist Thu Sep 8 14:24:37 2011
$OpenBSD: patch-plugins_managesieve_config_inc_php_dist,v 1.2 2013/01/26 14:36:16 sthen Exp $
--- plugins/managesieve/config.inc.php.dist.orig Fri Jan 25 17:00:48 2013
+++ plugins/managesieve/config.inc.php.dist Sat Jan 26 14:27:03 2013
@@ -1,7 +1,8 @@
<?php

34
mail/roundcubemail/patches/patch-program_include_rcube_imap_php
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-program_include_rcube_imap_php,v 1.1 2013/01/03 20:05:15 sthen Exp $
77c9fd9f25 Fix cache (in)validation after setting \Deleted flag
--- program/include/rcube_imap.php.orig Wed Nov 14 20:30:28 2012
+++ program/include/rcube_imap.php Thu Jan 3 19:45:36 2013
@@ -2172,10 +2172,10 @@ class rcube_imap extends rcube_storage
$result = $this->conn->flag($folder, $uids, $flag);
}
- if ($result) {
+ if ($result && !$skip_cache) {
// reload message headers if cached
- // @TODO: update flags instead removing from cache
- if (!$skip_cache && ($mcache = $this->get_mcache_engine())) {
+ // update flags instead removing from cache
+ if ($mcache = $this->get_mcache_engine()) {
$status = strpos($flag, 'UN') !== 0;
$mflag = preg_replace('/^UN/', '', $flag);
$mcache->change_flag($folder, $all_mode ? null : explode(',', $uids),
@@ -2187,8 +2187,12 @@ class rcube_imap extends rcube_storage
$this->clear_messagecount($folder, 'SEEN');
$this->clear_messagecount($folder, 'UNSEEN');
}
- else if ($flag == 'DELETED') {
+ else if ($flag == 'DELETED' || $flag == 'UNDELETED') {
$this->clear_messagecount($folder, 'DELETED');
+ // remove cached messages
+ if ($this->options['skip_deleted']) {
+ $this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids));
+ }
}
}

15
mail/roundcubemail/patches/patch-program_lib_washtml_php
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-program_lib_washtml_php,v 1.1 2013/01/03 20:05:15 sthen Exp $
9019025222 XSS in vbscript and data:text links
--- program/lib/washtml.php.orig Wed Nov 14 20:30:27 2012
+++ program/lib/washtml.php Thu Jan 3 19:45:36 2013
@@ -214,7 +214,7 @@ class washtml
$key = strtolower($key);
$value = $node->getAttribute($key);
if (isset($this->_html_attribs[$key]) ||
- ($key == 'href' && !preg_match('!^javascript!i', $value)
+ ($key == 'href' && !preg_match('!^(javascript|vbscript|data:text)!i', $value)
&& preg_match('!^([a-z][a-z0-9.+-]+:|//|#).+!i', $value))
) {
$t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';

21
mail/roundcubemail/patches/patch-program_steps_mail_get_inc
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-program_steps_mail_get_inc,v 1.1 2013/01/03 20:05:15 sthen Exp $
4163511314 Workaround MSIE<=8 bug; content-disposition:inline ignored
if filename contains "attachment"
--- program/steps/mail/get.inc.orig Wed Nov 14 20:30:28 2012
+++ program/steps/mail/get.inc Thu Jan 3 19:45:36 2013
@@ -150,6 +150,13 @@ else if (strlen($pid = get_input_value('_part', RCUBE_
$disposition = !empty($plugin['download']) ? 'attachment' : 'inline';
+ // Workaround for nasty IE bug (#1488844)
+ // If Content-Disposition header contains string "attachment" e.g. in filename
+ // IE handles data as attachment not inline
+ if ($disposition == 'inline' && $browser->ie && $browser->ver < 9) {
+ $filename = str_ireplace('attachment', 'attach', $filename);
+ }
+
header("Content-Disposition: $disposition; filename=\"$filename\"");
// do content filtering to avoid XSS through fake images