Update to 4.0. Removed patches were merged upstream.

From the changelog, this seems to be many bugfixes and better RBL support.

5 files changed, 6 insertions, 67 deletions

diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index b59a9437e48..c240c53dc3a 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2007/10/10 12:13:04 tron Exp $
+# $NetBSD: Makefile,v 1.33 2007/11/21 20:29:46 gdt Exp $
 
-DISTNAME=	milter-greylist-3.0
-PKGREVISION=	1
+DISTNAME=	milter-greylist-4.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
 EXTRACT_SUFX=	.tgz
diff --git a/mail/milter-greylist/distinfo b/mail/milter-greylist/distinfo
index 877bfa83bf1..8460743d2dd 100644
--- a/mail/milter-greylist/distinfo
+++ b/mail/milter-greylist/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.19 2007/10/11 09:49:59 tron Exp $
+$NetBSD: distinfo,v 1.20 2007/11/21 20:29:46 gdt Exp $
 
-SHA1 (milter-greylist-3.0.tgz) = 38b334300fe1141a8329fe198754e63286981129
-RMD160 (milter-greylist-3.0.tgz) = 6391883be9076b1f790ab582070b152b80e2050c
-Size (milter-greylist-3.0.tgz) = 141461 bytes
+SHA1 (milter-greylist-4.0.tgz) = e94c8c8a7ed5cf27550eb69f660c7d75c60f6ac1
+RMD160 (milter-greylist-4.0.tgz) = e84329491ea06044549aafbf65bf8adf4c01956b
+Size (milter-greylist-4.0.tgz) = 185107 bytes
 SHA1 (patch-aa) = 2e31f7db50a8aac45e21e4ae4642d0c6631e8c78
-SHA1 (patch-ab) = c2f0859a0b9353c59810c330fbaddb9f7634daee
-SHA1 (patch-ac) = 7409182f4d5870615183e9e3d4baa27084a4c4d5
-SHA1 (patch-ad) = f78435062740966a04b8be96d73ec070c0925354
diff --git a/mail/milter-greylist/patches/patch-ab b/mail/milter-greylist/patches/patch-ab
deleted file mode 100644
index 99e70dc56a2..00000000000
--- a/mail/milter-greylist/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/03/07 17:33:51 gdt Exp $
-
---- autowhite.c.orig	2006-09-04 18:05:58.000000000 -0400
-+++ autowhite.c
-@@ -385,6 +385,7 @@ autowhite_textdump(stream)
- 	char textdate[DATELEN + 1];
- 	char textaddr[IPADDRSTRLEN];
- 	struct tm tm;
-+	time_t ti;
- 
- 	fprintf(stream, "\n\n#\n# Auto-whitelisted tuples\n#\n");
- 	fprintf(stream, "# Sender IP\t%s\t%s\tExpire\n",
-@@ -401,7 +402,8 @@ autowhite_textdump(stream)
- 			    textaddr, aw->a_from, aw->a_rcpt, 
- 			    (long)aw->a_tv.tv_sec);
- 		} else {
--			localtime_r((time_t *)&aw->a_tv.tv_sec, &tm);
-+			ti = aw->a_tv.tv_sec; /* types do not match */
-+			localtime_r(&ti, &tm);
- 			strftime(textdate, DATELEN, "%Y-%m-%d %T", &tm);
- 	
- 			fprintf(stream, 
diff --git a/mail/milter-greylist/patches/patch-ac b/mail/milter-greylist/patches/patch-ac
deleted file mode 100644
index 0b39726b0b3..00000000000
--- a/mail/milter-greylist/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/03/07 17:33:51 gdt Exp $
-
---- pending.c.orig	2006-09-04 18:05:59.000000000 -0400
-+++ pending.c
-@@ -403,6 +403,7 @@ pending_textdump(stream)
- 	int done = 0;
- 	char textdate[DATELEN + 1];
- 	struct tm tm;
-+	time_t ti;
- 
- 	fprintf(stream, "\n\n#\n# greylisted tuples\n#\n");
- 	fprintf(stream, "# Sender IP\t%s\t%s\tTime accepted\n", 
-@@ -416,7 +417,8 @@ pending_textdump(stream)
- 			    pending->p_addr, pending->p_from, 
- 			    pending->p_rcpt, (long)pending->p_tv.tv_sec);
- 		} else {
--			localtime_r((time_t *)&pending->p_tv.tv_sec, &tm);
-+			ti = pending->p_tv.tv_sec;
-+			localtime_r(&ti, &tm);
- 			strftime(textdate, DATELEN, "%Y-%m-%d %T", &tm);
- 		
- 			fprintf(stream, "%s\t%s\t%s\t%ld # %s\n", 
diff --git a/mail/milter-greylist/patches/patch-ad b/mail/milter-greylist/patches/patch-ad
deleted file mode 100644
index 3ae69ee24f5..00000000000
--- a/mail/milter-greylist/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/10/11 09:49:59 tron Exp $
-
---- configure.orig	2006-11-20 20:51:36.000000000 +0000
-+++ configure	2007-10-11 10:37:03.000000000 +0100
-@@ -9031,7 +9031,7 @@
- # Check whether --enable-dnsrbl or --disable-dnsrbl was given.
- if test "${enable_dnsrbl+set}" = set; then
-   enableval="$enable_dnsrbl"
--  if test x$enableval = xyes -a $rdns = yes; then
-+  if test $rdns = yes; then
- 		CFLAGS=$CFLAGS" -DUSE_DNSRBL"
- 	 else
- 		echo "--enable-dnsrbl used but DNS resolver is not thread safe";