git: 55ff2f583514 - main - mail/cyrus-imapd310: update to 3.10.1

From: Hajimu UMEMOTO <ume_at_FreeBSD.org>
Date: Wed, 22 Jan 2025 12:07:48 UTC
The branch main has been updated by ume:

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

commit 55ff2f583514c68dd6962b4a2789be507536c6f3
Author:     Hajimu UMEMOTO <ume@FreeBSD.org>
AuthorDate: 2025-01-22 11:59:12 +0000
Commit:     Hajimu UMEMOTO <ume@FreeBSD.org>
CommitDate: 2025-01-22 12:07:37 +0000

    mail/cyrus-imapd310: update to 3.10.1
    
    Relnotes:       https://www.cyrusimap.org/imap/download/release-notes/3.10/x/3.10.1.html
---
 mail/cyrus-imapd310/Makefile                    |  2 +-
 mail/cyrus-imapd310/distinfo                    |  6 +++---
 mail/cyrus-imapd310/files/patch-Makefile.in     |  8 ++++----
 mail/cyrus-imapd310/files/patch-sieve__interp.c | 16 ----------------
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/mail/cyrus-imapd310/Makefile b/mail/cyrus-imapd310/Makefile
index 457824493a45..eef17d7c6d09 100644
--- a/mail/cyrus-imapd310/Makefile
+++ b/mail/cyrus-imapd310/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cyrus-imapd
-DISTVERSION=	3.10.0
+DISTVERSION=	3.10.1
 PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
diff --git a/mail/cyrus-imapd310/distinfo b/mail/cyrus-imapd310/distinfo
index 3fe40a3bfae5..68b253a48ef4 100644
--- a/mail/cyrus-imapd310/distinfo
+++ b/mail/cyrus-imapd310/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1724066645
-SHA256 (cyrus-imapd-3.10.0.tar.gz) = bef0fefa776862629c17cdde268c9b8d17ae1ae6fd087a4c5e52524c66c33a23
-SIZE (cyrus-imapd-3.10.0.tar.gz) = 14953680
+TIMESTAMP = 1737543423
+SHA256 (cyrus-imapd-3.10.1.tar.gz) = 4f2245fbc5cd869959c53e98796ad45ceb6a836058034a43db0bb1f7b82d3530
+SIZE (cyrus-imapd-3.10.1.tar.gz) = 11497536
diff --git a/mail/cyrus-imapd310/files/patch-Makefile.in b/mail/cyrus-imapd310/files/patch-Makefile.in
index 2308f736fdf6..d75330d83038 100644
--- a/mail/cyrus-imapd310/files/patch-Makefile.in
+++ b/mail/cyrus-imapd310/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2020-06-22 03:08:46 UTC
+--- Makefile.in.orig	2025-01-22 02:01:14 UTC
 +++ Makefile.in
-@@ -2348,7 +2348,7 @@ com_err_et_libcyrus_com_err_la_CFLAGS = $(AM_CFLAGS) $
+@@ -2829,7 +2829,7 @@ LD_BASIC_ADD = lib/libcyrus.la lib/libcyrus_min.la ${L
  # MD5 algorithms, without needing SSL.  Currently we have no way of
  # minimally linking such code.
  LD_BASIC_ADD = lib/libcyrus.la lib/libcyrus_min.la ${LIBS} \
--	${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS)
-+	${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS) -lm
+-    ${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS)
++    ${LIB_SASL} $(SSL_LIBS) $(GCOV_LIBS) -lm
  
  
  # UTILITY is the libraries that utility programs which use Cyrus'
diff --git a/mail/cyrus-imapd310/files/patch-sieve__interp.c b/mail/cyrus-imapd310/files/patch-sieve__interp.c
deleted file mode 100644
index 19969d7d3683..000000000000
--- a/mail/cyrus-imapd310/files/patch-sieve__interp.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- sieve/interp.c.orig	2023-12-01 06:24:31 UTC
-+++ sieve/interp.c
-@@ -749,11 +749,13 @@ unsigned long long extension_isactive(sieve_interp_t *
-               (config_ext & IMAP_ENUM_SIEVE_EXTENSIONS_VND_CYRUS_LOG))) capa = 0;
-         break;
- 
-+#ifdef WITH_JMAP
-     case SIEVE_CAPA_JMAPQUERY:
-         if (!(interp->jmapquery &&
-               (config_ext & IMAP_ENUM_SIEVE_EXTENSIONS_VND_CYRUS_JMAPQUERY)))
-             capa = 0;
-         break;
-+#endif
- 
-     case SIEVE_CAPA_SNOOZE:
-         if (!(interp->snooze &&