[Midnightbsd-cvs] mports [21987] trunk/mail/roundcube: roundcube 1.2.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 22 13:56:53 EDT 2016
Revision: 21987
http://svnweb.midnightbsd.org/mports/?rev=21987
Author: laffer1
Date: 2016-10-22 13:56:53 -0400 (Sat, 22 Oct 2016)
Log Message:
-----------
roundcube 1.2.2
Modified Paths:
--------------
trunk/mail/roundcube/Makefile
trunk/mail/roundcube/distinfo
trunk/mail/roundcube/files/patch-INSTALL
trunk/mail/roundcube/files/patch-config_defaults.inc.php
trunk/mail/roundcube/files/patch-installer_check.php
trunk/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php
trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
Removed Paths:
-------------
trunk/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php
Modified: trunk/mail/roundcube/Makefile
===================================================================
--- trunk/mail/roundcube/Makefile 2016-10-22 17:52:36 UTC (rev 21986)
+++ trunk/mail/roundcube/Makefile 2016-10-22 17:56:53 UTC (rev 21987)
@@ -2,10 +2,10 @@
# $FreeBSD: head/mail/roundcube/Makefile 369697 2014-10-01 07:13:26Z ale $
PORTNAME= roundcube
-DISTVERSION= 1.1.5
+DISTVERSION= 1.2.2
PORTEPOCH= 1
CATEGORIES?= mail www
-MASTER_SITES= https://github.com/roundcube/roundcubemail/releases/download/1.1.5/
+MASTER_SITES= https://github.com/roundcube/roundcubemail/releases/download/1.2.2/
DISTNAME= ${PORTNAME}mail-${DISTVERSION}-complete
MAINTAINER?= ports at MidnightBSD.org
@@ -13,11 +13,13 @@
LICENSE= gpl3
-WRKSRC= ${WRKDIR}/roundcubemail-1.1.5
+WRKSRC= ${WRKDIR}/roundcubemail-${DISTVERSION}
NO_BUILD= yes
+WRKSRC= ${WRKDIR}/${PORTNAME}mail-${DISTVERSION}
-RCUBECOMP= SQL config index.php installer logs plugins program robots.txt skins temp vendor
+RCUBECOMP= SQL config .htaccess index.php installer logs \
+ plugins program robots.txt skins temp vendor
PORTDOCS= CHANGELOG INSTALL README.md UPGRADING
USES= cpe
@@ -28,15 +30,15 @@
USE_PHP= pcre mbstring session iconv dom xml json intl zip filter
IGNORE_WITH_PHP=52
-OPTIONS_DEFINE= SSL LDAP GD PSPELL NSC DOCS
+OPTIONS_DEFINE= LDAP GD PSPELL NSC DOCS
OPTIONS_SINGLE= DB
OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE
OPTIONS_DEFAULT=MYSQL
+DB_DESC= Database backend
MYSQL_DESC= Use MySQL backend
PGSQL_DESC= Use PostgreSQL backend
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)
PSPELL_DESC= Enable PSpell support (internal spellcheck)
@@ -56,9 +58,7 @@
USE_PHP+= pdo_sqlite
.endif
-.if ${PORT_OPTIONS:MSSL}
USE_PHP+= openssl
-.endif
.if ${PORT_OPTIONS:MLDAP}
USE_PHP+= ldap
Modified: trunk/mail/roundcube/distinfo
===================================================================
--- trunk/mail/roundcube/distinfo 2016-10-22 17:52:36 UTC (rev 21986)
+++ trunk/mail/roundcube/distinfo 2016-10-22 17:56:53 UTC (rev 21987)
@@ -1,2 +1,3 @@
-SHA256 (roundcubemail-1.1.5-complete.tar.gz) = 476a1d45b0592b2ad43e3e08cbc72e69ef31e33ed8a8f071f02e5a1ae3e7f334
-SIZE (roundcubemail-1.1.5-complete.tar.gz) = 4581781
+TIMESTAMP = 1475867046
+SHA256 (roundcubemail-1.2.2-complete.tar.gz) = b919e797b8bf5ed34748d067dc281f45f29ad71dbad8904bdc0e2258912666ef
+SIZE (roundcubemail-1.2.2-complete.tar.gz) = 3857397
Modified: trunk/mail/roundcube/files/patch-INSTALL
===================================================================
--- trunk/mail/roundcube/files/patch-INSTALL 2016-10-22 17:52:36 UTC (rev 21986)
+++ trunk/mail/roundcube/files/patch-INSTALL 2016-10-22 17:56:53 UTC (rev 21987)
@@ -1,6 +1,6 @@
---- INSTALL.orig 2015-02-08 13:43:29.000000000 +0000
-+++ INSTALL 2015-02-19 12:22:34.259436291 +0000
-@@ -29,7 +29,6 @@
+--- INSTALL.orig 2016-05-22 11:06:47 UTC
++++ INSTALL
+@@ -29,7 +29,6 @@ REQUIREMENTS
- memory_limit > 16MB (increase as suitable to support large attachments)
- file_uploads enabled (for attachment upload features)
- session.auto_start disabled
Modified: trunk/mail/roundcube/files/patch-config_defaults.inc.php
===================================================================
--- trunk/mail/roundcube/files/patch-config_defaults.inc.php 2016-10-22 17:52:36 UTC (rev 21986)
+++ trunk/mail/roundcube/files/patch-config_defaults.inc.php 2016-10-22 17:56:53 UTC (rev 21987)
@@ -1,7 +1,7 @@
---- 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/defaults.inc.php.orig 2016-05-22 11:06:45 UTC
++++ config/defaults.inc.php
+@@ -717,8 +717,8 @@ $config['spellcheck_dictionary'] = false
+ // You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
$config['spellcheck_engine'] = 'googie';
-// For locally installed Nox Spell Server or After the Deadline services,
Modified: trunk/mail/roundcube/files/patch-installer_check.php
===================================================================
--- trunk/mail/roundcube/files/patch-installer_check.php 2016-10-22 17:52:36 UTC (rev 21986)
+++ trunk/mail/roundcube/files/patch-installer_check.php 2016-10-22 17:56:53 UTC (rev 21987)
@@ -1,8 +1,8 @@
---- installer/check.php.orig 2012-08-06 18:18:13.000000000 +0200
-+++ installer/check.php 2012-08-13 12:36:52.000000000 +0200
-@@ -39,7 +39,6 @@
+--- installer/check.php.orig 2016-05-22 11:06:45 UTC
++++ installer/check.php
+@@ -43,7 +43,6 @@ $ini_checks = array(
+ 'file_uploads' => 1,
'session.auto_start' => 0,
- 'zend.ze1_compatibility_mode' => 0,
'mbstring.func_overload' => 0,
- 'suhosin.session.encrypt' => 0,
'magic_quotes_runtime' => 0,
Modified: trunk/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php
===================================================================
--- trunk/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php 2016-10-22 17:52:36 UTC (rev 21986)
+++ trunk/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php 2016-10-22 17:56:53 UTC (rev 21987)
@@ -1,6 +1,6 @@
---- program/lib/Roundcube/bootstrap.php.orig 2014-07-07 18:18:50.261368902 +0000
-+++ program/lib/Roundcube/bootstrap.php 2014-07-07 18:18:58.202127091 +0000
-@@ -38,7 +38,6 @@
+--- program/lib/Roundcube/bootstrap.php.orig 2016-05-22 11:06:47 UTC
++++ program/lib/Roundcube/bootstrap.php
+@@ -37,7 +37,6 @@ $config = array(
// check these additional ini settings if not called via CLI
if (php_sapi_name() != 'cli') {
$config += array(
Modified: trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
===================================================================
--- trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php 2016-10-22 17:52:36 UTC (rev 21986)
+++ trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php 2016-10-22 17:56:53 UTC (rev 21987)
@@ -1,6 +1,6 @@
---- 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 @@
+--- program/lib/Roundcube/rcube_message.php.orig 2016-05-22 11:06:47 UTC
++++ program/lib/Roundcube/rcube_message.php
+@@ -766,9 +766,7 @@ class rcube_message
}
// part is a file/attachment
else if (preg_match('/^(inline|attach)/', $mail_part->disposition) ||
Modified: trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
===================================================================
--- trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php 2016-10-22 17:52:36 UTC (rev 21986)
+++ trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php 2016-10-22 17:56:53 UTC (rev 21987)
@@ -1,73 +1,30 @@
---- program/lib/Roundcube/rcube_session.php.orig 2015-09-22 15:24:26.400132239 +0000
-+++ program/lib/Roundcube/rcube_session.php 2015-09-22 15:24:08.430133455 +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;
-@@ -46,6 +45,7 @@
- private $logging = false;
- private $storage;
- private $memcache;
-+ private $need_base64 = false;
+--- program/lib/Roundcube/rcube_session.php.orig 2016-05-22 11:06:47 UTC
++++ program/lib/Roundcube/rcube_session.php
+@@ -39,7 +39,6 @@ abstract class rcube_session
+ protected $time_diff = 0;
+ protected $reloaded = false;
+ protected $appends = array();
+- protected $unsets = array();
+ protected $gc_enabled = 0;
+ protected $gc_handlers = array();
+ protected $cookiename = 'roundcube_sessauth';
+@@ -158,7 +157,7 @@ abstract class rcube_session
- /**
- * Blocks session data from being written to database.
-@@ -95,6 +95,9 @@
- else if ($this->storage != 'php') {
- ini_set('session.serialize_handler', 'php');
-
-+ if (ini_get("suhosin.session.encrypt") !== "1")
-+ $this->need_base64 = true;
-+
- // set custom functions for PHP session management
- session_set_save_handler(
- array($this, 'open'),
-@@ -192,7 +195,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 = $this->_decode($sql_arr['vars']);
- $this->key = $key;
-
- return !empty($this->vars) ? (string) $this->vars : '';
-@@ -232,12 +235,12 @@
- }
-
- if ($oldvars !== null) {
+ // if there are cached vars, update store, else insert new data
+ if ($oldvars) {
- $newvars = $this->_fixvars($vars, $oldvars);
+ $newvars = $vars;
-
- if ($newvars !== $oldvars) {
- $this->db->query("UPDATE {$this->table_name} "
- . "SET `changed` = $now, `vars` = ? WHERE `sess_id` = ?",
-- base64_encode($newvars), $key);
-+ $this->_encode($newvars), $key);
- }
- else if ($ts - $this->changed + $this->time_diff > $this->lifetime / 2) {
- $this->db->query("UPDATE {$this->table_name} SET `changed` = $now"
-@@ -248,44 +251,30 @@
- $this->db->query("INSERT INTO {$this->table_name}"
- . " (`sess_id`, `vars`, `ip`, `created`, `changed`)"
- . " VALUES (?, ?, ?, $now, $now)",
-- $key, base64_encode($vars), (string)$this->ip);
-+ $key, $this->_encode($vars), (string)$this->ip);
+ return $this->update($key, $newvars, $oldvars);
}
-
- return true;
+ else {
+@@ -180,39 +179,6 @@ abstract class rcube_session
}
-
-- /**
+ /**
- * Merge vars with old vars and apply unsets
- */
-- private function _fixvars($vars, $oldvars)
-+ private function _encode($vars)
- {
+- protected function _fixvars($vars, $oldvars)
+- {
- if ($oldvars !== null) {
- $a_oldvars = $this->unserialize($oldvars);
- if (is_array($a_oldvars)) {
@@ -90,36 +47,29 @@
- else {
- $newvars = $vars;
- }
-+ if ($this->need_base64) {
-+ return base64_encode($vars);
-+ } else {
-+ return $vars;
+- }
+-
+- $this->unsets = array();
+- return $newvars;
+- }
+-
+- /**
+ * Execute registered garbage collector routines
+ */
+ public function gc($maxlifetime)
+@@ -321,11 +287,6 @@ abstract class rcube_session
}
-+ }
-- $this->unsets = array();
-- return $newvars;
-+
-+ private function _decode($vars)
-+ {
-+ if ($this->need_base64) {
-+ return base64_decode($vars);
-+ } else {
-+ return $vars;
-+ }
+ $this->appends[] = $path;
+-
+- // when overwriting a previously unset variable
+- if ($this->unsets[$path]) {
+- unset($this->unsets[$path]);
+- }
}
-
-@@ -350,7 +339,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 / 3) {
- return $this->memcache->set($key, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)),
-@@ -488,8 +477,6 @@
+ /**
+@@ -340,8 +301,6 @@ abstract class rcube_session
return $this->destroy(session_id());
}
@@ -128,3 +78,25 @@
if (isset($_SESSION[$var])) {
unset($_SESSION[$var]);
}
+@@ -387,21 +346,6 @@ abstract class rcube_session
+
+ if ($data) {
+ session_decode($data);
+-
+- // apply appends and unsets to reloaded data
+- $_SESSION = array_merge_recursive($_SESSION, $merge_data);
+-
+- foreach ((array)$this->unsets as $var) {
+- if (isset($_SESSION[$var])) {
+- unset($_SESSION[$var]);
+- }
+- else {
+- $path = explode('.', $var);
+- $k = array_pop($path);
+- $node = &$this->get_node($path, $_SESSION);
+- unset($node[$k]);
+- }
+- }
+ }
+ }
+
Deleted: trunk/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php
===================================================================
--- trunk/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php 2016-10-22 17:52:36 UTC (rev 21986)
+++ trunk/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php 2016-10-22 17:56:53 UTC (rev 21987)
@@ -1,11 +0,0 @@
---- vendor/pear-pear.php.net/Net_Sieve/Net/Sieve.php.orig 2016-03-01 14:32:07 UTC
-+++ vendor/pear-pear.php.net/Net_Sieve/Net/Sieve.php
-@@ -229,7 +229,7 @@ class Net_Sieve
- $this->_sock = new Net_Socket();
- $this->_bypassAuth = $bypassAuth;
- $this->_useTLS = $useTLS;
-- $this->_options = $options;
-+ $this->_options = (array)$options;
- $this->setDebug($debug, $handler);
-
- /* Try to include the Auth_SASL package. If the package is not
More information about the Midnightbsd-cvs
mailing list