Update mail-filter/opendkim-2.10.3

2 files changed, 59 insertions, 26 deletions

diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 7a54aad2..5525f73c 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -3,5 +3,5 @@ AUX opendkim.init.r3 1479 SHA256 b2daa1749672a81bebad1af9ff03e300e6937a70cf06023
 AUX opendkim.service 439 SHA256 8636aee39d924067d1f1673291d1501cec3e6fdee0de16533a1e3616471b35ed SHA512 308edc70fdb0bd57b424e739412217fd8017b017e9b27bc0954dec55294d10d8b7713f6f191836b94aa49bf578bfb391dca748af0c8d9b72e14ebe1eae21e834 WHIRLPOOL 4b7c42b130a31120efba7aa04f90cacd8c6b760204577e2914901eddc6cb425b1c06253d60f43673d28f9992e4b078010f444a390569544573601b3fdbf66e76
 DIST opendkim-2.10.3.tar.gz 1210224 SHA256 43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8 WHIRLPOOL 36bbf0f3e81fa291f31123d3614ba113b893d4ba76a5fe017cc9a393888c1ea95525b85e6042bc1db96e9a00e52aa13a251c38438cd03b0fd92b47d17036d680
 DIST opendkim-2.9.2.tar.gz 1229383 SHA256 1f0c66afbe48f6223d2ab985b2c27594ae45035e3e81eba887d8ec6e5e1282c0 SHA512 f6fe77897927a93c9f57d09e5e9f43b1e73e2b21a586461b5665fb430eee1362b33d9601c8643d50d5a53c8e01b03c7af331f28cd992c9163f959723f21ebf63 WHIRLPOOL b61212d272d07c367c7d9ecb951466b66759b6d449047c10947681ea6889a1f2b2c12986e6c11a59620fb8ace3c0a177235f65f58c54c993909f61dee5cf3c3a
-EBUILD opendkim-2.10.3.ebuild 6318 SHA256 c754abbe07721f66b9837420e82353e9486da1f10e070079b3263bf6b64fc202 SHA512 7a317c7889971416319ae2339a8a2b06037f07e066229482cab6fc1e897f18490c747d4bb9d50c41729e262ed89bff9c2d51251d01ecf1c4ed8dacf12a6172db WHIRLPOOL 2970b7be3a3e7d3f7eafc7da642fe56ed46ee618d330a19db39006bad83bc730e671df9f2e5bafdca875166bf79f9db38ee7b18842db979dbc600d00b842b021
+EBUILD opendkim-2.10.3.ebuild 7442 SHA256 d5e18b653e0b1daec3e1b8c9a78af5861b2eec847aa26abb0fa72e412c851c81 SHA512 f491f7a7b42397a5712515c1b0adf58d2d00192e3fe3c3e271f7ac96c8d2a7444e24ee416c1e641851a1ed898a57331418f040fdcaabfcce0b1e789fb4542bed WHIRLPOOL 27c1157112fb484da3d3a3869d193742cf88f3ffb74ba4b675a81cd17797405dd24de11b6de8a0a25bd78234294cb0b8855a0eb4c95c6836043e44bfd325d83d
 EBUILD opendkim-2.9.2-r1.ebuild 6214 SHA256 4831dbc0e720f4ddee0c63a578e8d01c6351e269dbff9c62c445bd8bfcc3ec93 SHA512 ae3ed334fdc86a5adffb09a39968bd9defdcb4ca89e07609870290b97669c1f565fb5c4716c7d70718e37be508522eb24fef057e3a990140face5801d8fae9f8 WHIRLPOOL 0a0561faa3b981b0be2020b8f2cc9da0404e55bb19c71eca1be949f87079c758d622cb5ece569cd1cff914d6a0e75ae64eb756e663d93bb8953c34f39468bb86
diff --git a/mail-filter/opendkim/opendkim-2.10.3.ebuild b/mail-filter/opendkim/opendkim-2.10.3.ebuild
index 5ba9a3ca..5aa61e17 100644
--- a/mail-filter/opendkim/opendkim-2.10.3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3.ebuild
@@ -17,21 +17,27 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 LICENSE="Sendmail-Open-Source BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
+IUSE="+berkdb curl diffheaders erlang experimental gnutls jansson ldap libevent lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
 	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8:* )
 	berkdb? ( >=sys-libs/db-3.2:* )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( dev-lang/lua:* )
+	curl? ( net-misc/curl )
+	diffheaders? ( dev-libs/tre )
+	erlang? ( dev-lang/erlang )
+	experimental? ( net-analyzer/rrdtool )
+	gnutls? ( >=net-libs/gnutls-2.11.7 )
+	jansson? ( dev-libs/jansson )
 	ldap? ( net-nds/openldap )
+	libevent? ( dev-libs/libevent )
 	lmdb? ( dev-db/lmdb )
+	lua? ( dev-lang/lua:* )
 	memcached? ( dev-libs/libmemcached )
+	opendbx? ( >=dev-db/opendbx-1.4.0 )
 	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( >=dev-libs/openssl-0.9.8:* )
 	unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
+	!unbound? ( net-libs/ldns )"
 
 RDEPEND="${DEPEND}
 	sys-process/psmisc
@@ -63,6 +69,8 @@ src_prepare() {
 	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
 	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
 
+	epatch "${FILESDIR}"/"${PN}"-2.9.2-safekeys.patch || die
+
 	einfo "Using libdir '$(get_libdir)' ..."
 	sed -i -r \
 	       -e "/\/lib/s#/lib([: \"/]|$)#/$(get_libdir)\1#" \
@@ -73,46 +81,71 @@ src_prepare() {
 
 src_configure() {
 	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
+
+	# Not featured:
+	# --enable-socketdb						arbitrary socket data sets
+	# --enable-postgresql_reconnect_hack	hack to overcome PostgreSQL connection error detection bug
+
+	if use berkdb; then
+		# Not a bug, myconf is redefined based on its own contents...
+		myconf="$(db_includedir)"
 		myconf="--with-db-incdir=${myconf#-I}"
+
 		myconf+=" --enable-popauth"
 		myconf+=" --enable-query_cache"
 		myconf+=" --enable-stats"
+		myconf+=" $(use_enable lua statsext)"
+	fi
+	if use experimental; then
+		#myconf+=" --enable-atps" # Despite being experimental, included as standard below...
+		myconf+=" --enable-db_handle_pools"
+		myconf+=" --enable-reprrd"
+		myconf+=" --enable-reputation"
+		myconf+=" --with-librrd"
+	fi
+	if use ldap; then
+		#myconf+=" --enable-ldap_caching" # - Prevents LDAP changes from being immediately picked-up
+		myconf+=" $(use_with sasl)"
+	fi
+	if use libevent; then
+		myconf+=" $(use_with libevent)"
+	else
+		myconf+=" $(use_enable poll)"
 	fi
 	if use unbound; then
 		myconf+=" --with-unbound"
 	else
 		myconf+=" --with-ldns"
 	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
 	econf \
-		$(use_with berkdb db) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_enable lua rbl) \
-		$(use_with ldap openldap) \
-		$(use_with lmdb) \
-		$(use_enable poll) \
-		$(use_enable static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
 		${myconf} \
 		--docdir=/usr/share/doc/${PF} \
 		--htmldir=/usr/share/doc/${PF}/html \
 		--libdir=/usr/$(get_libdir) \
-		--enable-filter \
 		--enable-atps \
+		--enable-default_sender \
+		$(use_enable diffheaders) \
+		--enable-filter \
 		--enable-identity_header \
 		--enable-rate_limit \
-		--enable-resign \
+		$(use_enable lua rbl) \
 		--enable-replace_rules \
-		--enable-default_sender \
+		--enable-resign \
 		--enable-sender_macro \
+		$(use_enable static-libs static) \
 		--enable-vbr \
-		--disable-live-testing
+		--disable-live-testing \
+		$(use_with berkdb db) \
+		$(use_with curl) \
+		$(use_with erlang) \
+		$(use_with gnutls) \
+		$(use_with jansson) \
+		$(use_with memcached libmemcached) \
+		$(use_with lmdb) \
+		$(use_with lua) \
+		$(use_with opendbx odbx) \
+		$(use_with ldap openldap) \
+		$(use_with diffheaders tre)
 		#--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
 		#--disable-rpath
 }