From owner-svn-ports-head@freebsd.org Tue Dec 4 11:33:07 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B3C29133038D; Tue, 4 Dec 2018 11:33:07 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 56D5274530; Tue, 4 Dec 2018 11:33:07 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1EA5324AD2; Tue, 4 Dec 2018 11:33:07 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB4BX79t065547; Tue, 4 Dec 2018 11:33:07 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB4BX6Oo065545; Tue, 4 Dec 2018 11:33:06 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201812041133.wB4BX6Oo065545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Tue, 4 Dec 2018 11:33:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486595 - head/mail/dovecot X-SVN-Group: ports-head X-SVN-Commit-Author: ler X-SVN-Commit-Paths: head/mail/dovecot X-SVN-Commit-Revision: 486595 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 56D5274530 X-Spamd-Result: default: False [-0.18 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.48)[-0.475,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.33)[0.331,0]; NEURAL_HAM_LONG(-0.03)[-0.031,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Dec 2018 11:33:07 -0000 Author: ler Date: Tue Dec 4 11:33:06 2018 New Revision: 486595 URL: https://svnweb.freebsd.org/changeset/ports/486595 Log: mail/dovecot: add option to support libsodium - libsodium option to support security/libsodium based crypts - pet portlint - fix LUA option pkg-plist issues Modified: head/mail/dovecot/Makefile head/mail/dovecot/pkg-plist Modified: head/mail/dovecot/Makefile ============================================================================== --- head/mail/dovecot/Makefile Tue Dec 4 10:50:36 2018 (r486594) +++ head/mail/dovecot/Makefile Tue Dec 4 11:33:06 2018 (r486595) @@ -8,7 +8,7 @@ PORTNAME= dovecot PORTVERSION= 2.3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= https://www.dovecot.org/releases/2.3/ @@ -17,8 +17,6 @@ COMMENT= Secure, fast and powerful IMAP and POP3 serve 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 @@ -27,7 +25,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ --with-statedir=/var/db/dovecot \ --without-shadow \ - --without-sodium \ --with-ssl=openssl \ --with-docs @@ -39,7 +36,7 @@ GROUPS= ${USERS} CONFLICTS_INSTALL= dovecot22 -OPTIONS_DEFINE= LIBWRAP LUA LZ4 VPOPMAIL DOCS EXAMPLES +OPTIONS_DEFINE= LIBSODIUM LIBWRAP LUA LZ4 VPOPMAIL DOCS EXAMPLES OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP OPTIONS_SUB= yes @@ -68,6 +65,10 @@ GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/ 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 @@ -98,7 +99,6 @@ 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 Modified: head/mail/dovecot/pkg-plist ============================================================================== --- head/mail/dovecot/pkg-plist Tue Dec 4 10:50:36 2018 (r486594) +++ head/mail/dovecot/pkg-plist Tue Dec 4 11:33:06 2018 (r486595) @@ -836,6 +836,12 @@ share/aclocal/dovecot.m4 %%LIBWRAP%%libexec/dovecot/tcpwrap %%LUA%%include/dovecot/dlua-script-private.h %%LUA%%include/dovecot/dlua-script.h +%%LUA%%include/dovecot/mail-lua-plugin.h +%%LUA%%include/dovecot/mail-storage-lua.h +%%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%01_mail_lua_plugin.a +%%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%01_mail_lua_plugin.so +%%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%22_push_notification_lua_plugin.a +%%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%22_push_notification_lua_plugin.so %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so %%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.a