Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 May 2026 10:50:35 +0000
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: caabb2c24682 - main - mail/roundcube: update to 1.7.1 release
Message-ID:  <6a181dfb.3b0e7.11fd5fe7@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by ale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=caabb2c246827dd3fc7fa03e57770a12fff06a4a

commit caabb2c246827dd3fc7fa03e57770a12fff06a4a
Author:     Alex Dupre <ale@FreeBSD.org>
AuthorDate: 2026-05-28 10:44:48 +0000
Commit:     Alex Dupre <ale@FreeBSD.org>
CommitDate: 2026-05-28 10:50:32 +0000

    mail/roundcube: update to 1.7.1 release
    
    PR:             293172
    Submitted by:   brnrd
---
 mail/roundcube/Makefile                                  | 16 +++++++++-------
 mail/roundcube/distinfo                                  |  6 +++---
 mail/roundcube/files/patch-config_defaults.inc.php       |  8 ++++----
 ...hp => patch-program_lib_Roundcube_rcube__message.php} | 14 ++++++++------
 mail/roundcube/pkg-message                               | 16 +++++-----------
 5 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index aafd0ba8f328..383ce8d4b918 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	roundcube
-DISTVERSION=	1.6.15
+DISTVERSION=	1.7.1
 PORTEPOCH=	1
 CATEGORIES?=	mail www
 MASTER_SITES=	https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/
@@ -11,7 +11,7 @@ COMMENT=	Fully skinnable XHTML/CSS webmail written in PHP
 WWW=		https://roundcube.net/
 
 LICENSE=	GPLv3+
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/docs/LICENSE.md
 
 USES=		cpe php:web,flavors
 
@@ -19,9 +19,9 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}mail-${DISTVERSION}
 
-RCUBECOMP=	SQL config .htaccess index.php installer logs \
+RCUBECOMP=	SQL config index.php installer logs \
 		plugins program public_html skins temp vendor
-PORTDOCS=	CHANGELOG.md INSTALL README.md UPGRADING
+PORTDOCS=	CHANGELOG.md INSTALL.md README.md UPGRADING.md
 
 CPE_PRODUCT=	webmail
 CPE_VENDOR=	roundcube
@@ -55,6 +55,7 @@ SUB_FILES=	newsyslog.conf
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -type f -delete
+
 do-install:
 	-${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR}
@@ -74,9 +75,10 @@ do-install-NSC-on:
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/docs/INSTALL.md ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/docs/UPGRADING.md ${STAGEDIR}${DOCSDIR}/
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 90617a953770..a2827acec0f1 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1774937276
-SHA256 (roundcubemail-1.6.15-complete.tar.gz) = 48c9f212c77460132491f670abaf440b765c8276268349a690913764d26afbef
-SIZE (roundcubemail-1.6.15-complete.tar.gz) = 5872562
+TIMESTAMP = 1779617270
+SHA256 (roundcubemail-1.7.1-complete.tar.gz) = 1e0382bcefd627ab0b6285d3181ddfba5b444fdcf6d49f33f5ea15fbf97864ef
+SIZE (roundcubemail-1.7.1-complete.tar.gz) = 6335172
diff --git a/mail/roundcube/files/patch-config_defaults.inc.php b/mail/roundcube/files/patch-config_defaults.inc.php
index d01c5541211c..8998f98073ee 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	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
+--- config/defaults.inc.php.orig	2026-05-24 08:01:37 UTC
++++ config/defaults.inc.php
+@@ -1009,8 +1009,8 @@ $config['spellcheck_engine'] = 'googie';
  // You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
  $config['spellcheck_engine'] = 'googie';
  
@@ -9,5 +9,5 @@
 +// For a locally installed spellcheker, specify the URI to call it, for example:
 +// 'http://' . $_SERVER['HTTP_HOST'] . '/spellchecker.php?lang='
  // Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 or
- // the After the Deadline package from http://www.afterthedeadline.com.
+ // the After the Deadline package from https://www.afterthedeadline.com.
  // Leave empty to use the public API of service.afterthedeadline.com
diff --git a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php b/mail/roundcube/files/patch-program_lib_Roundcube_rcube__message.php
similarity index 50%
rename from mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
rename to mail/roundcube/files/patch-program_lib_Roundcube_rcube__message.php
index 889547b8d3a9..c83cc780cfde 100644
--- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
+++ b/mail/roundcube/files/patch-program_lib_Roundcube_rcube__message.php
@@ -1,12 +1,14 @@
---- program/lib/Roundcube/rcube_message.php.orig	2022-06-26 20:26:58 UTC
+--- program/lib/Roundcube/rcube_message.php.orig	2026-05-24 08:01:37 UTC
 +++ program/lib/Roundcube/rcube_message.php
-@@ -914,8 +914,7 @@ class rcube_message
-                 else if (
+@@ -1006,9 +1006,8 @@ class rcube_message
+                 elseif (
                      preg_match('/^(inline|attach)/', $mail_part->disposition)
                      || !empty($mail_part->headers['content-id'])
--                    || ($mail_part->filename &&
--                        (empty($mail_part->disposition) || preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
+-                    || ($mail_part->filename
+-                        && (empty($mail_part->disposition) || preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
+-                ) {
 +                    || $mail_part->filename
-                 ) {
++		) {
                      // skip apple resource forks
                      if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') {
+                         continue;
diff --git a/mail/roundcube/pkg-message b/mail/roundcube/pkg-message
index 0a5c8f0185c0..6f5481d11954 100644
--- a/mail/roundcube/pkg-message
+++ b/mail/roundcube/pkg-message
@@ -2,29 +2,23 @@
 { type: install
   message: <<EOM
 If this is a first installation of RoundCube you have to create
-a new database and a db user. Read INSTALL for detailed instructions.
+a new database and a db user. Read INSTALL.md for detailed instructions.
 EOM
 }
 { type: upgrade
   message: <<EOM
 If you already had a previous version of RoundCube installed,
 you should check your config files and DB schema are up-to-date.
-Read UPGRADING for detailed instructions.
+Read UPGRADING.md for detailed instructions.
 EOM
 }
 { type: upgrade
   maximum_version: "1.6.0"
   message: <<EOM
-Roundcube 1.6 has a number of breaking changes in the smtp, imap,
-ldap, and managesieve connection configuration. Check 
-https://roundcube.net/news/2022/07/28/roundcube-1.6.0-released for
+Roundcube 1.7 has a number of breaking changes. Check 
+https://roundcube.net/news/2026/05/10/roundcube-1.7.0-released for
 details.
- 
-Roundcube 1.6 no longer includes the "Classic" and "Larry" skins.
-The skins can be found as mail/rouncube-larry and
-mail/roundcube-classic ports.
-
-Read UPGRADING for detailed instructions.
+Read UPGRADING.md for detailed instructions.
 EOM
 }
 ]


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a181dfb.3b0e7.11fd5fe7>