Update enma to 1.2.0.

2012-01-31  SUZUKI Takahiko  <takahiko@iij.ad.jp>

    * 1.2.0
    * [DKIM] fix mis-canonicalization of empty message body in "relax" mode

2011-12-05  SUZUKI Takahiko  <takahiko@iij.ad.jp>

    * 1.1.992
    * support platforms which doesn't have EAI_NODATA any more
    * adjust configure.ac not to link with librt when ldns is chosen as a resolver

2011-11-28  SUZUKI Takahiko  <takahiko@iij.ad.jp>

    * 1.1.991
    * switch default resolver from libbind to ldns
    * [SPF/SIDF] fix memory allocation error at expanding "p" macro when <ip> has no validated domain names
    * [SPF/SIDF] fix misevaluation on domain names longer than 63 characters (thanks to KODAMA Daisuke, NEC BIGLOBE)
    * [DKIM] catch up the updates from RFC4871, RFC5672 to RFC6376
    * [DKIM] change result from "none" to "permerror" of message without any Author header
    * [DKIM] fix mis-canonicalization of header field name includes WSP in "relax" mode
    * [DKIM] fix memory allocation error on message with syntax errors in sig-i-tag value

5 files changed, 43 insertions, 25 deletions

diff --git a/mail/enma/DESCR b/mail/enma/DESCR
index e09384a82ae..681ebd3dc90 100644
--- a/mail/enma/DESCR
+++ b/mail/enma/DESCR
@@ -1,14 +1,17 @@
 ENMA is a milter program for the domain authentication technologies.
-It authenticates sender's address with SPF and Sender ID, then
-labels the result onto the Authentication-Results: field.
+It authenticates sender's address with SPF, Sender ID, DKIM and DKIM
+ADSP, then labels the result onto the Authentication-Results: field.
 
-ENMA implements the following RFCs and an Internet Draft:
+ENMA implements the following RFCs:
 
-- RFC4406 (Sender ID)
-- RFC4407 (PRA)
-- RFC4408 (SPF)
-- draft-kucherawy-sender-auth-header-15
-  (the Authentication-Results: field)
+- RFC4406 (Sender ID: Authenticating E-Mail)
+- RFC4407 (Purported Responsible Address)
+- RFC4408 (Sender Policy Framework)
+- RFC4871 (DKIM Signatures, obsoleted by RFC6376)
+- RFC5451 (Authentication-Results Header Field)
+- RFC5617 (ADSP)
+- RFC5672 (RFC 4871 Update, obsoleted by RFC6376)
+- RFC6376 (DKIM Signatures)
 
 ENMA is developed by IIJ. IIJ has been using several domain
 authentication software, though, all of them appeared unstable. ENMA
diff --git a/mail/enma/Makefile b/mail/enma/Makefile
index bef3ddcbb01..bb294e87cf9 100644
--- a/mail/enma/Makefile
+++ b/mail/enma/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/05/28 07:26:48 obache Exp $
+# $NetBSD: Makefile,v 1.7 2012/02/01 10:38:18 obache Exp $
 #
 
-DISTNAME=	enma-1.1.0
-PKGREVISION=	2
+DISTNAME=	enma-1.2.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enma/}
 
@@ -14,12 +13,14 @@ LICENSE=	2-clause-bsd
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake
 
 CONFIGURE_ARGS+=	--with-libmilter=${BUILDLINK_PREFIX.libmilter}
-CONFIGURE_ARGS+=	--with-libbind=${BUILDLINK_PREFIX.libbind}
+CONFIGURE_ARGS+=	--with-ldns=${BUILDLINK_PREFIX.ldns}
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/examples/enma
+CONFIGURE_ARGS+=	--with-resolver=ldns
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 BUILD_DEFS+=	VARBASE
 
@@ -61,7 +62,8 @@ post-install:
 		${DESTDIR}${PREFIX}/share/examples/enma/enma.conf.sample
 
 .include "../../mail/libmilter/buildlink3.mk"
-.include "../../net/libbind/buildlink3.mk"
+BUILDLINK_API_DEPENDS.ldns+=	ldns>=1.6.0
+.include "../../net/ldns/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/enma/PLIST b/mail/enma/PLIST
index 494bdab9b22..7768bd1bf3a 100644
--- a/mail/enma/PLIST
+++ b/mail/enma/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:04:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/02/01 10:38:18 obache Exp $
 bin/sidfquery
+lib/libsauth.la
 libexec/enma
 man/ja_JP.UTF-8/man1/enma.1
 man/man1/enma.1
diff --git a/mail/enma/distinfo b/mail/enma/distinfo
index fdccce6dfa8..82c5019e9cc 100644
--- a/mail/enma/distinfo
+++ b/mail/enma/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2009/04/09 02:25:37 obache Exp $
+$NetBSD: distinfo,v 1.3 2012/02/01 10:38:18 obache Exp $
 
-SHA1 (enma-1.1.0.tar.gz) = 4fe05c3a5f3cc7c1758958123c6ef6e56cdc803d
-RMD160 (enma-1.1.0.tar.gz) = e30a301298a05aed0d347a37a2dfcd1a7ee9d863
-Size (enma-1.1.0.tar.gz) = 238176 bytes
-SHA1 (patch-ac) = 5ca90712fb1b2178b9dc77231f1772bac7e1fa85
+SHA1 (enma-1.2.0.tar.gz) = 91d3863dc144c8567d18744d8219b8d0049ebe75
+RMD160 (enma-1.2.0.tar.gz) = 80c38ba76d2a51a8703bbc3d2073dbd8aaa51f22
+Size (enma-1.2.0.tar.gz) = 411233 bytes
+SHA1 (patch-ac) = 57cf3f8bbe72ccea46fc40f72d506a1a1c738c7b
diff --git a/mail/enma/patches/patch-ac b/mail/enma/patches/patch-ac
index b624fbcc75f..1a05fb5e724 100644
--- a/mail/enma/patches/patch-ac
+++ b/mail/enma/patches/patch-ac
@@ -1,9 +1,21 @@
-$NetBSD: patch-ac,v 1.1 2009/04/09 02:25:38 obache Exp $
+$NetBSD: patch-ac,v 1.2 2012/02/01 10:38:18 obache Exp $
 
---- configure.orig	2009-03-02 05:01:02.000000000 +0000
+* Not to be unwanted CFLAGS modification. 
+* Use pkgsrc's PTHREAD related compiler flags.
+
+--- configure.orig	2012-01-30 08:06:13.000000000 +0000
 +++ configure
-@@ -4170,8 +4170,8 @@ fi
+@@ -18548,8 +18548,6 @@ fi
+ if test "${enable_debug+set}" = set; then
+   enableval="$enable_debug"
+   CFLAGS="$CFLAGS -g3 -O0"
+-else
+-  CFLAGS="$CFLAGS -g -O2"
+ fi;
+ 
  
+@@ -18641,8 +18639,8 @@ else
+ fi;
  
  CFLAGS="$CFLAGS -std=gnu99 -Wall -Wextra"
 -CPPFLAGS="$CPPFLAGS -I$includedir -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
@@ -11,5 +23,5 @@ $NetBSD: patch-ac,v 1.1 2009/04/09 02:25:38 obache Exp $
 +CPPFLAGS="$CPPFLAGS -I$includedir $PTHREAD_CFLAGS"
 +LDFLAGS="$LDFLAGS -L$libdir $PTHREAD_LDFLAGS $PTHREAD_LIBS"
  
- { echo "$as_me:$LINENO: checking for __res_ndestroy in -lbind" >&5
- echo $ECHO_N "checking for __res_ndestroy in -lbind... $ECHO_C" >&6; }
+ 
+ # Check whether --with-resolver or --without-resolver was given.