Index: head/mail/dovecot/Makefile =================================================================== --- head/mail/dovecot/Makefile (revision 485674) +++ head/mail/dovecot/Makefile (revision 485675) @@ -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.3 -PORTREVISION= 4 +PORTVERSION= 2.3.4 CATEGORIES= mail ipv6 MASTER_SITES= https://www.dovecot.org/releases/2.3/ MAINTAINER= ler@FreeBSD.org COMMENT= Secure, fast and powerful IMAP and POP3 server LICENSE= LGPL21 MIT LICENSE_COMB= dual LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL LICENSE_FILE_MIT= ${WRKSRC}/COPYING.MIT USES= cpe iconv libtool pkgconfig ssl USE_RC_SUBR= dovecot GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ --with-statedir=/var/db/dovecot \ --without-shadow \ --without-sodium \ --with-ssl=openssl \ --with-docs USE_LDCONFIG= ${PREFIX}/lib/dovecot INSTALL_TARGET= install-strip USERS= dovecot dovenull GROUPS= ${USERS} CONFLICTS_INSTALL= dovecot22 OPTIONS_DEFINE= 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 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 ICU_USES= pkgconfig 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 485674) +++ head/mail/dovecot/distinfo (revision 485675) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538434422 -SHA256 (dovecot-2.3.3.tar.gz) = 15af27ee25258afb4ad9581f8df681be998b763597086bbae54ca7d77a066d8e -SIZE (dovecot-2.3.3.tar.gz) = 6851107 +TIMESTAMP = 1542984255 +SHA256 (dovecot-2.3.4.tar.gz) = d91b76eff8df6185c1799f1b279f780105bdeeea27e3286b42f4cab18efbef05 +SIZE (dovecot-2.3.4.tar.gz) = 6924178 Index: head/mail/dovecot/files/patch-src_lib-master_test-event-stats.c =================================================================== --- head/mail/dovecot/files/patch-src_lib-master_test-event-stats.c (nonexistent) +++ head/mail/dovecot/files/patch-src_lib-master_test-event-stats.c (revision 485675) @@ -0,0 +1,10 @@ +--- src/lib-master/test-event-stats.c.orig 2018-11-23 14:47:35 UTC ++++ src/lib-master/test-event-stats.c +@@ -12,6 +12,7 @@ + #include "stats-client.h" + #include "test-common.h" + #include ++#include + #include + #include + #include Property changes on: head/mail/dovecot/files/patch-src_lib-master_test-event-stats.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/dovecot/files/patch-src_master_main.c =================================================================== --- head/mail/dovecot/files/patch-src_master_main.c (revision 485674) +++ head/mail/dovecot/files/patch-src_master_main.c (revision 485675) @@ -1,11 +1,11 @@ ---- src/master/main.c.orig 2018-03-20 03:15:40.000000000 -0700 -+++ src/master/main.c 2018-05-05 18:57:32.485732000 -0700 -@@ -861,6 +861,8 @@ +--- src/master/main.c.orig 2018-11-23 11:06:45 UTC ++++ src/master/main.c +@@ -862,6 +862,8 @@ int main(int argc, char *argv[]) i_fatal("dup2(dev_null_fd) failed: %m"); if (!foreground && dup2(dev_null_fd, STDOUT_FILENO) < 0) i_fatal("dup2(dev_null_fd) failed: %m"); + if (!foreground && dup2(dev_null_fd, STDERR_FILENO) < 0) + i_fatal("dup2(dev_null_fd) failed: %m"); pidfile_path = i_strconcat(set->base_dir, "/"MASTER_PID_FILE_NAME, NULL); Index: head/mail/dovecot-pigeonhole/Makefile =================================================================== --- head/mail/dovecot-pigeonhole/Makefile (revision 485674) +++ head/mail/dovecot-pigeonhole/Makefile (revision 485675) @@ -1,67 +1,67 @@ # Created by: Nils Vogels # $FreeBSD$ PORTNAME= dovecot-pigeonhole -PORTVERSION= 0.5.3 +PORTVERSION= 0.5.4 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.2:mail/dovecot -RUN_DEPENDS= dovecot>=2.3.2:mail/dovecot +BUILD_DEPENDS= dovecot>=2.3.4:mail/dovecot +RUN_DEPENDS= dovecot>=2.3.4: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 485674) +++ head/mail/dovecot-pigeonhole/distinfo (revision 485675) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538434703 -SHA256 (dovecot-2.3-pigeonhole-0.5.3.tar.gz) = e02f2741c05f9e2af1c5f46da35efb74997f9d4b941ba68936206d310ddf2622 -SIZE (dovecot-2.3-pigeonhole-0.5.3.tar.gz) = 1827329 +TIMESTAMP = 1542985606 +SHA256 (dovecot-2.3-pigeonhole-0.5.4.tar.gz) = 547999e67a001abc5e654c7e35653d3fe057fa9a47a24257e39a79c41ef08516 +SIZE (dovecot-2.3-pigeonhole-0.5.4.tar.gz) = 1831570