diff --git a/mail/roundcubemail/Makefile b/mail/roundcubemail/Makefile index 965b19b4e3f..836da2c4d5e 100644 --- a/mail/roundcubemail/Makefile +++ b/mail/roundcubemail/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.11 2009/01/11 19:45:41 jolan Exp $ +# $OpenBSD: Makefile,v 1.12 2009/01/27 10:55:41 sthen Exp $ COMMENT = imap4 webmail client DISTNAME = roundcubemail-0.2-stable -PKGNAME = roundcubemail-0.2s +PKGNAME = roundcubemail-0.2sp0 CATEGORIES = mail www HOMEPAGE = http://www.roundcube.net/ diff --git a/mail/roundcubemail/patches/patch-UPGRADING b/mail/roundcubemail/patches/patch-UPGRADING index 2927a7f5723..50276db5c0d 100644 --- a/mail/roundcubemail/patches/patch-UPGRADING +++ b/mail/roundcubemail/patches/patch-UPGRADING @@ -1,7 +1,7 @@ -$OpenBSD: patch-UPGRADING,v 1.2 2008/09/22 13:53:02 sthen Exp $ ---- UPGRADING.orig Tue Aug 26 08:21:50 2008 -+++ UPGRADING Sun Sep 21 20:35:56 2008 -@@ -33,6 +33,9 @@ from version 0.1.1 +$OpenBSD: patch-UPGRADING,v 1.3 2009/01/27 10:55:41 sthen Exp $ +--- UPGRADING.orig Tue Dec 30 14:33:28 2008 ++++ UPGRADING Tue Jan 27 10:50:37 2009 +@@ -54,6 +54,9 @@ from version 0.1.1 below the line "-- Updates from version 0.1.1" * check the config/main.inc.php.dist for new configuration options and add them to your config diff --git a/mail/roundcubemail/patches/patch-config_main_inc_php_dist b/mail/roundcubemail/patches/patch-config_main_inc_php_dist index 846fdee11d8..d274dad841b 100644 --- a/mail/roundcubemail/patches/patch-config_main_inc_php_dist +++ b/mail/roundcubemail/patches/patch-config_main_inc_php_dist @@ -1,7 +1,7 @@ -$OpenBSD: patch-config_main_inc_php_dist,v 1.4 2008/09/22 13:53:02 sthen Exp $ ---- config/main.inc.php.dist.orig Sun Sep 21 12:22:17 2008 -+++ config/main.inc.php.dist Sun Sep 21 20:35:56 2008 -@@ -81,7 +81,7 @@ $rcmail_config['virtuser_query'] = ''; +$OpenBSD: patch-config_main_inc_php_dist,v 1.5 2009/01/27 10:55:41 sthen Exp $ +--- config/main.inc.php.dist.orig Tue Dec 30 14:33:28 2008 ++++ config/main.inc.php.dist Tue Jan 27 10:50:37 2009 +@@ -86,7 +86,7 @@ $rcmail_config['virtuser_query'] = ''; // use this host for sending mails. // to use SSL connection, set ssl://smtp.host.com // if left blank, the PHP mail() function is used @@ -10,7 +10,7 @@ $OpenBSD: patch-config_main_inc_php_dist,v 1.4 2008/09/22 13:53:02 sthen Exp $ // SMTP port (default is 25; 465 for SSL) $rcmail_config['smtp_port'] = 25; -@@ -309,7 +309,7 @@ $rcmail_config['include_host_config'] = false; +@@ -308,7 +308,7 @@ $rcmail_config['include_host_config'] = false; $rcmail_config['max_pagesize'] = 200; // mime magic database diff --git a/mail/roundcubemail/patches/patch-program_include_iniset_php b/mail/roundcubemail/patches/patch-program_include_iniset_php new file mode 100644 index 00000000000..6006cb31ecb --- /dev/null +++ b/mail/roundcubemail/patches/patch-program_include_iniset_php @@ -0,0 +1,36 @@ +r2211 upstream, avoid log spam + +$OpenBSD: patch-program_include_iniset_php,v 1.1 2009/01/27 10:55:41 sthen Exp $ +--- program/include/iniset.php.orig Tue Dec 30 14:33:28 2008 ++++ program/include/iniset.php Tue Jan 27 10:52:10 2009 +@@ -50,11 +50,15 @@ if (set_include_path($include_path) === false) { + die('Fatal error: ini_set/set_include_path does not work.'); + } + ++ini_set('error_reporting', E_ALL&~E_NOTICE); ++if (isset($_SERVER['HTTPS'])) { ++ ini_set('session.cookie_secure', ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off'))?1:0); ++} else { ++ ini_set('session.cookie_secure', 0); ++} + ini_set('session.name', 'roundcube_sessid'); + ini_set('session.use_cookies', 1); + ini_set('session.only_use_cookies', 1); +-ini_set('session.cookie_secure', ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off'))); +-ini_set('error_reporting', E_ALL&~E_NOTICE); + set_magic_quotes_runtime(0); + + // increase maximum execution time for php scripts +@@ -72,6 +76,7 @@ if(extension_loaded('mbstring')) + * Use PHP5 autoload for dynamic class loading + * + * @todo Make Zend, PEAR etc play with this ++ * @todo Make our classes conform to a more straight forward CS. + */ + function __autoload($classname) + { +@@ -112,4 +117,3 @@ require_once 'include/rcube_shared.inc'; + + // set PEAR error handling (will also load the PEAR main class) + PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error'); +- diff --git a/mail/roundcubemail/patches/patch-program_include_main_inc b/mail/roundcubemail/patches/patch-program_include_main_inc index 917fd4651be..493fd543c4b 100644 --- a/mail/roundcubemail/patches/patch-program_include_main_inc +++ b/mail/roundcubemail/patches/patch-program_include_main_inc @@ -1,7 +1,7 @@ -$OpenBSD: patch-program_include_main_inc,v 1.5 2008/09/22 13:53:02 sthen Exp $ ---- program/include/main.inc.orig Thu Sep 18 21:29:50 2008 -+++ program/include/main.inc Sun Sep 21 20:39:22 2008 -@@ -728,7 +728,8 @@ function format_date($date, $format=NULL) +$OpenBSD: patch-program_include_main_inc,v 1.6 2009/01/27 10:55:41 sthen Exp $ +--- program/include/main.inc.orig Wed Dec 24 14:19:27 2008 ++++ program/include/main.inc Tue Jan 27 10:50:37 2009 +@@ -731,7 +731,8 @@ function format_date($date, $format=NULL) $tz = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : date('Z')/3600; else { $tz = $CONFIG['timezone']; diff --git a/mail/roundcubemail/patches/patch-program_include_session_inc b/mail/roundcubemail/patches/patch-program_include_session_inc index 8c5895f3ef4..f1aa7df5743 100644 --- a/mail/roundcubemail/patches/patch-program_include_session_inc +++ b/mail/roundcubemail/patches/patch-program_include_session_inc @@ -1,7 +1,7 @@ -$OpenBSD: patch-program_include_session_inc,v 1.4 2008/09/22 13:53:02 sthen Exp $ ---- program/include/session.inc.orig Thu Sep 18 12:54:14 2008 -+++ program/include/session.inc Sun Sep 21 20:35:56 2008 -@@ -190,6 +190,9 @@ function rcube_sess_regenerate_id() +$OpenBSD: patch-program_include_session_inc,v 1.5 2009/01/27 10:55:41 sthen Exp $ +--- program/include/session.inc.orig Sun Nov 23 13:24:49 2008 ++++ program/include/session.inc Tue Jan 27 10:50:37 2009 +@@ -162,6 +162,9 @@ function rcube_sess_regenerate_id() return true; }