From b58af53d5c47a77b82e43431be5af79b430eee89 Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 22 Apr 2011 15:11:08 +0000 Subject: [PATCH] - update to 0.5.2: various bug fixes and robustness improvements, updated tinymce (compatible with ie9) - remove unnecessary patch - add a hint to roundcubemail.conf suggesting that people may need to adjust the timezone value if they have problems with invalid sessions --- mail/roundcubemail/Makefile | 7 +++---- mail/roundcubemail/distinfo | 10 +++++----- mail/roundcubemail/files/roundcubemail.conf | 4 +++- .../patches/patch-config_main_inc_php_dist | 8 ++++---- .../patches/patch-program_include_main_inc | 13 ------------- 5 files changed, 15 insertions(+), 27 deletions(-) delete mode 100644 mail/roundcubemail/patches/patch-program_include_main_inc diff --git a/mail/roundcubemail/Makefile b/mail/roundcubemail/Makefile index cec2619062a..159814c95a9 100644 --- a/mail/roundcubemail/Makefile +++ b/mail/roundcubemail/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.35 2011/03/21 14:01:41 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.36 2011/04/22 15:11:08 sthen Exp $ COMMENT = imap4 webmail client -DISTNAME = roundcubemail-0.5.1 +DISTNAME = roundcubemail-0.5.2 CATEGORIES = mail www HOMEPAGE = http://www.roundcube.net/ -REVISION = 1 - MAINTAINER = Stuart Henderson # GPLv2 @@ -31,6 +29,7 @@ RUN_DEPENDS = www/php5/core \ www/php5/extensions,-mbstring \ www/php5/extensions,-mcrypt \ www/php5/extensions,-pspell \ + sysutils/pecl-fileinfo \ php5-mysql-*|php5-pgsql-*|php5-sqlite-*:www/php5/extensions,-sqlite do-install: diff --git a/mail/roundcubemail/distinfo b/mail/roundcubemail/distinfo index 42d7e492cdb..8f6e154779f 100644 --- a/mail/roundcubemail/distinfo +++ b/mail/roundcubemail/distinfo @@ -1,5 +1,5 @@ -MD5 (roundcubemail-0.5.1.tar.gz) = 9GLUs5mRIWeewQO6LcOOjQ== -RMD160 (roundcubemail-0.5.1.tar.gz) = e31aYYVSpKDTOJ//mY+RuhyiPFc= -SHA1 (roundcubemail-0.5.1.tar.gz) = Ye0Bhuk0pnm0Y/q+fzbGd7VsMEI= -SHA256 (roundcubemail-0.5.1.tar.gz) = odi86TcTd1CI96a8SU9xJ3VcqQpsfz+UWJGCpl4xR5w= -SIZE (roundcubemail-0.5.1.tar.gz) = 2268849 +MD5 (roundcubemail-0.5.2.tar.gz) = dFHuSz/ciTAON8b6nND3tw== +RMD160 (roundcubemail-0.5.2.tar.gz) = XotOn6LJz0jHCzjoBlvUKnBWDzY= +SHA1 (roundcubemail-0.5.2.tar.gz) = a6kZ44OdzwhwZyWB/yjxz+/skq4= +SHA256 (roundcubemail-0.5.2.tar.gz) = 2/wx2XzP9TLVVHPhvo4a8ZlgCxych+M8IX+HgsmwXpc= +SIZE (roundcubemail-0.5.2.tar.gz) = 2289942 diff --git a/mail/roundcubemail/files/roundcubemail.conf b/mail/roundcubemail/files/roundcubemail.conf index 617711e0399..7cd1ec4c0a3 100644 --- a/mail/roundcubemail/files/roundcubemail.conf +++ b/mail/roundcubemail/files/roundcubemail.conf @@ -1,4 +1,4 @@ -# $OpenBSD: roundcubemail.conf,v 1.7 2011/03/21 14:01:41 ajacoutot Exp $ +# $OpenBSD: roundcubemail.conf,v 1.8 2011/04/22 15:11:08 sthen Exp $ Alias /roundcubemail ${TINSTDIR} @@ -12,6 +12,8 @@ Alias /roundcubemail ${TINSTDIR} php_value file_uploads 1 php_value session.auto_start 0 php_value mbstring.func_overload 0 + # If you have session problems, try setting this + # to your database server's timezone. php_value date.timezone UTC diff --git a/mail/roundcubemail/patches/patch-config_main_inc_php_dist b/mail/roundcubemail/patches/patch-config_main_inc_php_dist index 0728fc7bcc9..90c3cfdeb60 100644 --- a/mail/roundcubemail/patches/patch-config_main_inc_php_dist +++ b/mail/roundcubemail/patches/patch-config_main_inc_php_dist @@ -1,6 +1,6 @@ -$OpenBSD: patch-config_main_inc_php_dist,v 1.12 2011/03/02 08:38:01 sthen Exp $ ---- config/main.inc.php.dist.orig Wed Feb 9 10:51:50 2011 -+++ config/main.inc.php.dist Sat Feb 12 22:46:28 2011 +$OpenBSD: patch-config_main_inc_php_dist,v 1.13 2011/04/22 15:11:08 sthen Exp $ +--- config/main.inc.php.dist.orig Thu Feb 24 12:12:09 2011 ++++ config/main.inc.php.dist Fri Apr 22 00:46:21 2011 @@ -309,7 +309,7 @@ $rcmail_config['dont_override'] = array(); $rcmail_config['identities_level'] = 0; @@ -10,7 +10,7 @@ $OpenBSD: patch-config_main_inc_php_dist,v 1.12 2011/03/02 08:38:01 sthen Exp $ // Enable DNS checking for e-mail address validation $rcmail_config['email_dns_check'] = false; -@@ -384,7 +384,7 @@ $rcmail_config['enable_spellcheck'] = true; +@@ -385,7 +385,7 @@ $rcmail_config['enable_spellcheck'] = true; // Set the spell checking engine. 'googie' is the default. 'pspell' is also available, // but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. diff --git a/mail/roundcubemail/patches/patch-program_include_main_inc b/mail/roundcubemail/patches/patch-program_include_main_inc deleted file mode 100644 index f21ee9e83a4..00000000000 --- a/mail/roundcubemail/patches/patch-program_include_main_inc +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-program_include_main_inc,v 1.11 2011/01/14 09:38:48 sthen Exp $ ---- program/include/main.inc.orig Fri Dec 10 11:08:22 2010 -+++ program/include/main.inc Thu Jan 13 14:26:48 2011 -@@ -1005,7 +1005,8 @@ function format_date($date, $format=NULL) - $tz = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : date('Z')/3600; - else { - $tz = $CONFIG['timezone']; -- if ($CONFIG['dst_active']) -+ //if ($CONFIG['dst_active']) -+ if ($CONFIG['dst_active'] && (date("I", $ts) == "1")) - $tz++; - } -