git: cf4139215905 - main - mail/cyrus-imapd32: Update to 3.2.12.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 15 Mar 2024 13:58:41 UTC
The branch main has been updated by ume:
URL: https://cgit.FreeBSD.org/ports/commit/?id=cf41392159057f38a322a35434f9155fe744d992
commit cf41392159057f38a322a35434f9155fe744d992
Author: Hajimu UMEMOTO <ume@FreeBSD.org>
AuthorDate: 2024-03-15 13:56:32 +0000
Commit: Hajimu UMEMOTO <ume@FreeBSD.org>
CommitDate: 2024-03-15 13:58:16 +0000
mail/cyrus-imapd32: Update to 3.2.12.
Relnotes: https://www.cyrusimap.org/3.2/imap/download/release-notes/3.2/x/3.2.12.html
---
mail/cyrus-imapd32/Makefile | 33 ++++++++++++++++++----------
mail/cyrus-imapd32/distinfo | 6 ++---
mail/cyrus-imapd32/files/patch-lib__assert.h | 24 ++++++++++++++++++++
mail/cyrus-imapd32/files/patch-lib_assert.h | 24 --------------------
4 files changed, 49 insertions(+), 38 deletions(-)
diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile
index 48b417110603..3feb470cd6dd 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
-PORTVERSION= 3.2.11
-PORTREVISION= 5
+PORTVERSION= 3.2.12
+PORTREVISION= 0
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= 32
@@ -17,7 +17,6 @@ BROKEN_riscv64= fails to build: lib/chartable.c: Error 1
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libpcre.so:devel/pcre \
libuuid.so:misc/e2fsprogs-libuuid
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[013-] cyrus-imapd3[013-]-http
@@ -48,8 +47,8 @@ CPE_VENDOR= cmu
CPE_PRODUCT= cyrus_imap_server
OPTIONS_DEFINE= AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP MURDER \
- MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT SRS \
- XAPIAN DOCS
+ MYSQL NNTP PCRE2 PGSQL REPLICATION SNMP SQLITE SQUAT \
+ SRS XAPIAN DOCS
OPTIONS_DEFAULT= AUTOCREATE IDLED SQLITE SQUAT SRS
OPTIONS_SUB= yes
AUTOCREATE_DESC= Enable autocreate support
@@ -82,6 +81,11 @@ MYSQL_USES= mysql
MYSQL_CONFIGURE_WITH= mysql
NNTP_DESC= Enable NNTP support
NNTP_CONFIGURE_ENABLE= nntp
+PCRE2_DESC= Use PCRE2 rather than PCRE
+PCRE2_LIB_DEPENDS= libpcre2-posix.so:devel/pcre2
+PCRE2_LIB_DEPENDS_OFF= libpcre.so:devel/pcre
+PCRE2_CONFIGURE_ON= --disable-pcre
+PCRE2_CONFIGURE_OFF= --disable-pcre2
PGSQL_USES= pgsql
PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE}
REPLICATION_DESC= Enable replication (experimental)
@@ -136,16 +140,19 @@ CYRUS_USER?= cyrus
CYRUS_GROUP?= cyrus
MAN_MAN1= httptest imtest installsieve lmtptest mupdatetest nntptest \
- pop3test sieveshell sivtest smtptest
+ pop3test sieveshell sivtest smtptest synctest
MAN_MAN3= imclient
MAN_MAN5= cyrus.conf imapd.conf krb.equiv
CYRUS_MAN8= arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
- ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb cyr_backup \
- cyr_buildinfo cyr_dbtool cyr_deny cyr_df cyr_expire cyr_info \
- cyr_synclog cyr_virusscan deliver fud idled imapd ipurge lmtpd \
- master mbexamine mbpath mbtool notifyd pop3d quota reconstruct \
- restore smmapd timsieved tls_prune unexpunge
+ ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb \
+ cvt_xlist_specialuse cyr_backup cyr_buildinfo cyr_dbtool \
+ cyr_deny cyr_df cyr_expire cyr_info cyr_synclog cyr_userseen \
+ cyr_virusscan cyradm cyrdump deliver fud idled imapd ipurge \
+ lmtpd lmtpproxyd master mbexamine mbpath mbtool notifyd pop3d \
+ pop3proxyd promstatsd proxyd ptdump ptexpire ptloader quota \
+ reconstruct restore sievec sieved smmapd timsieved tls_prune \
+ unexpunge
CYRUS_PERL_MAN1=cyradm
CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \
@@ -166,10 +173,14 @@ CONFIGURE_ARGS+=--disable-gssapi
.if ${PORT_OPTIONS:MHTTP}
CYRUS_MAN8+= ctl_zoneinfo httpd
+MAN_MAN1+= dav_reconstruct
.endif
.if ${PORT_OPTIONS:MNNTP}
CYRUS_MAN8+= fetchnews nntpd
.endif
+.if ${PORT_OPTIONS:MMURDER}
+CYRUS_MAN8+= mupdate
+.endif
.if ${PORT_OPTIONS:MREPLICATION}
CYRUS_MAN8+= sync_client sync_reset sync_server
.endif
diff --git a/mail/cyrus-imapd32/distinfo b/mail/cyrus-imapd32/distinfo
index f33d2742cfd3..81a1d572cbf7 100644
--- a/mail/cyrus-imapd32/distinfo
+++ b/mail/cyrus-imapd32/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676286029
-SHA256 (cyrus-imapd-3.2.11.tar.gz) = 4d81968ce3b912bc586917c18d2daed20552031fff49e4a46d51500ca27b219b
-SIZE (cyrus-imapd-3.2.11.tar.gz) = 12974633
+TIMESTAMP = 1710508225
+SHA256 (cyrus-imapd-3.2.12.tar.gz) = eeb20905eb5e9cc019fcd65ef88567cb4e869a7e5c170acb4b67211a5dbdbf53
+SIZE (cyrus-imapd-3.2.12.tar.gz) = 13072645
diff --git a/mail/cyrus-imapd32/files/patch-lib__assert.h b/mail/cyrus-imapd32/files/patch-lib__assert.h
new file mode 100644
index 000000000000..f12c6fe0729a
--- /dev/null
+++ b/mail/cyrus-imapd32/files/patch-lib__assert.h
@@ -0,0 +1,24 @@
+--- lib/assert.h.orig 2024-03-12 23:12:10 UTC
++++ lib/assert.h
+@@ -43,11 +43,21 @@
+ #ifndef INCLUDED_ASSERT_H
+ #define INCLUDED_ASSERT_H
+
++#ifndef PERL_POLLUTE
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ void assertionfailed(const char *file, int line, const char *expr);
+
+ #define assert(expr) \
+ ((expr) \
+ ? (void)(0) \
+ : assertionfailed(__FILE__, __LINE__, #expr))
++
++#ifdef __cplusplus
++}
++#endif
++#endif
+
+ #endif /* INCLUDED_ASSERT_H */
diff --git a/mail/cyrus-imapd32/files/patch-lib_assert.h b/mail/cyrus-imapd32/files/patch-lib_assert.h
deleted file mode 100644
index d08160833f7c..000000000000
--- a/mail/cyrus-imapd32/files/patch-lib_assert.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- lib/assert.h.orig 2023-02-12 23:06:46 UTC
-+++ lib/assert.h
-@@ -43,11 +43,21 @@
- #ifndef INCLUDED_ASSERT_H
- #define INCLUDED_ASSERT_H
-
-+#ifndef PERL_POLLUTE
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #ifdef __STDC__
- #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);}
- void assertionfailed(const char *file, int line, const char *expr);
- #else
- #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
- #endif
-
- #endif /* INCLUDED_ASSERT_H */