Update to 3.1.8. From the changelog:

This version fixes a bug with the recipient filters that could allow
a clever sender to use a spamdyke-protected server as an open relay.
The sequence of commands are not legal SMTP, so the sender would
have to know the server was running a vulnerable version of spamdyke
to exploit this bug.  Thanks to Mirko Buffoni for reporting this
one.

This version also fixes two problems with the idle timeout filter.
The first could cause the connection to be rejected because qmail
is slow to respond (which isn't fair).  The second was a tricky
issue where large messages from fast remote servers could be
improperly rejected because the idle timer wasn't being reset.
Thanks to Eric Shubert for reporting and helping me fix this one.

This version also fixes two compiling problems.  The first was a
problem in the "configure" script on older Gentoo installations
running gcc 3.4.6 that was treating a preprocessor warning as an
error.  Thanks to Thorsten Puzich for reporting and helping me fix
this one.  The second was a problem with CentOS 3.8, which doesn't
install the OpenSSL headers in the system include folder.  Thanks
to Bruce Schreiber for reporting this one.

6 files changed, 26 insertions, 47 deletions

diff --git a/mail/spamdyke/Makefile b/mail/spamdyke/Makefile
index 9ed4b483260..8eef5ebcace 100644
--- a/mail/spamdyke/Makefile
+++ b/mail/spamdyke/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2008/04/08 05:18:24 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2008/05/28 23:57:27 schmonz Exp $
 #
 
-DISTNAME=	spamdyke-3.1.7
+DISTNAME=	spamdyke-3.1.8
 CATEGORIES=	mail
 MASTER_SITES=	${HOMEPAGE}releases/
 EXTRACT_SUFX=	.tgz
diff --git a/mail/spamdyke/distinfo b/mail/spamdyke/distinfo
index a8973f47e27..33baa5ad3b2 100644
--- a/mail/spamdyke/distinfo
+++ b/mail/spamdyke/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.12 2008/04/08 05:18:24 schmonz Exp $
+$NetBSD: distinfo,v 1.13 2008/05/28 23:57:27 schmonz Exp $
 
-SHA1 (spamdyke-3.1.7.tgz) = 7ec009590a15f6498dc33308aa3c68afa45b73b3
-RMD160 (spamdyke-3.1.7.tgz) = d2f0c7d3fbc6e5849d986904b97ef87862896267
-Size (spamdyke-3.1.7.tgz) = 264474 bytes
-SHA1 (patch-aa) = 17fc08c6e41286a70195b70acd4e9985e9604ddd
-SHA1 (patch-ab) = 96caec14477be0b25544793b7b7c610d4a0ca195
-SHA1 (patch-ac) = f83bd4a30b77ff3ac641d744a4521d8fa40f0d1d
-SHA1 (patch-ad) = 9558c4f30489d2d6c5cd5abd7848128c95ef9f40
+SHA1 (spamdyke-3.1.8.tgz) = d572dc0c354c1b114418666f6ce29048f16bedc1
+RMD160 (spamdyke-3.1.8.tgz) = 478b5ec97ea48c87727cab9db3471340ca6cf00d
+Size (spamdyke-3.1.8.tgz) = 266739 bytes
+SHA1 (patch-aa) = dd689a4d203873b6fe68a19bbcad7c89f977cd2c
+SHA1 (patch-ab) = e737db1666afb26e8f4985e7d966f0b17c8a08f1
+SHA1 (patch-ac) = 505b227e9b0417433ed0421a8532b4489be67ac7
diff --git a/mail/spamdyke/patches/patch-aa b/mail/spamdyke/patches/patch-aa
index 387c1fcb7db..70d9c5d69aa 100644
--- a/mail/spamdyke/patches/patch-aa
+++ b/mail/spamdyke/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2008/02/25 07:38:00 schmonz Exp $
+$NetBSD: patch-aa,v 1.8 2008/05/28 23:57:27 schmonz Exp $
 
---- spamdyke.h.orig	2008-01-21 16:45:17.000000000 -0500
+--- spamdyke.h.orig	2008-04-22 22:46:02.000000000 -0400
 +++ spamdyke.h
 @@ -38,7 +38,7 @@
  #define STRINGIFY(X)                    _STRINGIFY(X)
diff --git a/mail/spamdyke/patches/patch-ab b/mail/spamdyke/patches/patch-ab
index 051c7e14ea7..1b63381ea9f 100644
--- a/mail/spamdyke/patches/patch-ab
+++ b/mail/spamdyke/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2008/02/25 07:38:00 schmonz Exp $
+$NetBSD: patch-ab,v 1.7 2008/05/28 23:57:27 schmonz Exp $
 
---- configure.ac.orig	2008-02-10 14:35:48.000000000 -0500
+--- configure.ac.orig	2008-05-21 10:33:14.000000000 -0400
 +++ configure.ac
-@@ -49,7 +49,7 @@ AS_IF([ test "x$enable_tls" != "xno" ],
-                        AC_MSG_CHECKING([for OpenSSL libraries (for TLS support)]) 
-                        AC_MSG_RESULT([yes])
-                      ],
--                     [ AS_IF([ test "x$enable_tls" == "xcheck" ],
-+                     [ AS_IF([ test "x$enable_tls" = "xcheck" ],
-                              [ AC_MSG_CHECKING([for OpenSSL libraries (for TLS support)])
-                                AC_MSG_RESULT([no, TLS disabled]) ],
-                              [ AC_MSG_FAILURE([--enable-tls was given but OpenSSL was not found])
+@@ -62,7 +62,7 @@ AS_IF([ test "x$enable_tls" != "xno" ],
+                                         AC_MSG_CHECKING([for OpenSSL libraries (for TLS support)]) 
+                                         AC_MSG_RESULT([yes])
+                                       ],
+-                                      [ AS_IF([ test "x$enable_tls" == "xcheck" ],
++                                      [ AS_IF([ test "x$enable_tls" = "xcheck" ],
+                                               [ AC_MSG_CHECKING([for OpenSSL libraries (for TLS support)])
+                                                 AC_MSG_RESULT([no, TLS disabled]) ],
+                                               [ AC_MSG_FAILURE([--enable-tls was given but OpenSSL was not found])
diff --git a/mail/spamdyke/patches/patch-ac b/mail/spamdyke/patches/patch-ac
index 14472723d0d..99a2d2973f7 100644
--- a/mail/spamdyke/patches/patch-ac
+++ b/mail/spamdyke/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2008/02/25 07:38:00 schmonz Exp $
+$NetBSD: patch-ac,v 1.7 2008/05/28 23:57:27 schmonz Exp $
 
---- configure.orig	2008-02-10 14:36:07.000000000 -0500
+--- configure.orig	2008-05-21 10:33:25.000000000 -0400
 +++ configure
-@@ -2630,7 +2630,7 @@ echo $ECHO_N "checking for OpenSSL libra
+@@ -2715,7 +2715,7 @@ echo $ECHO_N "checking for OpenSSL libra
  echo "${ECHO_T}yes" >&6; }
  
  else
@@ -10,4 +10,4 @@ $NetBSD: patch-ac,v 1.6 2008/02/25 07:38:00 schmonz Exp $
 +   if  test "x$enable_tls" = "xcheck" ; then
     { echo "$as_me:$LINENO: checking for OpenSSL libraries (for TLS support)" >&5
  echo $ECHO_N "checking for OpenSSL libraries (for TLS support)... $ECHO_C" >&6; }
-                                { echo "$as_me:$LINENO: result: no, TLS disabled" >&5
+                                                 { echo "$as_me:$LINENO: result: no, TLS disabled" >&5
diff --git a/mail/spamdyke/patches/patch-ad b/mail/spamdyke/patches/patch-ad
deleted file mode 100644
index da74e58db4e..00000000000
--- a/mail/spamdyke/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/03/30 17:04:48 schmonz Exp $
-
---- dns.c.orig	2008-01-21 16:45:17.000000000 -0500
-+++ dns.c
-@@ -18,6 +18,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/time.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <arpa/nameser.h>
-@@ -27,6 +28,7 @@
- #include <ctype.h>
- #include <netdb.h>
- #include <strings.h>
-+#include <stdlib.h>
- #include "spamdyke.h"
- #include "log.h"
- #include "dns.h"