4 files changed, 9 insertions, 38 deletions

diff --git a/mail/rainloop/Makefile b/mail/rainloop/Makefile
index 1f2dfc496013..177c67977bcb 100644
--- a/mail/rainloop/Makefile
+++ b/mail/rainloop/Makefile
@@ -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
diff --git a/mail/rainloop/distinfo b/mail/rainloop/distinfo
index 297bf5510086..6debd09e99f7 100644
--- a/mail/rainloop/distinfo
+++ b/mail/rainloop/distinfo
@@ -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
diff --git a/mail/rainloop/files/patch-rainloop_v_1.16.0_app_libraries_MailSo_Base_HtmlUtils.php b/mail/rainloop/files/patch-rainloop_v_1.16.0_app_libraries_MailSo_Base_HtmlUtils.php
deleted file mode 100644
index 210cee2adc56..000000000000
--- a/mail/rainloop/files/patch-rainloop_v_1.16.0_app_libraries_MailSo_Base_HtmlUtils.php
+++ /dev/null
@@ -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);

diff --git a/mail/rainloop/pkg-plist b/mail/rainloop/pkg-plist
index 657af3e93d16..57ed5c1d5daf 100644
--- a/mail/rainloop/pkg-plist
+++ b/mail/rainloop/pkg-plist
@@ -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