Date: Tue, 7 May 2013 13:51:53 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317607 - in head/mail/roundcube: . files Message-ID: <201305071351.r47Dprp9022245@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Tue May 7 13:51:52 2013 New Revision: 317607 URL: http://svnweb.freebsd.org/changeset/ports/317607 Log: Update to 0.9.0 release. Added: head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php - copied, changed from r317517, head/mail/roundcube/files/patch-program_include_rcube_message.php head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php - copied, changed from r317517, head/mail/roundcube/files/patch-program_include_rcube_session.php Deleted: head/mail/roundcube/files/patch-program_include_rcube_message.php head/mail/roundcube/files/patch-program_include_rcube_session.php Modified: head/mail/roundcube/Makefile head/mail/roundcube/distinfo head/mail/roundcube/files/patch-program_include_iniset.php Modified: head/mail/roundcube/Makefile ============================================================================== --- head/mail/roundcube/Makefile Tue May 7 13:32:03 2013 (r317606) +++ head/mail/roundcube/Makefile Tue May 7 13:51:52 2013 (r317607) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= roundcube -DISTVERSION= 0.8.6 +DISTVERSION= 0.9.0 PORTEPOCH= 1 CATEGORIES?= mail www MASTER_SITES= SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION:U} @@ -23,8 +23,8 @@ SCRIPTS_ENV= SHAREOWN=${SHAREOWN} SHAREG WWWDIR=${WWWDIR} WANT_PHP_WEB= yes -USE_PHP= pcre mbstring session iconv dom xml json intl -IGNORE_WITH_PHP=4 +USE_PHP= pcre mbstring session iconv dom xml json intl zip +IGNORE_WITH_PHP=52 OPTIONS_DEFINE= SSL LDAP GD PSPELL NSC OPTIONS_SINGLE= DB @@ -33,7 +33,7 @@ OPTIONS_DEFAULT=MYSQL 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 conversion) @@ -43,15 +43,15 @@ NSC_DESC= Install network spellchecker .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysql +USE_PHP+= pdo_mysql .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pgsql +USE_PHP+= pdo_pgsql .endif .if ${PORT_OPTIONS:MSQLITE} -USE_PHP+= sqlite +USE_PHP+= pdo_sqlite .endif .if ${PORT_OPTIONS:MSSL} Modified: head/mail/roundcube/distinfo ============================================================================== --- head/mail/roundcube/distinfo Tue May 7 13:32:03 2013 (r317606) +++ head/mail/roundcube/distinfo Tue May 7 13:51:52 2013 (r317607) @@ -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 Modified: head/mail/roundcube/files/patch-program_include_iniset.php ============================================================================== --- head/mail/roundcube/files/patch-program_include_iniset.php Tue May 7 13:32:03 2013 (r317606) +++ head/mail/roundcube/files/patch-program_include_iniset.php Tue May 7 13:51:52 2013 (r317607) @@ -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-15 22:42:21.000000000 +0200 ++++ program/include/iniset.php 2013-05-07 12:40:34.000000000 +0200 +@@ -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, + ); Copied and modified: head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php (from r317517, head/mail/roundcube/files/patch-program_include_rcube_message.php) ============================================================================== --- head/mail/roundcube/files/patch-program_include_rcube_message.php Mon May 6 13:58:49 2013 (r317517, copy source) +++ head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php Tue May 7 13:51:52 2013 (r317607) @@ -1,5 +1,5 @@ ---- 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 +--- program/lib/Roundcube/rcube_message.php.orig 2010-11-26 13:41:16.000000000 +0100 ++++ program/lib/Roundcube/rcube_message.php 2010-12-13 17:20:59.000000000 +0100 @@ -452,9 +452,7 @@ } // part is a file/attachment Copied and modified: head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php (from r317517, head/mail/roundcube/files/patch-program_include_rcube_session.php) ============================================================================== --- head/mail/roundcube/files/patch-program_include_rcube_session.php Mon May 6 13:58:49 2013 (r317517, copy source) +++ head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php Tue May 7 13:51:52 2013 (r317607) @@ -1,91 +1,103 @@ ---- 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]); +--- program/lib/Roundcube/rcube_session.php.orig 2013-04-15 22:42:22.000000000 +0200 ++++ program/lib/Roundcube/rcube_session.php 2013-05-07 12:49:19.000000000 +0200 +@@ -33,7 +33,6 @@ + private $start; + private $changed; + private $reloaded = false; +- private $unsets = array(); + private $gc_handlers = array(); + private $cookiename = 'roundcube_sessauth'; + private $vars; +@@ -131,7 +130,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 : ''; +@@ -168,13 +167,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=?", + $this->db->table_name('session'), $now), +- base64_encode($newvars), $key); ++ $newvars, $key); + } + else if ($ts - $this->changed > $this->lifetime / 2) { + $this->db->query("UPDATE ".$this->db->table_name('session') +@@ -186,7 +185,7 @@ + sprintf("INSERT INTO %s (sess_id, vars, ip, created, changed) ". + "VALUES (?, ?, ?, %s, %s)", + $this->db->table_name('session'), $now, $now), +- $key, base64_encode($vars), (string)$this->ip); ++ $key, $vars, (string)$this->ip); + } + + return true; +@@ -194,40 +193,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)) { +- // remove unset keys on oldvars +- foreach ((array)$this->unsets as $var) { +- if (isset($a_oldvars[$k])) { +- unset($a_oldvars[$k]); +- } +- else { +- $path = explode('.', $var); +- $k = array_pop($path); +- $node = &$this->get_node($path, $a_oldvars); +- unset($node[$k]); +- } +- } - -- $newvars = $this->serialize(array_merge( -- (array)$a_oldvars, (array)$this->unserialize($vars))); -- } -- else -- $newvars = $vars; -- } +- $newvars = $this->serialize(array_merge( +- (array)$a_oldvars, (array)$this->unserialize($vars))); +- } +- else { +- $newvars = $vars; +- } +- } - -- $this->unsets = array(); -- return $newvars; -- } +- $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()); +- /** + * Handler for session_destroy() + * + * @param string Session ID +@@ -308,7 +273,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)), +@@ -416,8 +381,6 @@ + return $this->destroy(session_id()); + } -- $this->unsets[] = $var; - unset($_SESSION[$var]); - - return true; +- $this->unsets[] = $var; +- + if (isset($_SESSION[$var])) { + unset($_SESSION[$var]); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305071351.r47Dprp9022245>