Update to 2.6.2. From the changelog:

  Fixed smtp_filter() to accept parameters to AUTH PLAIN when the MUA sends the
    authentication information with the command instead of waiting for another
    prompt.
  Changed find_address() to strip BATV tags from addresses so whitelist/
    blacklist matching can still take place.  Reported by Walter Russo.
  Added utils/passwordcheck to help troubleshoot SMTP AUTH problems.
  Added more logging to exec_checkpassword() to aid troubleshooting.

5 files changed, 21 insertions, 17 deletions

diff --git a/mail/spamdyke/Makefile b/mail/spamdyke/Makefile
index 1454d2c8a06..a1af3fb9885 100644
--- a/mail/spamdyke/Makefile
+++ b/mail/spamdyke/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2007/06/04 21:54:05 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2007/06/08 01:08:29 schmonz Exp $
 #
 
-DISTNAME=	spamdyke-2.6.1
+DISTNAME=	spamdyke-2.6.2
 CATEGORIES=	mail
 MASTER_SITES=	${HOMEPAGE}releases/
 EXTRACT_SUFX=	.tgz
@@ -13,10 +13,13 @@ COMMENT=	Monitors and intercept incoming SMTP connections to qmail
 BUILD_DIRS=	${PKGBASE} utils
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	${PKGBASE}/spamdyke.c
+SUBST_FILES.paths=	${PKGBASE}/spamdyke.h
 SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX:Q},g'
+SUBST_SED.paths+=	-e 's,@QMAILDIR@,${QMAILDIR:Q},g'
 SUBST_STAGE.paths=	do-configure
 
+BUILD_DEFS+=		QMAILDIR
+
 INSTALLATION_DIRS=	bin share/doc/${PKGBASE}
 
 .include "options.mk"
@@ -27,7 +30,7 @@ do-install:
 		${INSTALL_PROGRAM} $${f} ${PREFIX}/bin;			\
 	done
 	cd ${WRKSRC}/utils;						\
-	for f in dnsmx dnsptr dnstxt; do				\
+	for f in dnsmx dnsptr dnstxt passwordcheck; do			\
 		${INSTALL_PROGRAM} $${f} ${PREFIX}/bin/spamdyke-$${f};	\
 	done;								\
 	for f in domain2path domainsplit; do				\
diff --git a/mail/spamdyke/PLIST b/mail/spamdyke/PLIST
index 8dd01fedc48..86a834b82a6 100644
--- a/mail/spamdyke/PLIST
+++ b/mail/spamdyke/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2007/04/11 14:50:37 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/06/08 01:08:29 schmonz Exp $
 bin/spamdyke-dnsmx
 bin/spamdyke-dnsptr
 bin/spamdyke-dnstxt
+bin/spamdyke-passwordcheck
 bin/domain2path
 bin/domainsplit
 bin/spamdyke
diff --git a/mail/spamdyke/distinfo b/mail/spamdyke/distinfo
index d477335431b..18b8b754963 100644
--- a/mail/spamdyke/distinfo
+++ b/mail/spamdyke/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/06/04 21:54:05 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2007/06/08 01:08:29 schmonz Exp $
 
-SHA1 (spamdyke-2.6.1.tgz) = 6555d7ddd8f57a674c0c2ac5dc0c667dd1e4a4f5
-RMD160 (spamdyke-2.6.1.tgz) = 24326eb4f18359dc5bc065e25f70f7e2119a64c7
-Size (spamdyke-2.6.1.tgz) = 109837 bytes
-SHA1 (patch-aa) = 34f349594339f4a2df360249a7696dfbaab03ab7
+SHA1 (spamdyke-2.6.2.tgz) = c082465a878773f1d504f7f3c7ac355b7d31a140
+RMD160 (spamdyke-2.6.2.tgz) = 52e78528891465f09f5d634a6d3148626dc36d1a
+Size (spamdyke-2.6.2.tgz) = 114507 bytes
+SHA1 (patch-aa) = 37078923dfdd7afba91ae0472395ecbbf08946dc
 SHA1 (patch-ab) = e92e9ed2265debd1bf3607d83c3645a37acb4ffe
-SHA1 (patch-ac) = 063c5c98d553f3e173b8c87c7ca24661264bb4cc
+SHA1 (patch-ac) = b8e6f4aedfcc721055c280d23019e26ac4e05ca1
diff --git a/mail/spamdyke/patches/patch-aa b/mail/spamdyke/patches/patch-aa
index 3cd7b48aecf..2ff79a4ff18 100644
--- a/mail/spamdyke/patches/patch-aa
+++ b/mail/spamdyke/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2007/05/30 05:58:11 schmonz Exp $
+$NetBSD: patch-aa,v 1.5 2007/06/08 01:08:29 schmonz Exp $
 
---- spamdyke/spamdyke.h.orig	2007-05-24 22:26:48.000000000 -0400
+--- spamdyke/spamdyke.h.orig	2007-06-06 18:19:50.000000000 -0400
 +++ spamdyke/spamdyke.h
 @@ -32,7 +32,7 @@
  
  #define STRLEN(X)                       (sizeof(X) - 1)
  
 -#define DEFAULT_PATH                    "/bin:/usr/bin:/usr/local/bin:/var/qmail/bin:/home/vpopmail/bin"
-+#define DEFAULT_PATH                    "/bin:/usr/bin:@PREFIX@/bin:/var/qmail/bin:/home/vpopmail/bin"
++#define DEFAULT_PATH                    "/bin:/usr/bin:@PREFIX@/bin:@QMAILDIR@/bin:/home/vpopmail/bin"
  #define DEFAULT_TIMEOUT_COMMAND_SECS    60
  #define DEFAULT_TIMEOUT_CONNECTION_SECS 0
  #define TIMEOUT_CHECKPASSWORD_SECS      30
diff --git a/mail/spamdyke/patches/patch-ac b/mail/spamdyke/patches/patch-ac
index 9071ebf564e..fe41b569b34 100644
--- a/mail/spamdyke/patches/patch-ac
+++ b/mail/spamdyke/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2007/05/30 05:58:11 schmonz Exp $
+$NetBSD: patch-ac,v 1.4 2007/06/08 01:08:29 schmonz Exp $
 
---- utils/Makefile.orig	2007-05-25 10:37:47.000000000 -0400
+--- utils/Makefile.orig	2007-06-05 22:51:35.000000000 -0400
 +++ utils/Makefile
 @@ -1,5 +1,5 @@
  #CFLAGS := -Wall -g -funsigned-char -I../spamdyke
@@ -8,4 +8,4 @@ $NetBSD: patch-ac,v 1.3 2007/05/30 05:58:11 schmonz Exp $
 +CFLAGS += -Wall -O2 -funsigned-char -I../spamdyke
  LFLAGS := -lresolv
  
- all: domain2path domainsplit dnstxt dnsptr dnsmx
+ all: domain2path domainsplit dnstxt dnsptr dnsmx passwordcheck