diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile index aafd0ba8f328..383ce8d4b918 100644 --- a/mail/roundcube/Makefile +++ b/mail/roundcube/Makefile @@ -1,89 +1,91 @@ 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}/ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} DISTNAME= ${PORTNAME}mail-${DISTVERSION}-complete MAINTAINER= ale@FreeBSD.org 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 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 USE_PHP= mbstring session iconv dom xml intl zip filter fileinfo exif ctype OPTIONS_DEFINE= LDAP GD PSPELL NSC DOCS EXAMPLES OPTIONS_MULTI= DB OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE OPTIONS_DEFAULT=MYSQL DB_DESC= Database backend MYSQL_DESC= Use MySQL backend PGSQL_DESC= Use PostgreSQL backend SQLITE_DESC= Use SQLite backend LDAP_DESC= Enable LDAP support (address book) GD_DESC= Enable GD support (image conversion) PSPELL_DESC= Enable PSpell support (internal spellcheck) NSC_DESC= Install network spellchecker GD_VARS= use_php+=gd LDAP_VARS= use_php+=ldap MYSQL_VARS= use_php+=pdo_mysql NSC_IMPLIES= PSPELL NSC_VARS= use_php+=simplexml PGSQL_VARS= use_php+=pdo_pgsql PSPELL_VARS= use_php+=pspell SQLITE_VARS= use_php+=pdo_sqlite 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} .for i in ${RCUBECOMP} @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR} .endfor @(cd ${WRKSRC}; ${FIND} bin ${RCUBECOMP} -not -type d) | ${SORT} | \ ${SED} -ne 's,^,${WWWDIR_REL}/,p' >> ${TMPPLIST} @${ECHO_CMD} '@postexec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/logs' \ >> ${TMPPLIST} @${ECHO_CMD} '@postexec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/temp' \ >> ${TMPPLIST} do-install-NSC-on: @${INSTALL_DATA} ${FILESDIR}/spellchecker.php ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '${WWWDIR_REL}/spellchecker.php' >> ${TMPPLIST} 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} ${INSTALL_DATA} ${WRKDIR}/newsyslog.conf ${STAGEDIR}${EXAMPLESDIR} @${ECHO_CMD} '@dir etc/newsyslog.conf.d' \ >> ${TMPPLIST} @${ECHO_CMD} '@sample ${EXAMPLESDIR}/newsyslog.conf etc/newsyslog.conf.d/roundcube.conf' \ >> ${TMPPLIST} .include 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,13 +1,13 @@ ---- 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'; -// For locally installed Nox Spell Server or After the Deadline services, -// please specify the URI to call it. +// 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 @@ -1,30 +1,24 @@ [ { type: install message: <