diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 5d085458ae4d..5729c83999e0 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,135 +1,135 @@ PORTNAME= courier-imap -PORTVERSION= 5.3.1 +PORTVERSION= 5.3.2 PORTEPOCH= 2 CATEGORIES= mail MASTER_SITES= SF/courier/imap/${PORTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= IMAP (and POP3) server that provides access to Maildir mailboxes WWW= https://www.courier-mta.org/imap/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool LIB_DEPENDS= libcourier-unicode.so:devel/courier-unicode \ libcourierauth.so:security/courier-authlib-base \ libidn2.so:dns/libidn2 \ libpcre2-8.so:devel/pcre2 USES= compiler:c++11-lang gmake localbase:ldflags perl5 pkgconfig ssl \ tar:bzip2 USE_RC_SUBR= courier-imap-imapd courier-imap-imapd-ssl \ courier-imap-pop3d courier-imap-pop3d-ssl CONFLICTS= courier imap-uw panda-imap GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash MAKE_ENV:= ${CONFIGURE_ENV} ALL_TARGET= all makeimapaccess makedat SUB_FILES= pkg-message SUB_LIST= CONFDIR=${CONFDIR} # # options available: # # WITH_SYSLOG_FACILITY: The syslogfacility to use # OPTIONS_DEFINE= GDBM GNUTLS INOTIFY IPV6 TRASHQUOTA GNUTLS_DESC= Use GnuTLS instead of OpenSSL (Enables SNI) INOTIFY_DESC= Inotify support for IDLE command TRASHQUOTA_DESC= Include deleted mails in the quota .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" .endif CONFDIR?= ${PREFIX}/etc/${PORTNAME} USERDB?= ${PREFIX}/etc/userdb LIBEXECDIR?= ${PREFIX}/libexec/${PORTNAME} PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --localstatedir="${PREFIX}/var" \ --datadir=${DATADIR} \ --libexecdir=${LIBEXECDIR} \ --enable-workarounds-for-imap-client-bugs \ --enable-unicode \ --disable-root-check \ --with-locking-method=fcntl \ --with-notice=unicode GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_USES= pkgconfig INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify IPV6_CONFIGURE_OFF= --without-ipv6 TRASHQUOTA_CONFIGURE_ON=--with-trashquota .include .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif .if ${PORT_OPTIONS:MSYSLOG_FACILITY} CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY} .endif .if ${PORT_OPTIONS:MAUTH_USERDB} .if ${PORT_OPTIONS:MGDBM} CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB} LIB_DEPENDS+= libgdbm.so:databases/gdbm .else CONFIGURE_ARGS+=--with-db=db --with-userdb=${USERDB} .endif .endif EXTRA_DOCS= AUTHORS INSTALL NEWS \ libs/imap/ChangeLog \ libs/imap/README.proxy \ libs/maildir/README.imapkeywords.html \ libs/maildir/README.maildirfilter.html \ libs/maildir/README.maildirquota.txt \ libs/maildir/README.sharedfolders.txt \ libs/tcpd/README.couriertls \ post-patch: @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/libs/liblock/configure @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ -e 's|@LN_S@|${RLN}|' \ ${WRKSRC}/Makefile.in post-patch-INOTIFY-on: @${REINPLACE_CMD} -e 's|LIBS = @LIBS@|& -L${LOCALBASE}/lib -linotify -lpthread|' \ ${WRKSRC}/libs/maildir/Makefile.in \ ${WRKSRC}/libs/imap/Makefile.in post-configure-INOTIFY-on: @${ECHO_CMD} '#define HAVE_INOTIFY_INIT 1' >>${WRKSRC}/libs/maildir/config.h @${ECHO_CMD} '#define HAVE_INOTIFY_INIT1 1' >>${WRKSRC}/libs/maildir/config.h post-install: ${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/ .for i in imapd pop3d ${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} .for a in ${EXTRA_DOCS} ${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR} .endfor .include diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo index e1b9ff11335e..9cbebe48070b 100644 --- a/mail/courier-imap/distinfo +++ b/mail/courier-imap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1761325457 -SHA256 (courier-imap-5.3.1.tar.bz2) = 7c6f02b437c4dcc1b3e137ab543b5cc9f9e54f01bc74d6ca0509a3efb41ddaa6 -SIZE (courier-imap-5.3.1.tar.bz2) = 3732996 +TIMESTAMP = 1768306040 +SHA256 (courier-imap-5.3.2.tar.bz2) = 64451cb30705754a0cab3a3f72558154c82dad4ff25c432f2e0f46b03430f68a +SIZE (courier-imap-5.3.2.tar.bz2) = 3741883 diff --git a/mail/courier-imap/files/patch-libs_rfc2045_rfc2045.h b/mail/courier-imap/files/patch-libs_rfc2045_rfc2045.h deleted file mode 100644 index af387f7e7dd7..000000000000 --- a/mail/courier-imap/files/patch-libs_rfc2045_rfc2045.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/rfc2045/rfc2045.h.orig 2025-10-06 09:00:02 UTC -+++ libs/rfc2045/rfc2045.h -@@ -3224,7 +3224,7 @@ void rfc822::mime_decoder::decode( - - if (decode_header) - { -- typename rfc2045::entity::line_iter::headers< -+ typename rfc2045::entity::line_iter::template headers< - src_type> parser{e, src }; - - parser.name_lc=header_name_lc; diff --git a/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp.C b/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp.C deleted file mode 100644 index 649fadc8ea79..000000000000 --- a/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp.C +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/rfc2045/testsuitecpp.C.orig 2025-10-04 09:00:06 UTC -+++ libs/rfc2045/testsuitecpp.C -@@ -19,7 +19,7 @@ void testrfc2045line_iter_testset(int &testnum, test_t - auto b=s.begin(); - auto e=s.end(); - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::string_view::iterator, - std::string_view::iterator - > diff --git a/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp2.C b/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp2.C deleted file mode 100644 index 353465b17a71..000000000000 --- a/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp2.C +++ /dev/null @@ -1,29 +0,0 @@ ---- libs/rfc2045/testsuitecpp2.C.orig 2025-09-10 09:00:05 UTC -+++ libs/rfc2045/testsuitecpp2.C -@@ -217,7 +217,7 @@ void test3() - auto b=std::istreambuf_iterator{ss}; - auto e=std::istreambuf_iterator{}; - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::istreambuf_iterator, - std::istreambuf_iterator - > iter{b, e}; -@@ -310,7 +310,7 @@ void test4() - auto b=std::istreambuf_iterator{ss}; - auto e=std::istreambuf_iterator{}; - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::istreambuf_iterator, - std::istreambuf_iterator - > iter{b, e}; -@@ -488,7 +488,7 @@ void test5() - auto b=std::istreambuf_iterator{ss}; - auto e=std::istreambuf_iterator{}; - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::istreambuf_iterator, - std::istreambuf_iterator - > iter{b, e};