mail/snappymail: Update to 2.35.3

* Add security/pecl-xxtea to RUN_DEPENDS.
* Replace REDIS_RUN_DEPENDS with REDIS_USE.

ChangLog:	https://github.com/the-djmaze/snappymail/releases/tag/v2.35.3
MFH:		2024Q1
(cherry picked from commit ff343ebc0123a7bc37bdfc6f0f34b4375edc5197)

4 files changed, 39 insertions, 18 deletions

diff --git a/mail/snappymail/Makefile b/mail/snappymail/Makefile
index 913fc2869dcc..5eaf1531556e 100644
--- a/mail/snappymail/Makefile
+++ b/mail/snappymail/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	snappymail
-DISTVERSION=	2.35.2
-PORTREVISION=	3
+DISTVERSION=	2.35.3
 CATEGORIES=	mail www
 MASTER_SITES=	https://github.com/the-djmaze/snappymail/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
@@ -12,7 +11,8 @@ WWW=		https://snappymail.eu/
 LICENSE=	AGPLv3
 
 RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}APCu>0:devel/pecl-APCu@${PHP_FLAVOR} \
-		${PECL_PKGNAMEPREFIX}uuid>0:devel/pecl-uuid@${PHP_FLAVOR}
+		${PECL_PKGNAMEPREFIX}uuid>0:devel/pecl-uuid@${PHP_FLAVOR} \
+		${PECL_PKGNAMEPREFIX}xxtea>0:security/pecl-xxtea@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 USE_PHP=	ctype curl dom fileinfo gd iconv intl mbstring phar simplexml \
@@ -34,7 +34,7 @@ GNUPG_RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}gnupg>0:security/pecl-gnupg@${PHP_FLAVOR
 LDAP_USE=		PHP=ldap
 MYSQL_USE=		PHP=pdo_mysql
 PGSQL_USE=		PHP=pdo_pgsql
-REDIS_RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}redis>0:databases/pecl-redis@${PHP_FLAVOR}
+REDIS_USE=		PHP=redis
 SQLITE3_USE=		PHP=pdo_sqlite
 
 do-install:
diff --git a/mail/snappymail/distinfo b/mail/snappymail/distinfo
index b6be3ef84e8d..c9a78cedac10 100644
--- a/mail/snappymail/distinfo
+++ b/mail/snappymail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709083175
-SHA256 (snappymail-2.35.2.tar.gz) = 684335227ec19ad88fcb4c4e81457ab08bcc9d7e9f69ce26484aebedd0768115
-SIZE (snappymail-2.35.2.tar.gz) = 5955815
+TIMESTAMP = 1710288915
+SHA256 (snappymail-2.35.3.tar.gz) = e2baf7746682e67d943269416b21e6ffbccb8e09250b7546ae799dfa9a8222a4
+SIZE (snappymail-2.35.3.tar.gz) = 5994829
diff --git a/mail/snappymail/files/patch-snappymail_v_2.35.2_app_libraries_RainLoop_Actions.php b/mail/snappymail/files/patch-snappymail_v_2.35.2_app_libraries_RainLoop_Actions.php
deleted file mode 100644
index 861cd117553e..000000000000
--- a/mail/snappymail/files/patch-snappymail_v_2.35.2_app_libraries_RainLoop_Actions.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- snappymail/v/2.35.2/app/libraries/RainLoop/Actions.php.orig	2024-03-08 05:14:45 UTC
-+++ snappymail/v/2.35.2/app/libraries/RainLoop/Actions.php
-@@ -668,7 +668,7 @@ class Actions
- 					$sPassword = \substr(\base64_encode(\random_bytes(16)), 0, 12);
- 					Utils::saveFile($passfile, $sPassword . "\n");
- //					\chmod($passfile, 0600);
--					$oConfig->SetPassword($sPassword);
-+					$oConfig->SetPassword(new \SnappyMail\SensitiveString($sPassword));
- 					$oConfig->Save();
- 				}
- 			}
diff --git a/mail/snappymail/pkg-plist b/mail/snappymail/pkg-plist
index 022f84797fa3..36da3a2ebc06 100644
--- a/mail/snappymail/pkg-plist
+++ b/mail/snappymail/pkg-plist
@@ -574,9 +574,21 @@
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/Sabre/Xml/Writer.php
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/Sabre/Xml/XmlDeserializable.php
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/Sabre/Xml/XmlSerializable.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/TNEFDecoder/LICENSE
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/TNEFDecoder/TNEFAttachment.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/TNEFDecoder/TNEFBuffer.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/TNEFDecoder/TNEFDate.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/TNEFDecoder/TNEFFile.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/TNEFDecoder/TNEFFileBase.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/TNEFDecoder/TNEFFileRTF.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/TNEFDecoder/TNEFMailinfo.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/TNEFDecoder/TNEFvCard.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/TNEFDecoder/constants.php
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/lessphp/LICENSE
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/lessphp/README.md
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/lessphp/lessc.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/polyfill/ctype.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/polyfill/intl.php
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/polyfill/php8.php
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/attachmentsaction.php
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/cookies.php
@@ -631,6 +643,26 @@
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/pgp/pgpinterface.php
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/qrcode.php
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/repository.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/controlsymbol.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/controlword.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/document.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/encoding.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/entity.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/fontinfo.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/group.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/groups/colortable.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/groups/destination.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/groups/filetable.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/groups/fonttable.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/groups/generator.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/groups/info.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/groups/listoverridetable.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/groups/listtable.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/groups/listtext.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/groups/pict.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/groups/stylesheet.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/htmlformatter.php
+%%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/rtf/text.php
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/sasl.php
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/sasl/cram.php
 %%WWWDIR%%/snappymail/v/%%VER%%/app/libraries/snappymail/sasl/login.php