Index: head/mail/dovecot/Makefile =================================================================== --- head/mail/dovecot/Makefile (revision 507214) +++ head/mail/dovecot/Makefile (revision 507215) @@ -1,163 +1,162 @@ # Created by: Nagy, Attila # $FreeBSD$ ###################################################################### # Anytime PORTVERSION changes please bump PORTREVISION of # # mail/dovecot-pigeonhole. See ports/146029 for an explanation. # ###################################################################### PORTNAME= dovecot -PORTVERSION= 2.3.7 -PORTREVISION= 4 +PORTVERSION= 2.3.7.1 CATEGORIES= mail ipv6 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 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-ssl=openssl \ --with-docs USE_LDCONFIG= ${PREFIX}/lib/dovecot INSTALL_TARGET= install-strip USERS= dovecot dovenull GROUPS= ${USERS} CONFLICTS_INSTALL= dovecot22 OPTIONS_DEFINE= LIBSODIUM LIBWRAP LUA LZ4 VPOPMAIL 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 LZ4_DESC= LZ4 compression support VPOPMAIL_DESC= vpopmail support 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= Libtextcat 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_LIB_DEPENDS= libsodium.so:security/libsodium LIBSODIUM_CONFIGURE_WITH= sodium LIBWRAP_CONFIGURE_WITH= libwrap LUA_CONFIGURE_WITH= lua LUA_USES= lua LZ4_CONFIGURE_WITH= lz4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 VPOPMAIL_BUILD_DEPENDS= vpopmail>=0:mail/vpopmail VPOPMAIL_CONFIGURE_WITH=vpopmail # 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 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= libtextcat.so:textproc/libtextcat # 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/* @${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 @${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' \ ${WRKSRC}/src/plugins/fts/decode2text.sh 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 Index: head/mail/dovecot/distinfo =================================================================== --- head/mail/dovecot/distinfo (revision 507214) +++ head/mail/dovecot/distinfo (revision 507215) @@ -1,3 +1,3 @@ -TIMESTAMP = 1562935512 -SHA256 (dovecot-2.3.7.tar.gz) = 11e156ae8539e42892809cc2412c3f1a294188806969f5547191a43abd4083aa -SIZE (dovecot-2.3.7.tar.gz) = 7074117 +TIMESTAMP = 1563891542 +SHA256 (dovecot-2.3.7.1.tar.gz) = c5a51d6f76e6e9c843df69e52a364a4c65c4c60e0c51d992eaa45f22f71803c3 +SIZE (dovecot-2.3.7.1.tar.gz) = 7076500 Index: head/mail/dovecot/files/patch-src_lib-storage_mail-storage.c =================================================================== --- head/mail/dovecot/files/patch-src_lib-storage_mail-storage.c (revision 507214) +++ head/mail/dovecot/files/patch-src_lib-storage_mail-storage.c (nonexistent) @@ -1,35 +0,0 @@ ---- src/lib-storage/mail-storage.c.orig 2019-07-12 10:46:25 UTC -+++ src/lib-storage/mail-storage.c -@@ -1040,10 +1040,10 @@ mailbox_name_verify_extra_separators(const char *vname - } - - static bool --mailbox_verify_name_prefix(struct mailbox *box, const char **error_r) -+mailbox_verify_name_prefix(struct mail_namespace *ns, const char **vnamep, -+ const char **error_r) - { -- const char *vname = box->vname; -- struct mail_namespace *ns = box->list->ns; -+ const char *vname = *vnamep; - - if (ns->prefix_len == 0) - return TRUE; -@@ -1071,6 +1071,7 @@ mailbox_verify_name_prefix(struct mailbox *box, const - return FALSE; - } - } -+ *vnamep = vname; - return TRUE; - } - -@@ -1085,7 +1086,9 @@ int mailbox_verify_name(struct mailbox *box) - return 0; - } - -- if (!mailbox_verify_name_prefix(box, &error)) { -+ /* Verify the namespace prefix here. Change vname to skip the prefix -+ for the following checks. */ -+ if (!mailbox_verify_name_prefix(box->list->ns, &vname, &error)) { - mail_storage_set_error(box->storage, MAIL_ERROR_PARAMS, - t_strdup_printf("Invalid mailbox name '%s': %s", - str_sanitize(vname, 80), error)); Property changes on: head/mail/dovecot/files/patch-src_lib-storage_mail-storage.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dovecot/files/patch-src_lib_ostream-file.c =================================================================== --- head/mail/dovecot/files/patch-src_lib_ostream-file.c (revision 507214) +++ head/mail/dovecot/files/patch-src_lib_ostream-file.c (nonexistent) @@ -1,29 +0,0 @@ ---- src/lib/ostream-file.c.orig 2019-07-12 10:46:25 UTC -+++ src/lib/ostream-file.c -@@ -333,17 +333,17 @@ static int buffer_flush(struct file_ostream *fstream) - static void o_stream_tcp_flush_via_nodelay(struct file_ostream *fstream) - { - if (net_set_tcp_nodelay(fstream->fd, TRUE) < 0) { -- if (errno != ENOTSUP && errno != ENOTSOCK && -- errno != ENOPROTOOPT) { -- i_error("file_ostream.net_set_tcp_nodelay(%s, TRUE) failed: %m", -- o_stream_get_name(&fstream->ostream.ostream)); -- } -+ /* Don't bother logging errors. There are quite a lot of -+ different errors that need to be ignored, and it differs -+ between OSes. At least: -+ Linux: ENOTSUP, ENOTSOCK, ENOPROTOOPT -+ FreeBSD: EINVAL, ECONNRESET */ - fstream->no_socket_nodelay = TRUE; - } else if (net_set_tcp_nodelay(fstream->fd, FALSE) < 0) { -- /* We already successfully enabled TCP_NODELAY, so we're really -- not expecting any errors here. */ -- i_error("file_ostream.net_set_tcp_nodelay(%s, FALSE) failed: %m", -- o_stream_get_name(&fstream->ostream.ostream)); -+ /* We already successfully enabled TCP_NODELAY, so there -+ shouldn't really be errors. Except ECONNRESET can possibly -+ still happen between these two calls, so again don't log -+ errors. */ - fstream->no_socket_nodelay = TRUE; - } - } Property changes on: head/mail/dovecot/files/patch-src_lib_ostream-file.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dovecot-pigeonhole/Makefile =================================================================== --- head/mail/dovecot-pigeonhole/Makefile (revision 507214) +++ head/mail/dovecot-pigeonhole/Makefile (revision 507215) @@ -1,67 +1,67 @@ # Created by: Nils Vogels # $FreeBSD$ PORTNAME= dovecot-pigeonhole -PORTVERSION= 0.5.7 +PORTVERSION= 0.5.7.1 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.6:mail/dovecot RUN_DEPENDS= dovecot>=2.3.6:mail/dovecot DOVECOTVERSION= 2.3 GNU_CONFIGURE= yes CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ --without-dovecot-install-dirs \ --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 CONFLICTS_INSTALL= dovecot-pigeonhole04 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 Index: head/mail/dovecot-pigeonhole/distinfo =================================================================== --- head/mail/dovecot-pigeonhole/distinfo (revision 507214) +++ head/mail/dovecot-pigeonhole/distinfo (revision 507215) @@ -1,3 +1,3 @@ -TIMESTAMP = 1562937261 -SHA256 (dovecot-2.3-pigeonhole-0.5.7.tar.gz) = 783849542c272331f60e7c4d371b303f7f2b1d69828bced3094a898876ecdb63 -SIZE (dovecot-2.3-pigeonhole-0.5.7.tar.gz) = 1856779 +TIMESTAMP = 1563891950 +SHA256 (dovecot-2.3-pigeonhole-0.5.7.1.tar.gz) = 3270b24c1f75a7c144f54d6d08ce994176e39c2cdb3ac4dd80ad5e64aaaa2028 +SIZE (dovecot-2.3-pigeonhole-0.5.7.1.tar.gz) = 1857291