[Midnightbsd-cvs] mports [21376] trunk/mail/roundcube: roundcube 1.1.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun May 15 11:06:48 EDT 2016
Revision: 21376
http://svnweb.midnightbsd.org/mports/?rev=21376
Author: laffer1
Date: 2016-05-15 11:06:47 -0400 (Sun, 15 May 2016)
Log Message:
-----------
roundcube 1.1.4
Modified Paths:
--------------
trunk/mail/roundcube/Makefile
trunk/mail/roundcube/distinfo
trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
Added 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-05-15 15:05:19 UTC (rev 21375)
+++ trunk/mail/roundcube/Makefile 2016-05-15 15:06:47 UTC (rev 21376)
@@ -2,7 +2,7 @@
# $FreeBSD: head/mail/roundcube/Makefile 369697 2014-10-01 07:13:26Z ale $
PORTNAME= roundcube
-DISTVERSION= 1.1.2
+DISTVERSION= 1.1.4
PORTEPOCH= 1
CATEGORIES?= mail www
MASTER_SITES= SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION:tu}
@@ -13,7 +13,7 @@
LICENSE= gpl3
-WRKSRC= ${WRKDIR}/roundcubemail-1.1.2
+WRKSRC= ${WRKDIR}/roundcubemail-1.1.4
NO_BUILD= yes
Modified: trunk/mail/roundcube/distinfo
===================================================================
--- trunk/mail/roundcube/distinfo 2016-05-15 15:05:19 UTC (rev 21375)
+++ trunk/mail/roundcube/distinfo 2016-05-15 15:06:47 UTC (rev 21376)
@@ -1,2 +1,2 @@
-SHA256 (roundcubemail-1.1.2-complete.tar.gz) = 237afc9807291efd7c3550c83ca82677a9af72855b6f48733d9e55d6d84fdae1
-SIZE (roundcubemail-1.1.2-complete.tar.gz) = 4599935
+SHA256 (roundcubemail-1.1.4-complete.tar.gz) = 9bfe88255d4ffc288f5776de1cead78352469b1766d5ebaebe6e28043affe181
+SIZE (roundcubemail-1.1.4-complete.tar.gz) = 4578600
Modified: trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
===================================================================
--- trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php 2016-05-15 15:05:19 UTC (rev 21375)
+++ trunk/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php 2016-05-15 15:06:47 UTC (rev 21376)
@@ -1,5 +1,5 @@
---- program/lib/Roundcube/rcube_session.php.orig 2015-02-08 13:43:28.000000000 +0000
-+++ program/lib/Roundcube/rcube_session.php 2015-02-19 13:43:29.477065794 +0000
+--- 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;
@@ -8,16 +8,34 @@
private $gc_handlers = array();
private $cookiename = 'roundcube_sessauth';
private $vars;
-@@ -184,7 +183,7 @@
+@@ -46,6 +45,7 @@
+ private $logging = false;
+ private $storage;
+ private $memcache;
++ private $need_base64 = false;
+
+ /**
+ * 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 = $sql_arr['vars'];
++ $this->vars = $this->_decode($sql_arr['vars']);
$this->key = $key;
return !empty($this->vars) ? (string) $this->vars : '';
-@@ -224,12 +223,12 @@
+@@ -232,12 +235,12 @@
}
if ($oldvars !== null) {
@@ -28,27 +46,28 @@
$this->db->query("UPDATE {$this->table_name} "
. "SET `changed` = $now, `vars` = ? WHERE `sess_id` = ?",
- base64_encode($newvars), $key);
-+ $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"
-@@ -240,7 +239,7 @@
+@@ -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, $vars, (string)$this->ip);
++ $key, $this->_encode($vars), (string)$this->ip);
}
return true;
-@@ -248,40 +247,6 @@
+ }
- /**
+- /**
- * Merge vars with old vars and apply unsets
- */
- private function _fixvars($vars, $oldvars)
-- {
++ private function _encode($vars)
+ {
- if ($oldvars !== null) {
- $a_oldvars = $this->unserialize($oldvars);
- if (is_array($a_oldvars)) {
@@ -71,18 +90,27 @@
- else {
- $newvars = $vars;
- }
-- }
--
++ if ($this->need_base64) {
++ return base64_encode($vars);
++ } else {
++ return $vars;
+ }
++ }
+
- $this->unsets = array();
- return $newvars;
-- }
--
--
-- /**
- * Handler for session_destroy()
- *
- * @param string Session ID
-@@ -342,7 +307,7 @@
++
++ private function _decode($vars)
++ {
++ if ($this->need_base64) {
++ return base64_decode($vars);
++ } else {
++ return $vars;
++ }
+ }
+
+
+@@ -350,7 +339,7 @@
else // else read data again
$oldvars = $this->mc_read($key);
@@ -91,7 +119,7 @@
if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 3) {
return $this->memcache->set($key, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)),
-@@ -480,8 +445,6 @@
+@@ -488,8 +477,6 @@
return $this->destroy(session_id());
}
Added: 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 (rev 0)
+++ trunk/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php 2016-05-15 15:06:47 UTC (rev 21376)
@@ -0,0 +1,11 @@
+--- 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
Property changes on: trunk/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list