[pkgsrc/trunk]: pkgsrc/mail/milter-greylist Don't assume time_t and long are ...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5fcf5e5ce45
branches:  trunk
changeset: 526317:d5fcf5e5ce45
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Mar 07 17:33:51 2007 +0000

description:
Don't assume time_t and long are the same (on sparc64, they aren't).
Fixes ascii timestamps in greylist.db, but as this is solely for the
benefit of humans looking at the file functionality is unchanged.

diffstat:

 mail/milter-greylist/Makefile         |   3 ++-
 mail/milter-greylist/distinfo         |   4 +++-
 mail/milter-greylist/patches/patch-ab |  22 ++++++++++++++++++++++
 mail/milter-greylist/patches/patch-ac |  22 ++++++++++++++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)

diffs (77 lines):

diff -r e90f1d16f64a -r d5fcf5e5ce45 mail/milter-greylist/Makefile
--- a/mail/milter-greylist/Makefile     Wed Mar 07 17:31:22 2007 +0000
+++ b/mail/milter-greylist/Makefile     Wed Mar 07 17:33:51 2007 +0000
@@ -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 -r e90f1d16f64a -r d5fcf5e5ce45 mail/milter-greylist/distinfo
--- a/mail/milter-greylist/distinfo     Wed Mar 07 17:31:22 2007 +0000
+++ b/mail/milter-greylist/distinfo     Wed Mar 07 17:33:51 2007 +0000
@@ -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 -r e90f1d16f64a -r d5fcf5e5ce45 mail/milter-greylist/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/milter-greylist/patches/patch-ab     Wed Mar 07 17:33:51 2007 +0000
@@ -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 -r e90f1d16f64a -r d5fcf5e5ce45 mail/milter-greylist/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/milter-greylist/patches/patch-ac     Wed Mar 07 17:33:51 2007 +0000
@@ -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",