4 files changed, 49 insertions, 2 deletions
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index b83cf1660a8..b87c4e658da 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2006/11/21 08:38:32 tron Exp $
+# $NetBSD: Makefile,v 1.31 2007/03/07 17:33:51 gdt Exp $
 
 DISTNAME=	milter-greylist-3.0
+PKGREVISION=	1
 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 f317b855775..3d17ab87de6 100644
--- a/mail/milter-greylist/distinfo
+++ b/mail/milter-greylist/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.17 2006/11/21 08:38:32 tron Exp $
+$NetBSD: distinfo,v 1.18 2007/03/07 17:33:51 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 (patch-aa) = 2e31f7db50a8aac45e21e4ae4642d0c6631e8c78
+SHA1 (patch-ab) = c2f0859a0b9353c59810c330fbaddb9f7634daee
+SHA1 (patch-ac) = 7409182f4d5870615183e9e3d4baa27084a4c4d5
diff --git a/mail/milter-greylist/patches/patch-ab b/mail/milter-greylist/patches/patch-ab
new file mode 100644
index 00000000000..99e70dc56a2
--- /dev/null
+++ b/mail/milter-greylist/patches/patch-ab
@@ -0,0 +1,22 @@
+$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
new file mode 100644
index 00000000000..0b39726b0b3
--- /dev/null
+++ b/mail/milter-greylist/patches/patch-ac
@@ -0,0 +1,22 @@
+$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",