Index: branches/2019Q2/mail/dovecot/Makefile =================================================================== --- branches/2019Q2/mail/dovecot/Makefile (revision 500670) +++ branches/2019Q2/mail/dovecot/Makefile (revision 500671) @@ -1,162 +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.5.2 +PORTVERSION= 2.3.6 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 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: branches/2019Q2/mail/dovecot/distinfo =================================================================== --- branches/2019Q2/mail/dovecot/distinfo (revision 500670) +++ branches/2019Q2/mail/dovecot/distinfo (revision 500671) @@ -1,3 +1,3 @@ -TIMESTAMP = 1555598613 -SHA256 (dovecot-2.3.5.2.tar.gz) = ba14e41aefd81a868a35b83bcb54194116106424d37690519b50ea83c0f31bf2 -SIZE (dovecot-2.3.5.2.tar.gz) = 6953228 +TIMESTAMP = 1556658186 +SHA256 (dovecot-2.3.6.tar.gz) = ed1d8dc1beeae9c6c73deac73a62ef19fe9262fbffd86604a3f690452f5536c7 +SIZE (dovecot-2.3.6.tar.gz) = 6980135 Index: branches/2019Q2/mail/dovecot/files/patch-src_lib-sql_driver-mysql.c =================================================================== --- branches/2019Q2/mail/dovecot/files/patch-src_lib-sql_driver-mysql.c (revision 500670) +++ branches/2019Q2/mail/dovecot/files/patch-src_lib-sql_driver-mysql.c (nonexistent) @@ -1,24 +0,0 @@ ---- src/lib-sql/driver-mysql.c.orig 2018-11-23 11:06:45 UTC -+++ src/lib-sql/driver-mysql.c -@@ -173,7 +173,9 @@ static int driver_mysql_connect(struct sql_db *_db) - static void driver_mysql_disconnect(struct sql_db *_db) - { - struct mysql_db *db = (struct mysql_db *)_db; -- mysql_close(db->mysql); -+ if (db->mysql != NULL) -+ mysql_close(db->mysql); -+ db->mysql = NULL; - } - - static int driver_mysql_parse_connect_string(struct mysql_db *db, -@@ -311,7 +313,9 @@ static void driver_mysql_deinit_v(struct sql_db *_db) - _db->no_reconnect = TRUE; - sql_db_set_state(&db->api, SQL_DB_STATE_DISCONNECTED); - -- mysql_close(db->mysql); -+ if (db->mysql != NULL) -+ mysql_close(db->mysql); -+ db->mysql = NULL; - - sql_connection_log_finished(_db); - event_unref(&_db->event); Property changes on: branches/2019Q2/mail/dovecot/files/patch-src_lib-sql_driver-mysql.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: branches/2019Q2/mail/dovecot/files/patch-src_lib-master_test-event-stats.c =================================================================== --- branches/2019Q2/mail/dovecot/files/patch-src_lib-master_test-event-stats.c (revision 500670) +++ branches/2019Q2/mail/dovecot/files/patch-src_lib-master_test-event-stats.c (revision 500671) @@ -1,10 +1,10 @@ ---- src/lib-master/test-event-stats.c.orig 2018-11-23 11:06:49 UTC +--- src/lib-master/test-event-stats.c.orig 2019-04-30 12:25:06 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 - #include Index: branches/2019Q2/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c =================================================================== --- branches/2019Q2/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c (revision 500670) +++ branches/2019Q2/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c (revision 500671) @@ -1,11 +1,11 @@ ---- src/plugins/fts-solr/solr-connection.c.orig 2019-01-02 22:12:57 UTC +--- src/plugins/fts-solr/solr-connection.c.orig 2019-04-30 12:25:06 UTC +++ src/plugins/fts-solr/solr-connection.c -@@ -156,7 +156,7 @@ int solr_connection_init(const char *url, - http_set.request_timeout_msecs = 60*1000; +@@ -156,7 +156,7 @@ int solr_connection_init(const struct fts_solr_setting http_set.ssl = ssl_client_set; - http_set.debug = debug; + 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->xml_parser = XML_ParserCreate("UTF-8"); Index: branches/2019Q2/mail/dovecot-pigeonhole/Makefile =================================================================== --- branches/2019Q2/mail/dovecot-pigeonhole/Makefile (revision 500670) +++ branches/2019Q2/mail/dovecot-pigeonhole/Makefile (revision 500671) @@ -1,67 +1,67 @@ # Created by: Nils Vogels # $FreeBSD$ PORTNAME= dovecot-pigeonhole -PORTVERSION= 0.5.5 +PORTVERSION= 0.5.6 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.5:mail/dovecot -RUN_DEPENDS= dovecot>=2.3.5:mail/dovecot +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: branches/2019Q2/mail/dovecot-pigeonhole/distinfo =================================================================== --- branches/2019Q2/mail/dovecot-pigeonhole/distinfo (revision 500670) +++ branches/2019Q2/mail/dovecot-pigeonhole/distinfo (revision 500671) @@ -1,3 +1,3 @@ -TIMESTAMP = 1551805776 -SHA256 (dovecot-2.3-pigeonhole-0.5.5.tar.gz) = cbaa106e1c2b23824420efdd6a9f8572c64c8dccf75a3101a899b6ddb25149a5 -SIZE (dovecot-2.3-pigeonhole-0.5.5.tar.gz) = 1847487 +TIMESTAMP = 1556659509 +SHA256 (dovecot-2.3-pigeonhole-0.5.6.tar.gz) = 7c2fe7e23e732a8451172c00da5f19532448c95e03e44d47c61b123e8210f5b8 +SIZE (dovecot-2.3-pigeonhole-0.5.6.tar.gz) = 1854287 Index: branches/2019Q2 =================================================================== --- branches/2019Q2 (revision 500670) +++ branches/2019Q2 (revision 500671) Property changes on: branches/2019Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r500569