mail/rainloop: Update to 1.17.0

Since only one edition "legacy" is provided under MIT license now,

* Remove mail/rainloop-community port and add entry to MOVED and
  UPDATING.
* Use '=' rather than '?=' for PKGNAMESUFFIX and COMMENT.
* Update license information.
* Remove patch-rainloop_v_1.16.0_app_libraries_MailSo_Base_HtmlUtils.php
  that is included in upstream.
This commit is contained in:
Yasuhiro Kimura 2022-09-01 11:00:07 +09:00
commit 37412b8aa3

1
MOVED
View file

@ -17542,3 +17542,4 @@ print/py-pdf|print/py-pypdf|2022-08-27|Rename to match upstream naming
shells/ksh93-devel|shells/ksh-devel|2022-08-28|Development has resumed under a new GH account
devel/boehm-gc-redirect||2022-08-29|No consumer in ports tree
devel/libthreader|devel/libthreadar|2022-08-29|Fix directory name
mail/rainloop-community|mail/rainloop|2022-09-01|Only one edition "legacy" is provided now

View file

@ -5,6 +5,15 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20220901:
AFFECTS: user of mail/rainloop-community
AUTHOR: yasu@FreeBSD.org
Since 1.17.0 upstream distributes only one edition "lagacy" under MIT license
and mail/rainloop-community is remove as a result. So please uninstall
mail/rainloop-community (rainloop-community-phpXY) and install mail/rainloop
(rainloop-phpXY) instead.
20220831:
AFFECTS: users of x11/xscreensaver on 13.1-RELEASE
AUTHOR: zirias@FreeBSD.org

View file

@ -547,7 +547,6 @@
SUBDIR += queue-fix
SUBDIR += queue-repair
SUBDIR += rainloop
SUBDIR += rainloop-community
SUBDIR += ratelimit-policyd
SUBDIR += raysfilter
SUBDIR += razor-agents

View file

@ -1,15 +0,0 @@
PORTNAME= rainloop
DISTVERSIONPREFIX= community-
PKGNAMESUFFIX= -community${PHP_PKGNAMESUFFIX}
COMMENT= Modern and interactive webmail - community edition
LICENSE= AGPLv3
CONFLICTS_INSTALL= rainloop
MASTERDIR= ${.CURDIR}/../rainloop
PLIST= ${.CURDIR}/pkg-plist
DISTINFO_FILE= ${.CURDIR}/distinfo
.include "${MASTERDIR}/Makefile"

View file

@ -1,3 +0,0 @@
TIMESTAMP = 1620351685
SHA256 (rainloop-community-1.16.0.zip) = db949c4363b048a02eaa0f06a26a8386979b8734198c2939ee1e8cc54362ca67
SIZE (rainloop-community-1.16.0.zip) = 7065219

View file

@ -1,11 +0,0 @@
Modern user interface.
Complete support of IMAP and SMTP protocols including SSL and STARTTLS.
Minimalistic resources requirements.
Direct access to mail server is used (mails are not stored locally
on web server).
Allows for adding multiple accounts to primary one, simultaneous
access to different accounts in different browser tabs is supported.
Additional identities.
Administrative panel for configuring main options...
WWW: http://rainloop.net/

File diff suppressed because it is too large Load diff

View file

@ -1,20 +1,14 @@
PORTNAME= rainloop
DISTVERSION= 1.16.0
PORTREVISION= 2
DISTVERSIONPREFIX= legacy-
DISTVERSION= 1.17.0
CATEGORIES= mail www
MASTER_SITES= https://github.com/RainLoop/rainloop-webmail/releases/download/v${PORTVERSION}/
PKGNAMESUFFIX?= ${PHP_PKGNAMESUFFIX}
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
MAINTAINER= yasu@FreeBSD.org
COMMENT?= Modern and interactive webmail
COMMENT= Modern and interactive webmail
.if "${PKGNAMESUFFIX}" == "${PHP_PKGNAMESUFFIX}"
LICENSE= RainLoop
LICENSE_NAME= RainLoop Software License
LICENSE_TEXT= License can be found at: http://www.rainloop.net/licensing/
# Redistribution in any form is prohibited
LICENSE_PERMS= auto-accept
.endif
LICENSE= MIT
USES= php:web,flavors zip
USE_PHP= curl dom iconv json openssl pcre simplexml spl xml zlib

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1620351668
SHA256 (rainloop-1.16.0.zip) = 6980b0a85aa124479a927e11d0c50319c4a9f8ce3b25b6c2adb61a30bf1a792b
SIZE (rainloop-1.16.0.zip) = 7076180
TIMESTAMP = 1661986471
SHA256 (rainloop-legacy-1.17.0.zip) = 782dcabacadab5d7176f7701dd23319a040b2cfbf974fac6df068600cf69c50a
SIZE (rainloop-legacy-1.17.0.zip) = 7052808

View file

@ -1,21 +0,0 @@
--- rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php.orig 2021-05-06 11:04:36 UTC
+++ rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php
@@ -239,7 +239,8 @@ class HtmlUtils
$oWrapHtml->setAttribute($sKey, $sValue);
}
- $oWrapDom = $oDom->createElement('div', '___xxx___');
+ $rand_str = base64_encode(random_bytes(32));
+ $oWrapDom = $oDom->createElement('div', $rand_str);
$oWrapDom->setAttribute('data-x-div-type', 'body');
foreach ($aBodylAttrs as $sKey => $sValue)
{
@@ -250,7 +251,7 @@ class HtmlUtils
$sWrp = $oDom->saveHTML($oWrapHtml);
- $sResult = \str_replace('___xxx___', $sResult, $sWrp);
+ $sResult = \str_replace($rand_str, $sResult, $sWrp);
}
$sResult = \str_replace(\MailSo\Base\HtmlUtils::$KOS, ':', $sResult);

View file

@ -632,7 +632,6 @@
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionsType.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters/FiltersInterface.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Prem.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Settings.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Settings/ISettings.php
@ -649,6 +648,7 @@
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/TwoFactorAuth/AbstractTwoFactorAuth.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/TwoFactorAuth/GoogleTwoFactorAuth.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/TwoFactorAuth/TwoFactorAuthInterface.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Providers/Version.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Service.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/ServiceActions.php
%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/RainLoop/Settings.php
@ -1160,7 +1160,6 @@
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/AdminSettingsDomainListItem.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/AdminSettingsDomains.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/AdminSettingsGeneral.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/AdminSettingsLicensing.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/AdminSettingsLogin.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/AdminSettingsPackages.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/AdminSettingsPackagesListItem.html
@ -1170,7 +1169,6 @@
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/AdminSettingsPlugins.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/AdminSettingsSecurity.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/AdminSettingsSocial.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/PopupsActivate.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/PopupsDomain.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/PopupsDomainAlias.html
%%WWWDIR%%/rainloop/v/%%VER%%/app/templates/Views/Admin/PopupsPlugin.html