Date: Thu, 10 Apr 2014 09:51:14 +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: r350793 - in head/mail/roundcube: . files Message-ID: <201404100951.s3A9pETL056468@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Thu Apr 10 09:51:13 2014 New Revision: 350793 URL: http://svnweb.freebsd.org/changeset/ports/350793 QAT: https://qat.redports.org/buildarchive/r350793/ Log: Update to 1.0.0 release. Added: head/mail/roundcube/files/patch-config_defaults.inc.php - copied, changed from r350785, head/mail/roundcube/files/patch-config_main.inc.php.dist Deleted: head/mail/roundcube/files/patch-config_main.inc.php.dist Modified: head/mail/roundcube/Makefile head/mail/roundcube/distinfo head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php Modified: head/mail/roundcube/Makefile ============================================================================== --- head/mail/roundcube/Makefile Thu Apr 10 09:11:07 2014 (r350792) +++ head/mail/roundcube/Makefile Thu Apr 10 09:51:13 2014 (r350793) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= roundcube -DISTVERSION= 0.9.5 +DISTVERSION= 1.0.0 PORTEPOCH= 1 CATEGORIES?= mail www MASTER_SITES= SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION:U} Modified: head/mail/roundcube/distinfo ============================================================================== --- head/mail/roundcube/distinfo Thu Apr 10 09:11:07 2014 (r350792) +++ head/mail/roundcube/distinfo Thu Apr 10 09:51:13 2014 (r350793) @@ -1,2 +1,2 @@ -SHA256 (roundcubemail-0.9.5.tar.gz) = f5fbb39f11ed5bfb130e130660dacc125c9ee3eaa0d45c506b82f89fa1808326 -SIZE (roundcubemail-0.9.5.tar.gz) = 3659531 +SHA256 (roundcubemail-1.0.0.tar.gz) = cfe4b1b66f32149d7727a6ae2ec2aa0c6c1388c9d22fd5b6da2e78bdbaac8dc8 +SIZE (roundcubemail-1.0.0.tar.gz) = 3975691 Copied and modified: head/mail/roundcube/files/patch-config_defaults.inc.php (from r350785, head/mail/roundcube/files/patch-config_main.inc.php.dist) ============================================================================== --- head/mail/roundcube/files/patch-config_main.inc.php.dist Thu Apr 10 07:47:18 2014 (r350785, copy source) +++ head/mail/roundcube/files/patch-config_defaults.inc.php Thu Apr 10 09:51:13 2014 (r350793) @@ -1,13 +1,13 @@ ---- config/main.inc.php.dist.orig 2008-04-26 00:18:03.000000000 +0200 -+++ config/main.inc.php.dist 2008-04-26 00:19:22.000000000 +0200 -@@ -188,8 +188,8 @@ - // requires to be compiled with Open SSL support - $rcmail_config['enable_spellcheck'] = TRUE; +--- config/defaults.inc.php.orig 2014-04-06 14:13:09.000000000 +0000 ++++ config/defaults.inc.php 2014-04-10 09:08:58.242144399 +0000 +@@ -596,8 +596,8 @@ + // connect to a Nox Spell Server when using 'googie' here. Therefore specify the 'spellcheck_uri' + $config['spellcheck_engine'] = 'googie'; --// For a locally installed Nox Spell Server, please specify the URI to call it. --// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 +-// For locally installed Nox Spell Server or After the Deadline services, +-// please specify the URI to call it. +// For a locally installed spellcheker, specify the URI to call it, for example: +// 'http://' . $_SERVER['HTTP_HOST'] . '/spellchecker.php?lang=' - // Leave empty to use the Google spell checking service, what means - // that the message content will be sent to Google in order to check spelling - $rcmail_config['spellcheck_uri'] = ''; + // Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 or + // the After the Deadline package from http://www.afterthedeadline.com. + // Leave empty to use the public API of service.afterthedeadline.com Modified: head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php ============================================================================== --- head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php Thu Apr 10 09:11:07 2014 (r350792) +++ head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php Thu Apr 10 09:51:13 2014 (r350793) @@ -1,23 +1,23 @@ ---- program/lib/Roundcube/rcube_session.php.orig 2013-05-16 20:06:31.000000000 +0200 -+++ program/lib/Roundcube/rcube_session.php 2013-05-27 15:46:41.000000000 +0200 -@@ -33,7 +33,6 @@ - private $start; - private $changed; +--- program/lib/Roundcube/rcube_session.php.orig 2014-04-06 14:13:10.000000000 +0000 ++++ program/lib/Roundcube/rcube_session.php 2014-04-10 09:21:36.955091803 +0000 +@@ -35,7 +35,6 @@ + private $time_diff = 0; private $reloaded = false; + private $appends = array(); - 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; +@@ -176,7 +175,7 @@ + $this->time_diff = time() - strtotime($sql_arr['ts']); + $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 @@ +@@ -214,12 +213,12 @@ } if ($oldvars !== null) { @@ -25,24 +25,23 @@ + $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); + $this->db->query("UPDATE $table " + . "SET changed = $now, vars = ? WHERE sess_id = ?", +- 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); + else if ($ts - $this->changed + $this->time_diff > $this->lifetime / 2) { + $this->db->query("UPDATE $table SET changed = $now" +@@ -229,7 +228,7 @@ + else { + $this->db->query("INSERT INTO $table (sess_id, vars, ip, created, changed)" + . " VALUES (?, ?, ?, $now, $now)", +- $key, base64_encode($vars), (string)$this->ip); ++ $key, $vars, (string)$this->ip); } return true; -@@ -194,40 +193,6 @@ +@@ -237,40 +236,6 @@ /** @@ -83,16 +82,16 @@ * Handler for session_destroy() * * @param string Session ID -@@ -308,7 +273,7 @@ +@@ -332,7 +297,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) { + if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 3) { return $this->memcache->set($key, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)), -@@ -416,8 +381,6 @@ +@@ -470,8 +435,6 @@ return $this->destroy(session_id()); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404100951.s3A9pETL056468>