Date: Wed, 16 Aug 2017 10:58:13 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448031 - in head/mail/roundcube: . files Message-ID: <201708161058.v7GAwDeW085944@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Wed Aug 16 10:58:12 2017 New Revision: 448031 URL: https://svnweb.freebsd.org/changeset/ports/448031 Log: 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 Modified: head/mail/roundcube/Makefile head/mail/roundcube/distinfo head/mail/roundcube/files/patch-INSTALL head/mail/roundcube/files/patch-config_defaults.inc.php head/mail/roundcube/files/patch-installer_check.php head/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session_db.php Modified: head/mail/roundcube/Makefile ============================================================================== --- head/mail/roundcube/Makefile Wed Aug 16 09:23:01 2017 (r448030) +++ head/mail/roundcube/Makefile Wed Aug 16 10:58:12 2017 (r448031) @@ -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: Modified: head/mail/roundcube/distinfo ============================================================================== --- head/mail/roundcube/distinfo Wed Aug 16 09:23:01 2017 (r448030) +++ head/mail/roundcube/distinfo Wed Aug 16 10:58:12 2017 (r448031) @@ -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 Modified: head/mail/roundcube/files/patch-INSTALL ============================================================================== --- head/mail/roundcube/files/patch-INSTALL Wed Aug 16 09:23:01 2017 (r448030) +++ head/mail/roundcube/files/patch-INSTALL Wed Aug 16 10:58:12 2017 (r448031) @@ -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 Modified: head/mail/roundcube/files/patch-config_defaults.inc.php ============================================================================== --- head/mail/roundcube/files/patch-config_defaults.inc.php Wed Aug 16 09:23:01 2017 (r448030) +++ head/mail/roundcube/files/patch-config_defaults.inc.php Wed Aug 16 10:58:12 2017 (r448031) @@ -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'; Modified: head/mail/roundcube/files/patch-installer_check.php ============================================================================== --- head/mail/roundcube/files/patch-installer_check.php Wed Aug 16 09:23:01 2017 (r448030) +++ head/mail/roundcube/files/patch-installer_check.php Wed Aug 16 10:58:12 2017 (r448031) @@ -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( Modified: head/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php ============================================================================== --- head/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php Wed Aug 16 09:23:01 2017 (r448030) +++ head/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php Wed Aug 16 10:58:12 2017 (r448031) @@ -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( Modified: head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php ============================================================================== --- head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php Wed Aug 16 09:23:01 2017 (r448030) +++ head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php Wed Aug 16 10:58:12 2017 (r448031) @@ -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) || Modified: head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php ============================================================================== --- head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php Wed Aug 16 09:23:01 2017 (r448030) +++ head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php Wed Aug 16 10:58:12 2017 (r448031) @@ -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); Modified: head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session_db.php ============================================================================== --- head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session_db.php Wed Aug 16 09:23:01 2017 (r448030) +++ head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session_db.php Wed Aug 16 10:58:12 2017 (r448031) @@ -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())); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708161058.v7GAwDeW085944>