diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile index 5479a380c04c..bc30e0de3913 100644 --- a/mail/dovecot-fts-xapian/Makefile +++ b/mail/dovecot-fts-xapian/Makefile @@ -1,31 +1,30 @@ PORTNAME= fts-xapian -DISTVERSION= 1.4.9 -DISTVERSIONSUFFIX= b +DISTVERSION= 1.4.10 CATEGORIES= mail PKGNAMEPREFIX= dovecot- MAINTAINER= otis@FreeBSD.org COMMENT= Dovecot FTS plugin based on Xapian LICENSE= LGPL21 BUILD_DEPENDS= dovecot>=2.3.7:mail/dovecot LIB_DEPENDS= libicuuc.so:devel/icu \ libxapian.so:databases/xapian-core RUN_DEPENDS= dovecot>=2.3.7:mail/dovecot USES= autoreconf compiler:c++11-lang libtool pkgconfig USE_GITHUB= yes GH_ACCOUNT= grosjo USE_LDCONFIG= yes GNU_CONFIGURE= yes PLIST_FILES= lib/dovecot/lib21_fts_xapian_plugin.a \ lib/dovecot/lib21_fts_xapian_plugin.so post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_xapian_plugin.so .include diff --git a/mail/dovecot-fts-xapian/distinfo b/mail/dovecot-fts-xapian/distinfo index a5699d483a66..ee311af99b94 100644 --- a/mail/dovecot-fts-xapian/distinfo +++ b/mail/dovecot-fts-xapian/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619805639 -SHA256 (grosjo-fts-xapian-1.4.9b_GH0.tar.gz) = d610cbd2e7b16a43fa27179494a9df4506e94612ba99a25839094e6aae033570 -SIZE (grosjo-fts-xapian-1.4.9b_GH0.tar.gz) = 278187 +TIMESTAMP = 1625002292 +SHA256 (grosjo-fts-xapian-1.4.10_GH0.tar.gz) = d016bf9ebba0f48ac238aee8a12d50627f5d0778d74101fbdbde682099dc9c98 +SIZE (grosjo-fts-xapian-1.4.10_GH0.tar.gz) = 1258473 diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile index d8cfcf00a84d..a3c7939801ea 100644 --- a/mail/dovecot-pigeonhole/Makefile +++ b/mail/dovecot-pigeonhole/Makefile @@ -1,63 +1,63 @@ # Created by: Nils Vogels PORTNAME= dovecot-pigeonhole -PORTVERSION= 0.5.13 +PORTVERSION= 0.5.15 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} MAINTAINER= ler@FreeBSD.org COMMENT= Sieve plugin for the Dovecot 'deliver' LDA and LMTP LICENSE= LGPL21 BUILD_DEPENDS= dovecot>=2.3.9:mail/dovecot RUN_DEPENDS= dovecot>=2.3.9:mail/dovecot DOVECOTVERSION= 2.3 GNU_CONFIGURE= yes CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ --docdir=${DOCSDIR} \ --with-dovecot="${LOCALBASE}/lib/dovecot" LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip USES= compiler:c11 libtool ssl USE_LDCONFIG= ${PREFIX}/lib/dovecot OPTIONS_DEFINE= DOCS LDAP MANAGESIEVE OPTIONS_DEFAULT=MANAGESIEVE GSSAPI_NONE OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_SUB= yes GSSAPI_DESC= GSSAPI Support (*MUST MATCH* mail/dovecot) GSSAPI_NONE_DESC= Build without GSSAPI support GSSAPI_BASE_DESC= Use GSSAPI from base GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5 GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_OFF= ${GSSAPI_CONFIGURE_ARGS} BUILD_FAIL_MESSAGE= Ensure that ${PORTNAME}'s GSSAPI backend is the same as dovecot2 (make config). MANAGESIEVE_DESC= ManageSieve support MANAGESIEVE_CONFIGURE_WITH= managesieve LDAP_CONFIGURE_WITH= ldap LDAP_CPPFLAGS= -I${LOCALBASE}/include LDAP_LDFLAGS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes PORTDOCS= sieve/extensions/* sieve/plugins/* sieve/locations/* post-patch: @${REINPLACE_CMD} -E '\ s!^(install-data-am:) install-sieve_docDATA!\1!; \ s!^(uninstall-am:) uninstall-sieve_docDATA!\1!;' \ ${WRKSRC}/doc/Makefile.in .include diff --git a/mail/dovecot-pigeonhole/distinfo b/mail/dovecot-pigeonhole/distinfo index 97537214af42..bad4e9424055 100644 --- a/mail/dovecot-pigeonhole/distinfo +++ b/mail/dovecot-pigeonhole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609775237 -SHA256 (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17 -SIZE (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 1908839 +TIMESTAMP = 1624433329 +SHA256 (dovecot-2.3-pigeonhole-0.5.15.tar.gz) = e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0 +SIZE (dovecot-2.3-pigeonhole-0.5.15.tar.gz) = 1935601 diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 528fbb02a25a..05a75e474853 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,156 +1,161 @@ # Created by: Nagy, Attila ###################################################################### # Anytime PORTVERSION changes please bump PORTREVISION of: # # - mail/dovecot-pigeonhole. See ports/146029 for an explanation. # # - mail/dovecot-fts-xapian. # ###################################################################### PORTNAME= dovecot -PORTVERSION= 2.3.13 -PORTREVISION= 1 +PORTVERSION= 2.3.15 CATEGORIES= mail MASTER_SITES= https://dovecot.org/releases/2.3/ MAINTAINER= ler@FreeBSD.org COMMENT= Secure, fast and powerful IMAP and POP3 server LICENSE= LGPL21 MIT LICENSE_COMB= dual LIB_DEPENDS= libzstd.so:archivers/zstd USES= cpe iconv libtool pkgconfig ssl USE_RC_SUBR= dovecot GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ - --with-statedir=/var/db/dovecot \ - --without-shadow \ + --with-docs \ --with-ssl=openssl \ - --with-docs + --with-statedir=/var/db/dovecot \ + --with-shadow=no \ + --with-systemd=no USE_LDCONFIG= ${PREFIX}/lib/dovecot INSTALL_TARGET= install-strip USERS= dovecot dovenull GROUPS= ${USERS} -OPTIONS_DEFINE= LIBSODIUM LIBWRAP LUA LZ4 DOCS EXAMPLES +OPTIONS_DEFINE= LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 DOCS EXAMPLES OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP OPTIONS_SUB= yes OPTIONS_GROUP= DB FTS OPTIONS_GROUP_DB= CDB LDAP MYSQL PGSQL SQLITE OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT DB_DESC= Database support CDB_DESC= CDB database support FTS_DESC= Full text search plugins ICU_DESC= Use libicu for FTS unicode normalization LUCENE_DESC= CLucene FTS support SOLR_DESC= Solr FTS support TEXTCAT_DESC= Libexttextcat FTS support GSSAPI_NONE_DESC= Build without GSSAPI support GSSAPI_BASE_DESC= Use GSSAPI from base GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5 # General options -LIBSODIUM_DESC= support libsodium based crypts (ARGON2I/ARGON2ID) +LIBSODIUM_DESC= Support libsodium based crypts (ARGON2I/ARGON2ID) LIBSODIUM_LIB_DEPENDS= libsodium.so:security/libsodium LIBSODIUM_CONFIGURE_WITH= sodium +LIBUNWIND_CONFIGURE_ON= --with-libunwind=yes +LIBUNWIND_CONFIGURE_OFF= --with-libunwind=no +LIBUNWIND_DESC= Get backtraces using libunwind +LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind + LIBWRAP_CONFIGURE_WITH= libwrap LUA_CONFIGURE_WITH= lua -LUA_USES= lua +LUA_USES= lua:51,53 LZ4_CONFIGURE_WITH= lz4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 # Databases CDB_CONFIGURE_WITH= cdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql SQLITE_USES= sqlite SQLITE_CONFIGURE_WITH= sqlite # FTS ICU_CONFIGURE_WITH= icu ICU_LIB_DEPENDS= libicui18n.so:devel/icu LUCENE_CONFIGURE_WITH= lucene stemmer LUCENE_LIB_DEPENDS= libclucene-core.so:textproc/clucene SOLR_CONFIGURE_WITH= solr SOLR_LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 TEXTCAT_CONFIGURE_WITH= textcat TEXTCAT_LIB_DEPENDS= libexttextcat-2.0.so:textproc/libexttextcat # GSSAPI GSSAPI_NONE_CONFIGURE_ON= --without-gssapi GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit DOCS= AUTHORS COPYING INSTALL NEWS TODO README PORTDOCS= * PORTEXAMPLES= * # Default requirement for dovecot rc script _REQUIRE= LOGIN LDAP_VARS= _REQUIRE+=slapd MYSQL_VARS= _REQUIRE+=mysql PGSQL_VARS= _REQUIRE+=postgresql SUB_LIST+= REQUIRE="${_REQUIRE}" SUB_FILES+= pkg-message CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} post-patch: @${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \ s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \ ${WRKSRC}/doc/example-config/*.conf ${WRKSRC}/doc/example-config/conf.d/* \ ${WRKSRC}/doc/example-config/*.conf.ext @${REINPLACE_CMD} -e '/^LIBS =/s/$$/ @LTLIBICONV@/' \ ${WRKSRC}/src/lib-mail/Makefile.in # Install the sample config files into ETCDIR/example-config/ @${REINPLACE_CMD} -e '/^exampledir =/s|\$$(docdir)|${ETCDIR}|' \ ${WRKSRC}/doc/example-config/Makefile.in \ ${WRKSRC}/doc/example-config/conf.d/Makefile.in post-patch-LUA-on: @${REINPLACE_CMD} -e '/^libdovecot_lua_la_DEPENDENCIES =/ s|LUA_LIBS|true|' \ ${WRKSRC}/src/lib-lua/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/dovecot-openssl.cnf ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/mkcert.sh ${STAGEDIR}${EXAMPLESDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) .include diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index aa3436fe4e25..0d4e8ecb3689 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609941410 -SHA256 (dovecot-2.3.13.tar.gz) = a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4 -SIZE (dovecot-2.3.13.tar.gz) = 7456073 +TIMESTAMP = 1624366601 +SHA256 (dovecot-2.3.15.tar.gz) = 21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590 +SIZE (dovecot-2.3.15.tar.gz) = 7608561 diff --git a/mail/dovecot/files/patch-configure b/mail/dovecot/files/patch-configure index 89691f439d56..824adb1e9291 100644 --- a/mail/dovecot/files/patch-configure +++ b/mail/dovecot/files/patch-configure @@ -1,28 +1,19 @@ ---- configure.orig 2020-12-22 13:27:02 UTC +--- configure.orig 2021-06-22 13:00:25 UTC +++ configure -@@ -26053,7 +26053,7 @@ fi - $as_echo "$with_lua" >&6; } - - if test "x$with_lua" != "xno"; then : -- for LUAPC in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do -+ for LUAPC in lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do - - pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 -@@ -29355,13 +29355,13 @@ fi +@@ -29748,13 +29748,13 @@ fi if test $want_stemmer != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sb_stemmer_new in -lstemmer" >&5 -$as_echo_n "checking for sb_stemmer_new in -lstemmer... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sb_stemmer_new in -lclucene-contribs-lib" >&5 +$as_echo_n "checking for sb_stemmer_new in -lclucene-contribs-lib... " >&6; } if ${ac_cv_lib_stemmer_sb_stemmer_new+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lstemmer $LIBS" +LIBS="-lclucene-contribs-lib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c b/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c deleted file mode 100644 index e6991bbf7900..000000000000 --- a/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/fts-solr/solr-connection.c.orig 2020-08-12 12:20:41 UTC -+++ src/plugins/fts-solr/solr-connection.c -@@ -103,7 +103,7 @@ int solr_connection_init(const struct fts_solr_setting - http_set.ssl = ssl_client_set; - http_set.debug = solr_set->debug; - http_set.rawlog_dir = solr_set->rawlog_dir; -- solr_http_client = http_client_init(&http_set); -+ solr_http_client = http_client_init_private(&http_set); - } - - *conn_r = conn; diff --git a/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c b/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c deleted file mode 100644 index 2be6cae9aa32..000000000000 --- a/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/fts/fts-parser-tika.c.orig 2019-01-02 22:11:26 UTC -+++ src/plugins/fts/fts-parser-tika.c -@@ -77,7 +77,7 @@ tika_get_http_client_url(struct mail_user *user, struc - http_set.request_timeout_msecs = 60*1000; - http_set.ssl = &ssl_set; - http_set.debug = user->mail_debug; -- tika_http_client = http_client_init(&http_set); -+ tika_http_client = http_client_init_private(&http_set); - } - *http_url_r = tuser->http_url; - return 0; diff --git a/mail/dovecot/files/pkg-message.in b/mail/dovecot/files/pkg-message.in index 0a9eb2c59acf..f018371c9b65 100644 --- a/mail/dovecot/files/pkg-message.in +++ b/mail/dovecot/files/pkg-message.in @@ -1,41 +1,48 @@ [ { type: install message: <