mail/roundcube: update 1.2.5 -> 1.3.0

PR:		220317
Submitted by:	ler, ale
Approved by:	ale
Relnotes: https://roundcube.net/news/2017/06/26/roundcube-webmail-1.3.0-released

9 files changed, 39 insertions, 39 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 7de4a041118a..809faaff19cb 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	roundcube
-DISTVERSION=	1.2.5
+DISTVERSION=	1.3.0
 PORTEPOCH=	1
 CATEGORIES?=	mail www
 MASTER_SITES=	https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/
@@ -17,7 +17,7 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}mail-${DISTVERSION}
 
 RCUBECOMP=	SQL config .htaccess index.php installer logs \
-		plugins program robots.txt skins temp vendor
+		plugins program skins temp vendor
 PORTDOCS=	CHANGELOG INSTALL README.md UPGRADING
 
 USES=		cpe php:web
@@ -63,9 +63,9 @@ do-install:
 .endfor
 	@(cd ${WRKSRC}; ${FIND} bin ${RCUBECOMP} -not -type d) | ${SORT} | \
 		${SED} -ne 's,^,${WWWDIR_REL}/,p' >> ${TMPPLIST}
-	@${ECHO_CMD} '@exec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/logs' \
+	@${ECHO_CMD} '@postexec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/logs' \
 		>> ${TMPPLIST}
-	@${ECHO_CMD} '@exec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/temp' \
+	@${ECHO_CMD} '@postexec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/temp' \
 		>> ${TMPPLIST}
 
 do-install-DOCS-on:
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 5d9afae281c3..a28f1fbf2dbb 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497032006
-SHA256 (roundcubemail-1.2.5-complete.tar.gz) = 5494f0a29ff1bc8542c6efc70fa3c35bba6229aebb9cd0d086fd552cb10bf4f3
-SIZE (roundcubemail-1.2.5-complete.tar.gz) = 3900925
+TIMESTAMP = 1498605012
+SHA256 (roundcubemail-1.3.0-complete.tar.gz) = a9c4d084716482171b23216d57ad9dafd85bd34f1eee73824c62327fc22b995a
+SIZE (roundcubemail-1.3.0-complete.tar.gz) = 6158919
diff --git a/mail/roundcube/files/patch-INSTALL b/mail/roundcube/files/patch-INSTALL
index 74ed2089ea67..360235252be1 100644
--- a/mail/roundcube/files/patch-INSTALL
+++ b/mail/roundcube/files/patch-INSTALL
@@ -1,10 +1,10 @@
---- INSTALL.orig	2016-05-22 11:06:47 UTC
-+++ INSTALL
-@@ -29,7 +29,6 @@ REQUIREMENTS
+--- 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
-    - magic_quotes_runtime disabled
-    - magic_quotes_sybase 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-config_defaults.inc.php b/mail/roundcube/files/patch-config_defaults.inc.php
index e160af1c640e..d01c5541211c 100644
--- a/mail/roundcube/files/patch-config_defaults.inc.php
+++ b/mail/roundcube/files/patch-config_defaults.inc.php
@@ -1,6 +1,6 @@
---- config/defaults.inc.php.orig	2016-05-22 11:06:45 UTC
-+++ config/defaults.inc.php
-@@ -717,8 +717,8 @@ $config['spellcheck_dictionary'] = false
+--- config/defaults.inc.php.orig	2017-06-26 20:56:47.000000000 +0200
++++ config/defaults.inc.php	2017-06-30 10:19:42.733949000 +0200
+@@ -739,8 +739,8 @@ $config['spellcheck_dictionary'] = false
  // You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
  $config['spellcheck_engine'] = 'googie';
  
diff --git a/mail/roundcube/files/patch-installer_check.php b/mail/roundcube/files/patch-installer_check.php
index 769cd38a3b0e..12468f20379c 100644
--- a/mail/roundcube/files/patch-installer_check.php
+++ b/mail/roundcube/files/patch-installer_check.php
@@ -1,10 +1,10 @@
---- installer/check.php.orig	2016-05-22 11:06:45 UTC
-+++ installer/check.php
+--- 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,
-     'magic_quotes_runtime'          => 0,
-     'magic_quotes_sybase'           => 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
index 43647c39860b..aa86fbdbad42 100644
--- a/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php
+++ b/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php
@@ -1,6 +1,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(
+--- 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(
diff --git a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
index 5c657f567fd8..d260db921a29 100644
--- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
+++ b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
@@ -1,6 +1,6 @@
---- 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
+--- program/lib/Roundcube/rcube_message.php.orig	2017-06-26 20:56:48.000000000 +0200
++++ program/lib/Roundcube/rcube_message.php	2017-06-30 10:20:36.889381000 +0200
+@@ -830,9 +830,7 @@ class rcube_message
                  }
                  // part is a file/attachment
                  else if (preg_match('/^(inline|attach)/', $mail_part->disposition) ||
diff --git a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
index 79c184372da4..6d050227d947 100644
--- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
+++ b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
@@ -1,5 +1,5 @@
---- program/lib/Roundcube/rcube_session.php.orig	2016-05-22 11:06:47 UTC
-+++ program/lib/Roundcube/rcube_session.php
+--- 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;
@@ -17,7 +17,7 @@
              return $this->update($key, $newvars, $oldvars);
          }
          else {
-@@ -180,39 +179,6 @@ abstract class rcube_session
+@@ -198,39 +197,6 @@ abstract class rcube_session
      }
  
      /**
@@ -57,7 +57,7 @@
       * Execute registered garbage collector routines
       */
      public function gc($maxlifetime)
-@@ -321,11 +287,6 @@ abstract class rcube_session
+@@ -339,11 +305,6 @@ abstract class rcube_session
          }
  
          $this->appends[] = $path;
@@ -69,7 +69,7 @@
      }
  
      /**
-@@ -340,8 +301,6 @@ abstract class rcube_session
+@@ -358,8 +319,6 @@ abstract class rcube_session
              return $this->destroy(session_id());
          }
  
@@ -78,7 +78,7 @@
          if (isset($_SESSION[$var])) {
              unset($_SESSION[$var]);
          }
-@@ -387,21 +346,6 @@ abstract class rcube_session
+@@ -405,21 +364,6 @@ abstract class rcube_session
  
          if ($data) {
              session_decode($data);
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
index e2fd17ca5d7e..c0c71e76face 100644
--- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session_db.php
+++ b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session_db.php
@@ -1,5 +1,5 @@
---- program/lib/Roundcube/rcube_session_db.php.orig	2016-05-22 11:06:47 UTC
-+++ program/lib/Roundcube/rcube_session_db.php
+--- 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;
@@ -26,17 +26,17 @@
 +            $this->vars      = $this->_decode($sql_arr['vars']);
              $this->key       = $key;
  
-             return !empty($this->vars) ? (string) $this->vars : '';
-@@ -126,7 +130,7 @@ class rcube_session_db extends rcube_ses
+             $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`, `created`, `changed`)"
-             . " VALUES (?, ?, ?, $now, $now)",
+             . " (`sess_id`, `vars`, `ip`, `changed`)"
+             . " VALUES (?, ?, ?, $now)",
 -            $key, base64_encode($vars), (string)$this->ip);
 +            $key, $this->_encode($vars), (string)$this->ip);
  
          return true;
      }
-@@ -150,7 +154,7 @@ class rcube_session_db extends rcube_ses
+@@ -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` = ?",
@@ -45,7 +45,7 @@
          }
          else if ($ts - $this->changed + $this->time_diff > $this->lifetime / 2) {
              $this->db->query("UPDATE {$this->table_name} SET `changed` = $now"
-@@ -173,4 +177,23 @@ class rcube_session_db extends rcube_ses
+@@ -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()));
      }