Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Dec 2018 11:33:06 +0000 (UTC)
From:      Larry Rosenman <ler@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r486595 - head/mail/dovecot
Message-ID:  <201812041133.wB4BX6Oo065545@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812041133.wB4BX6Oo065545>