4 files changed, 30 insertions, 12 deletions

diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 922507065516..d03420893547 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	opendkim
-PORTVERSION=	2.3.2
-PORTREVISION=	1
+PORTVERSION=	2.4.1
 CATEGORIES=	mail security
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,10 +17,12 @@ COMMENT=	DKIM library and milter implementation
 LICENSE=	BSD SENDMAIL
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
+
 LICENSE_FILE_SENDMAIL=	${WRKSRC}/LICENSE.Sendmail
 LICENSE_GROUPS_SENDMAIL=	FSF OSI
 LICENSE_NAME_SENDMAIL=	Sendmail Open Source License
 LICENSE_PERMS_SENDMAIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_RC_SUBR=	milter-opendkim
@@ -36,7 +37,9 @@ SUB_FILES=	pkg-message
 
 OPTIONS= \
 	ARLIB		"Asynchronous thread-safe DNS library"	On  \
+	GNUTLS		"Use GnuTLS instead of OpenSSL"		Off \
 	LUA		"Describe filter policy with lua"	Off \
+	MEMCACHED	"Use memcached as a data set"		Off \
 	OPENDBX		"Store filter policies via OpenDBX"	Off \
 	OPENLDAP	"Store filter policies in LDAP"		Off \
 	POPAUTH		"Use POP authentication DB"		Off \
@@ -92,6 +95,9 @@ LIB_DEPENDS+=		unbound:${PORTSDIR}/dns/unbound
 PLIST_SUB+=		ARLIB="@comment "
 .else
 .if defined(WITH_ARLIB)
+. if ${CC} == "clang"
+BROKEN=		ARLIB option does not compile with clang
+. endif
 PLIST_SUB+=		ARLIB=""
 CONFIGURE_ARGS+=	--enable-arlib
 MAN3=			ar.3
@@ -106,6 +112,10 @@ CONFIGURE_ARGS+=	--enable-popauth
 .if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
 CONFIGURE_ARGS+=	--enable-query_cache
 .endif
+.if defined(WITH_MEMCACHED)
+CONFIGURE_ARGS+=	--with-libmemcached
+LIB_DEPENDS+=		memcached:${PORTSDIR}/databases/libmemcached
+.endif
 .if defined(WITH_OPENDBX)
 CONFIGURE_ARGS+=	--with-odbx
 LIB_DEPENDS+=		opendbx:${PORTSDIR}/databases/opendbx
diff --git a/mail/opendkim/Makefile.features b/mail/opendkim/Makefile.features
index 90ef55bce693..73860d61381f 100644
--- a/mail/opendkim/Makefile.features
+++ b/mail/opendkim/Makefile.features
@@ -19,14 +19,14 @@ CONFIGURE_ARGS+=	--enable-allsymbols
 CONFIGURE_ARGS+=	--enable-atps
 .endif
 
-.if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB)
-CONFIGURE_ARGS+=	--enable-bodylength_db
-.endif
-
 .if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE)
 CONFIGURE_ARGS+=	--enable-codecoverage
 .endif
 
+.if defined(WITH_DB_HANDLE_POOLS) && !defined(WITHOUT_DB_HANDLE_POOLS)
+CONFIGURE_ARGS+=	--enable-db_handle_pools
+.endif
+
 .if defined(WITH_DEFAULT_SENDER) && !defined(WITHOUT_DEFAULT_SENDER)
 CONFIGURE_ARGS+=	--enable-default_sender
 .endif
@@ -49,8 +49,8 @@ WITH_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--enable-ldap_caching
 .endif
 
-.if defined(WITH_MAXVERIFY) && !defined(WITHOUT_MAXVERIFY)
-CONFIGURE_ARGS+=	--enable-maxverify
+.if defined(WITH_LUA_GLOBALS) && !defined(WITHOUT_LUA_GLOBALS)
+CONFIGURE_ARGS+=	--enable-lua_globals
 .endif
 
 .if defined(WITH_OVERSIGN) && !defined(WITHOUT_OVERSIGN)
@@ -66,6 +66,10 @@ CONFIGURE_ARGS+=	--enable-parsetime
 CONFIGURE_ARGS+=	--enable-postgres_reconnect_hack
 .endif
 
+.if defined(WITH_RATE_LIMIT) && !defined(WITHOUT_RATE_LIMIT)
+CONFIGURE_ARGS+=	--enable-rate_limit
+.endif
+
 .if defined(WITH_RBL) && !defined(WITHOUT_RBL)
 CONFIGURE_ARGS+=	--enable-rbl
 .endif
@@ -98,7 +102,7 @@ CONFIGURE_ARGS+=	--enable-selector_header
 CONFIGURE_ARGS+=	--enable-sender_macro
 .endif
 
-.if defined(WITH_STATS) || defined(WITH_STATS_I) || defined(WITH_STATSEXT)
+.if defined(WITH_STATS) || defined(WITH_STATSEXT)
 CONFIGURE_ARGS+=	--enable-stats
 MAN8+=			opendkim-stats.8
 PLIST_SUB+=		STATS=""
@@ -113,3 +117,7 @@ CONFIGURE_ARGS+=	--enable-statsext
 .if defined(WITH_VBR) && !defined(WITHOUT_VBR)
 CONFIGURE_ARGS+=	--enable-vbr
 .endif
+
+.if defined(WITH_XTAGS) && !defined(WITHOUT_XTAGS)
+CONFIGURE_ARGS+=	--enable-xtags
+.endif
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index 8190698ba08d..69da3c8d5a6e 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opendkim-2.3.2.tar.gz) = 40c566fe0a182d3c9019d39f3748928c7fa7178cafbfc678630ca85248f55548
-SIZE (opendkim-2.3.2.tar.gz) = 1281269
+SHA256 (opendkim-2.4.1.tar.gz) = 1567a6d41dba92977d3eaae726580c5ecdc74766866331e87fc201792333b1f2
+SIZE (opendkim-2.4.1.tar.gz) = 1322057
diff --git a/mail/opendkim/pkg-plist b/mail/opendkim/pkg-plist
index fe8755c183ea..2a97883a8bcf 100644
--- a/mail/opendkim/pkg-plist
+++ b/mail/opendkim/pkg-plist
@@ -15,7 +15,7 @@ include/opendkim/dkim.h
 lib/libopendkim.a
 lib/libopendkim.la
 lib/libopendkim.so
-lib/libopendkim.so.3
+lib/libopendkim.so.5
 %%ARLIB%%libdata/pkgconfig/ar.pc
 libdata/pkgconfig/opendkim.pc
 sbin/opendkim