Attachment 171099 Details for Bug 210077 – patch

[patch] patch

rc.diff (text/plain), 7.88 KB, created by Kurt Jaeger on 2016-06-06 19:51:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2016-06-06 19:51:56 UTC

Size: 7.88 KB

patch

obsolete

>diff -r -u -N mail/roundcube/Makefile ../../home/pi/myp/mail/roundcube/Makefile
>--- mail/roundcube/Makefile	2016-05-12 21:31:20.823843000 +0200
>+++ ../../home/pi/myp/mail/roundcube/Makefile	2016-06-04 20:03:24.052092000 +0200
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/mail/roundcube/Makefile 414979 2016-05-11 08:20:00Z ale $
> 
> PORTNAME=	roundcube
>-DISTVERSION=	1.1.5
>+DISTVERSION=	1.2.0
> PORTEPOCH=	1
> CATEGORIES?=	mail www
> MASTER_SITES=	https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/
>@@ -23,10 +23,10 @@
> CPE_VENDOR=	roundcube
> 
> WANT_PHP_WEB=	yes
>-USE_PHP=	pcre mbstring session iconv dom xml json intl zip filter
>-IGNORE_WITH_PHP=70
>+USE_PHP=	pcre mbstring session iconv dom xml json intl zip filter openssl
>+#IGNORE_WITH_PHP=70
> 
>-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
>@@ -34,7 +34,6 @@
> 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)
>@@ -54,10 +53,6 @@
> USE_PHP+=	pdo_sqlite
> .endif
> 
>-.if ${PORT_OPTIONS:MSSL}
>-USE_PHP+=	openssl
>-.endif
>-
> .if ${PORT_OPTIONS:MLDAP}
> USE_PHP+=	ldap
> .endif
>diff -r -u -N mail/roundcube/distinfo ../../home/pi/myp/mail/roundcube/distinfo
>--- mail/roundcube/distinfo	2016-05-12 21:31:20.824986000 +0200
>+++ ../../home/pi/myp/mail/roundcube/distinfo	2016-06-04 19:59:33.631477000 +0200
>@@ -1,2 +1,3 @@
>-SHA256 (roundcubemail-1.1.5-complete.tar.gz) = 476a1d45b0592b2ad43e3e08cbc72e69ef31e33ed8a8f071f02e5a1ae3e7f334
>-SIZE (roundcubemail-1.1.5-complete.tar.gz) = 4581781
>+TIMESTAMP = 1465063173
>+SHA256 (roundcubemail-1.2.0-complete.tar.gz) = 574895da03b5ad78eaf0843a78e0c0ab734a9327b4ba47b72405b768cb2854cc
>+SIZE (roundcubemail-1.2.0-complete.tar.gz) = 3748290
>diff -r -u -N mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php ../../home/pi/myp/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
>--- mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php	2015-09-23 07:16:22.901799000 +0200
>+++ ../../home/pi/myp/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php	1970-01-01 01:00:00.000000000 +0100
>@@ -1,130 +0,0 @@
>---- 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;
>- 
>-     /**
>-      * 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) {
>--            $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 true;
>-     }
>- 
>- 
>--    /**
>--     * 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)) {
>--                // remove unset keys on oldvars
>--                foreach ((array)$this->unsets as $var) {
>--                    if (isset($a_oldvars[$var])) {
>--                        unset($a_oldvars[$var]);
>--                    }
>--                    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;
>--            }
>-+        if ($this->need_base64) {
>-+            return base64_encode($vars);
>-+        } else {
>-+            return $vars;
>-         }
>-+    }
>- 
>--        $this->unsets = array();
>--        return $newvars;
>-+
>-+    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);
>- 
>--        $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 @@
>-             return $this->destroy(session_id());
>-         }
>- 
>--        $this->unsets[] = $var;
>--
>-         if (isset($_SESSION[$var])) {
>-             unset($_SESSION[$var]);
>-         }
>diff -r -u -N mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php ../../home/pi/myp/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php
>--- mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php	2016-03-01 21:31:22.187124000 +0100
>+++ ../../home/pi/myp/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php	1970-01-01 01:00:00.000000000 +0100
>@@ -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

Actions: View | Diff

Attachments on bug 210077: 171099