Update to 1.4.1 release and remove obsolete suhosin patches.

7 files changed, 5 insertions, 207 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index acf079f3e54b..30df48c17a03 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	roundcube
-DISTVERSION=	1.3.10
+DISTVERSION=	1.4.1
 PORTEPOCH=	1
 CATEGORIES?=	mail www
 MASTER_SITES=	https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/
@@ -55,6 +55,7 @@ SUB_FILES=	newsyslog.conf
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -type f -delete
+	@${RMDIR} ${WRKSRC}/plugins/archive/skins/larry
 
 do-install:
 	-${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 4bd3bc6d3a8b..3da0231aa6a5 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571646677
-SHA256 (roundcubemail-1.3.10-complete.tar.gz) = 69fe11550a0f5711020ecd55c6ad36394580800a68d43bb69ecedc91f36ba8bf
-SIZE (roundcubemail-1.3.10-complete.tar.gz) = 5495189
+TIMESTAMP = 1574676723
+SHA256 (roundcubemail-1.4.1-complete.tar.gz) = 640423d21e1aa733ddea7462f156e194b051f086a3f2a70430e0aa2c9b09b44a
+SIZE (roundcubemail-1.4.1-complete.tar.gz) = 6998687
diff --git a/mail/roundcube/files/patch-INSTALL b/mail/roundcube/files/patch-INSTALL
deleted file mode 100644
index 360235252be1..000000000000
--- a/mail/roundcube/files/patch-INSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
---- INSTALL.orig	2017-06-26 20:56:47.000000000 +0200
-+++ INSTALL	2017-06-30 10:19:42.732739000 +0200
-@@ -30,7 +30,6 @@ REQUIREMENTS
-    - memory_limit > 16MB (increase as suitable to support large attachments)
-    - file_uploads enabled (for attachment upload features)
-    - session.auto_start disabled
--   - suhosin.session.encrypt disabled
-    - mbstring.func_overload disabled
- * A MySQL, PostgreSQL, MS SQL Server (2005 or newer), Oracle database
-   or SQLite support in PHP - with permission to create tables
diff --git a/mail/roundcube/files/patch-installer_check.php b/mail/roundcube/files/patch-installer_check.php
deleted file mode 100644
index 12468f20379c..000000000000
--- a/mail/roundcube/files/patch-installer_check.php
+++ /dev/null
@@ -1,10 +0,0 @@
---- installer/check.php.orig	2017-06-26 20:56:47.000000000 +0200
-+++ installer/check.php	2017-06-30 10:20:01.306208000 +0200
-@@ -43,7 +43,6 @@ $ini_checks = array(
-     'file_uploads'                  => 1,
-     'session.auto_start'            => 0,
-     'mbstring.func_overload'        => 0,
--    'suhosin.session.encrypt'       => 0,
- );
- 
- $optional_checks = array(
diff --git a/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php b/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php
deleted file mode 100644
index aa86fbdbad42..000000000000
--- a/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php
+++ /dev/null
@@ -1,10 +0,0 @@
---- program/lib/Roundcube/bootstrap.php.orig	2017-06-26 20:56:48.000000000 +0200
-+++ program/lib/Roundcube/bootstrap.php	2017-06-30 10:20:36.888301000 +0200
-@@ -35,7 +35,6 @@ $config = array(
- // check these additional ini settings if not called via CLI
- if (php_sapi_name() != 'cli') {
-     $config += array(
--        'suhosin.session.encrypt' => false,
-         'file_uploads'            => true,
-     );
- }
diff --git a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
deleted file mode 100644
index 6d050227d947..000000000000
--- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
+++ /dev/null
@@ -1,102 +0,0 @@
---- program/lib/Roundcube/rcube_session.php.orig	2017-06-26 20:56:48.000000000 +0200
-+++ program/lib/Roundcube/rcube_session.php	2017-06-30 10:20:36.890382000 +0200
-@@ -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
- 
-         // if there are cached vars, update store, else insert new data
-         if ($oldvars) {
--            $newvars = $this->_fixvars($vars, $oldvars);
-+            $newvars = $vars;
-             return $this->update($key, $newvars, $oldvars);
-         }
-         else {
-@@ -198,39 +197,6 @@ abstract class rcube_session
-     }
- 
-     /**
--     * Merge vars with old vars and apply unsets
--     */
--    protected 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[$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;
--            }
--        }
--
--        $this->unsets = array();
--        return $newvars;
--    }
--
--    /**
-      * Execute registered garbage collector routines
-      */
-     public function gc($maxlifetime)
-@@ -339,11 +305,6 @@ abstract class rcube_session
-         }
- 
-         $this->appends[] = $path;
--
--        // when overwriting a previously unset variable
--        if ($this->unsets[$path]) {
--            unset($this->unsets[$path]);
--        }
-     }
- 
-     /**
-@@ -358,8 +319,6 @@ abstract class rcube_session
-             return $this->destroy(session_id());
-         }
- 
--        $this->unsets[] = $var;
--
-         if (isset($_SESSION[$var])) {
-             unset($_SESSION[$var]);
-         }
-@@ -405,21 +364,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]);
--                }
--            }
-         }
-     }
- 
diff --git a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session_db.php b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session_db.php
deleted file mode 100644
index c0c71e76face..000000000000
--- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session_db.php
+++ /dev/null
@@ -1,71 +0,0 @@
---- program/lib/Roundcube/rcube_session_db.php.orig	2017-06-26 20:56:48.000000000 +0200
-+++ program/lib/Roundcube/rcube_session_db.php	2017-06-30 10:21:12.859240000 +0200
-@@ -32,6 +32,7 @@ class rcube_session_db extends rcube_ses
- {
-     private $db;
-     private $table_name;
-+    private $need_base64;
- 
-     /**
-      * @param Object $config
-@@ -39,6 +40,9 @@ class rcube_session_db extends rcube_ses
-     public function __construct($config)
-     {
-         parent::__construct($config);
-+        
-+        // base64 encode if suhosin is not enabled
-+        $this->need_base64 = ini_get("suhosin.session.encrypt") !== "1";
- 
-         // get db instance
-         $this->db = rcube::get_instance()->get_dbh();
-@@ -103,7 +107,7 @@ class rcube_session_db extends rcube_ses
-             $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;
- 
-             $this->db->reset();
-@@ -128,7 +132,7 @@ class rcube_session_db extends rcube_ses
-         $this->db->query("INSERT INTO {$this->table_name}"
-             . " (`sess_id`, `vars`, `ip`, `changed`)"
-             . " VALUES (?, ?, ?, $now)",
--            $key, base64_encode($vars), (string)$this->ip);
-+            $key, $this->_encode($vars), (string)$this->ip);
- 
-         return true;
-     }
-@@ -152,7 +156,7 @@ class rcube_session_db extends rcube_ses
-         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"
-@@ -175,4 +179,23 @@ class rcube_session_db extends rcube_ses
-             . date('Y-m-d H:i:s', time() - $this->gc_enabled)
-             . '; rows = ' . intval($this->db->affected_rows()));
-     }
-+
-+    private function _encode($vars)
-+    {
-+        if ($this->need_base64) {
-+            return base64_encode($vars);
-+        } else {
-+            return $vars;
-+        }
-+    }
-+
-+    private function _decode($vars) 
-+    {
-+        if ($this->need_base64) {
-+            return base64_decode($vars);
-+        } else {
-+            return $vars;
-+        }
-+    }
-+
- }