Date: Sun, 21 Apr 2013 05:53:40 GMT From: Svyatoslav Lempert <svyatoslav.lempert@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/178018: [update] mail/roundcube to 0.9.0 Message-ID: <201304210553.r3L5reQl098511@red.freebsd.org> Resent-Message-ID: <201304210600.r3L600MP030778@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 178018
>Category: ports
>Synopsis: [update] mail/roundcube to 0.9.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 21 06:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Svyatoslav Lempert
>Release: 9.1-STABLE
>Organization:
>Environment:
>Description:
- Update to 0.9.0 release
- SQLite support for PHP 5.4 (now it's possible via pdo_sqlite driver)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Nru roundcube.old/Makefile roundcube/Makefile
--- roundcube.old/Makefile 2013-03-28 10:23:59.000000000 +0000
+++ roundcube/Makefile 2013-04-21 05:18:01.000000000 +0000
@@ -1,7 +1,7 @@
# $FreeBSD: mail/roundcube/Makefile 315455 2013-03-28 10:23:59Z ale $
PORTNAME= roundcube
-DISTVERSION= 0.8.6
+DISTVERSION= 0.9.0
PORTEPOCH= 1
CATEGORIES?= mail www
MASTER_SITES= SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION:U}
@@ -33,7 +33,7 @@
MYSQL_DESC= Use MySQL backend
PGSQL_DESC= Use PostgreSQL backend
-SQLITE_DESC= Use SQLite backend (needs PHP 5.3 or below)
+SQLITE_DESC= Use SQLite backend
SSL_DESC= Enable SSL support (imaps or google spellcheck)
LDAP_DESC= Enable LDAP support (address book)
GD_DESC= Enable GD support (image convertion)
@@ -51,7 +51,7 @@
.endif
.if ${PORT_OPTIONS:MSQLITE}
-USE_PHP+= sqlite
+USE_PHP+= pdo_sqlite
.endif
.if ${PORT_OPTIONS:MSSL}
diff -Nru roundcube.old/distinfo roundcube/distinfo
--- roundcube.old/distinfo 2013-03-28 10:23:59.000000000 +0000
+++ roundcube/distinfo 2013-04-21 05:17:18.000000000 +0000
@@ -1,2 +1,2 @@
-SHA256 (roundcubemail-0.8.6.tar.gz) = 88128db0dc57651e08beb3c4811bc9e33aca1c39a50cfc9efb5d14b0baa17704
-SIZE (roundcubemail-0.8.6.tar.gz) = 3724565
+SHA256 (roundcubemail-0.9.0.tar.gz) = 7edab9579cd2a6353c30de3fcfc86da231f0a46f7ad4ce707090813173f662c2
+SIZE (roundcubemail-0.9.0.tar.gz) = 3711615
diff -Nru roundcube.old/files/patch-program_include_iniset.php roundcube/files/patch-program_include_iniset.php
--- roundcube.old/files/patch-program_include_iniset.php 2012-08-13 13:23:07.000000000 +0000
+++ roundcube/files/patch-program_include_iniset.php 2013-04-21 05:23:12.000000000 +0000
@@ -1,10 +1,10 @@
---- program/include/iniset.php.orig 2012-08-06 18:18:13.000000000 +0200
-+++ program/include/iniset.php 2012-08-13 12:37:50.000000000 +0200
-@@ -29,7 +29,6 @@
+--- program/include/iniset.php.orig 2013-04-21 05:21:41.000000000 +0000
++++ program/include/iniset.php 2013-04-21 05:21:58.000000000 +0000
+@@ -28,7 +28,6 @@
+ // Some users are not using Installer, so we'll check some
// critical PHP settings here. Only these, which doesn't provide
// an error/warning in the logs later. See (#1486307).
- 'mbstring.func_overload' => 0,
- 'suhosin.session.encrypt' => 0,
'session.auto_start' => 0,
'file_uploads' => 1,
- 'magic_quotes_runtime' => 0,
+ );
diff -Nru roundcube.old/files/patch-program_include_rcube_message.php roundcube/files/patch-program_include_rcube_message.php
--- roundcube.old/files/patch-program_include_rcube_message.php 2012-07-14 13:54:48.000000000 +0000
+++ roundcube/files/patch-program_include_rcube_message.php 1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
---- program/include/rcube_message.php.orig 2010-11-26 13:41:16.000000000 +0100
-+++ program/include/rcube_message.php 2010-12-13 17:20:59.000000000 +0100
-@@ -452,9 +452,7 @@
- }
- // part is a file/attachment
- 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
- ) {
- // skip apple resource forks
- if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
diff -Nru roundcube.old/files/patch-program_include_rcube_session.php roundcube/files/patch-program_include_rcube_session.php
--- roundcube.old/files/patch-program_include_rcube_session.php 2012-08-13 13:23:07.000000000 +0000
+++ roundcube/files/patch-program_include_rcube_session.php 1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
---- program/include/rcube_session.php.orig 2012-08-06 18:18:13.000000000 +0200
-+++ program/include/rcube_session.php 2012-08-13 12:44:54.000000000 +0200
-@@ -37,7 +37,6 @@
- private $ip;
- private $start;
- private $changed;
-- private $unsets = array();
- private $gc_handlers = array();
- private $cookiename = 'roundcube_sessauth';
- private $vars;
-@@ -134,7 +133,7 @@
- if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
- $this->changed = strtotime($sql_arr['changed']);
- $this->ip = $sql_arr['ip'];
-- $this->vars = base64_decode($sql_arr['vars']);
-+ $this->vars = $sql_arr['vars'];
- $this->key = $key;
-
- return !empty($this->vars) ? (string) $this->vars : '';
-@@ -170,13 +169,13 @@
- }
-
- if ($oldvars !== null) {
-- $newvars = $this->_fixvars($vars, $oldvars);
-+ $newvars = $vars;
-
- if ($newvars !== $oldvars) {
- $this->db->query(
- sprintf("UPDATE %s SET vars=?, changed=%s WHERE sess_id=?",
- get_table_name('session'), $now),
-- base64_encode($newvars), $key);
-+ $newvars, $key);
- }
- else if ($ts - $this->changed > $this->lifetime / 2) {
- $this->db->query("UPDATE ".get_table_name('session')." SET changed=$now WHERE sess_id=?", $key);
-@@ -187,7 +186,7 @@
- sprintf("INSERT INTO %s (sess_id, vars, ip, created, changed) ".
- "VALUES (?, ?, ?, %s, %s)",
- get_table_name('session'), $now, $now),
-- $key, base64_encode($vars), (string)$this->ip);
-+ $key, $vars, (string)$this->ip);
- }
-
- return true;
-@@ -195,29 +194,6 @@
-
-
- /**
-- * Merge vars with old vars and apply unsets
-- */
-- private function _fixvars($vars, $oldvars)
-- {
-- if ($oldvars !== null) {
-- $a_oldvars = $this->unserialize($oldvars);
-- if (is_array($a_oldvars)) {
-- foreach ((array)$this->unsets as $k)
-- unset($a_oldvars[$k]);
--
-- $newvars = $this->serialize(array_merge(
-- (array)$a_oldvars, (array)$this->unserialize($vars)));
-- }
-- else
-- $newvars = $vars;
-- }
--
-- $this->unsets = array();
-- return $newvars;
-- }
--
--
-- /**
- * Handler for session_destroy()
- *
- * @param string Session ID
-@@ -296,7 +272,7 @@
- else // else read data again
- $oldvars = $this->mc_read($key);
-
-- $newvars = $oldvars !== null ? $this->_fixvars($vars, $oldvars) : $vars;
-+ $newvars = $vars;
-
- if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 2)
- return $this->memcache->set($key, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)), MEMCACHE_COMPRESSED, $this->lifetime);
-@@ -376,7 +352,6 @@
- if (empty($var))
- return $this->destroy(session_id());
-
-- $this->unsets[] = $var;
- unset($_SESSION[$var]);
-
- return true;
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304210553.r3L5reQl098511>