Add two new options for exim:

	- exim-lookup-redis: allow quering redis from within the exim
	                     config, needs hiredis
	- opendmarc: enables DMARC support
Both are disabled by default.

3 files changed, 34 insertions, 11 deletions

diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index d45dcbfabd0..5467db2e643 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2013/10/30 07:30:03 adam Exp $
+$NetBSD: distinfo,v 1.57 2014/04/02 17:36:00 wiedi Exp $
 
 SHA1 (exim-4.82.tar.bz2) = 47b74986bd7c258030b3451d4c5e2723dd29d6cc
 RMD160 (exim-4.82.tar.bz2) = b3dc58373576e299a85245df93bbd9cde34c2078
@@ -7,4 +7,4 @@ SHA1 (patch-aa) = 24a12631b7df17930349b8a0d03adc80d27efbe2
 SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691
 SHA1 (patch-ae) = 7daf63727e222bbaa7e5b8289c4fcb6a8c0272cf
 SHA1 (patch-ag) = dd93bb718c996f18b4e985806eb6d4ff5f25a67f
-SHA1 (patch-lookups_Makefile) = ea62db47ea2a09f6abf1dc1db8fb2dae23717396
+SHA1 (patch-lookups_Makefile) = 57a8ab00e5f3c6891c74fdfe457adc1d73bc06ce
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
index 2e22595e2f6..cc1590c2f6f 100644
--- a/mail/exim/options.mk
+++ b/mail/exim/options.mk
@@ -1,14 +1,14 @@
-# $NetBSD: options.mk,v 1.20 2013/07/15 02:02:25 ryoon Exp $
+# $NetBSD: options.mk,v 1.21 2014/04/02 17:36:00 wiedi Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.exim
 PKG_SUPPORTED_OPTIONS=	exim-appendfile-maildir exim-appendfile-mailstore
 PKG_SUPPORTED_OPTIONS+=	exim-appendfile-mbx exim-auth-dovecot exim-build-eximon
 PKG_SUPPORTED_OPTIONS+=	exim-content-scan exim-lookup-cdb exim-lookup-dnsdb
 PKG_SUPPORTED_OPTIONS+=	exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql
-PKG_SUPPORTED_OPTIONS+=	exim-lookup-pgsql exim-lookup-sqlite exim-lookup-whoson
-PKG_SUPPORTED_OPTIONS+=	exim-old-demime exim-router-iplookup exim-tcp-wrappers
-PKG_SUPPORTED_OPTIONS+=	exim-tls exim-transport-lmtp gdbm inet6 saslauthd spf
-PKG_SUPPORTED_OPTIONS+=	readline
+PKG_SUPPORTED_OPTIONS+=	exim-lookup-pgsql exim-lookup-redis exim-lookup-sqlite
+PKG_SUPPORTED_OPTIONS+=	exim-lookup-whoson exim-old-demime exim-router-iplookup
+PKG_SUPPORTED_OPTIONS+=	exim-tcp-wrappers exim-tls exim-transport-lmtp gdbm
+PKG_SUPPORTED_OPTIONS+=	inet6 opendmarc saslauthd spf readline
 
 PKG_SUGGESTED_OPTIONS=	exim-appendfile-maildir exim-appendfile-mailstore
 PKG_SUGGESTED_OPTIONS+=	exim-appendfile-mbx exim-content-scan
@@ -76,6 +76,12 @@ LOOKUP_LIBS+=-lpq
 .  include "../../mk/pgsql.buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Mexim-lookup-redis)
+LOCAL_MAKEFILE_OPTIONS+=EXPERIMENTAL_REDIS=YES
+LOOKUP_LIBS+=-lhiredis
+.  include "../../databases/hiredis/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mexim-lookup-sqlite)
 LOCAL_MAKEFILE_OPTIONS+=LOOKUP_SQLITE=YES
 LOOKUP_LIBS+=-lsqlite3
@@ -118,6 +124,12 @@ LOCAL_MAKEFILE_OPTIONS+=HAVE_IPV6=YES
 LOCAL_MAKEFILE_OPTIONS+=HAVE_IPV6=NO
 .endif
 
+.if !empty(PKG_OPTIONS:Mopendmarc)
+LOCAL_MAKEFILE_OPTIONS+=EXPERIMENTAL_DMARC=yes
+LOOKUP_LIBS+=		-lopendmarc
+.  include "../../mail/opendmarc/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mgdbm)
 .  include "../../databases/gdbm/buildlink3.mk"
 EXIM_USE_DB_CONFIG=	USE_GDBM=yes
diff --git a/mail/exim/patches/patch-lookups_Makefile b/mail/exim/patches/patch-lookups_Makefile
index 52063312aca..a612a4cc9a0 100644
--- a/mail/exim/patches/patch-lookups_Makefile
+++ b/mail/exim/patches/patch-lookups_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-lookups_Makefile,v 1.1 2013/09/02 16:04:13 jperkin Exp $
+$NetBSD: patch-lookups_Makefile,v 1.2 2014/04/02 17:36:00 wiedi Exp $
 
 Avoid use of non-portable "local" keyword.
 
---- scripts/lookups-Makefile.orig	2012-10-25 03:37:38.000000000 +0000
+--- scripts/lookups-Makefile.orig	2013-10-25 00:46:27.000000000 +0000
 +++ scripts/lookups-Makefile
-@@ -62,16 +62,16 @@ tmp="$target.t"
+@@ -61,16 +61,16 @@ fi
  # command-line, not just check the Makefile.
  
  want_dynamic() {
@@ -25,7 +25,18 @@ Avoid use of non-portable "local" keyword.
    env | grep -q "^$re"
    if [ $? -eq 0 ]; then return 0; fi
    grep -q "^[ $tab]*$re" "$defs_source"
-@@ -83,8 +83,7 @@ MODS=""
+@@ -78,8 +78,8 @@ want_at_all() {
+ 
+ # Adapted want_at_all above to work for EXPERIMENTAL features
+ want_experimental() {
+-  local want_name="$1"
+-  local re="EXPERIMENTAL_${want_name}[ $tab]*=[ $tab]*."
++  want_name="$1"
++  re="EXPERIMENTAL_${want_name}[ $tab]*=[ $tab]*."
+   env | grep -q "^$re"
+   if [ $? -eq 0 ]; then return 0; fi
+   grep -q "^[ $tab]*$re" "$defs_source"
+@@ -91,8 +91,7 @@ MODS=""
  OBJ=""
  
  emit_module_rule() {