[pkgsrc/trunk]: pkgsrc/mail/spamass-milter Update spamass-milter to 0.3.1, ba...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e76505e2def0
branches:  trunk
changeset: 519911:e76505e2def0
user:      obache <obache%pkgsrc.org@localhost>
date:      Thu Oct 12 12:19:09 2006 +0000

description:
Update spamass-milter to 0.3.1, based on patch provided by Jaap Boender
via PR 33206.

0.3.1: (2006-03-23)
 * Ensure wrapped headers always use LF (fix for spamassassin 3.1.1)
 * Mimic sendmail's Received header even better.  Logs a warning
   to syslog if it can't fetch a sendmail macro that would help.

diffstat:

 mail/spamass-milter/Makefile         |   5 +-
 mail/spamass-milter/distinfo         |  10 +++---
 mail/spamass-milter/patches/patch-aa |  57 ++---------------------------------
 3 files changed, 11 insertions(+), 61 deletions(-)

diffs (98 lines):

diff -r c7bc40f90b2b -r e76505e2def0 mail/spamass-milter/Makefile
--- a/mail/spamass-milter/Makefile      Thu Oct 12 12:04:39 2006 +0000
+++ b/mail/spamass-milter/Makefile      Thu Oct 12 12:19:09 2006 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2006/07/22 04:46:16 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2006/10/12 12:19:09 obache Exp $
 #
 
-DISTNAME=      spamass-milter-0.3.0
-PKGREVISION=   5
+DISTNAME=      spamass-milter-0.3.1
 CATEGORIES=    mail
 MASTER_SITES=  http://savannah.nongnu.org/download/spamass-milt/
 
diff -r c7bc40f90b2b -r e76505e2def0 mail/spamass-milter/distinfo
--- a/mail/spamass-milter/distinfo      Thu Oct 12 12:04:39 2006 +0000
+++ b/mail/spamass-milter/distinfo      Thu Oct 12 12:19:09 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/04/07 11:27:48 wiz Exp $
+$NetBSD: distinfo,v 1.6 2006/10/12 12:19:09 obache Exp $
 
-SHA1 (spamass-milter-0.3.0.tar.gz) = 383de2178f81ef88fb0d43d0c36ce973f67d10cf
-RMD160 (spamass-milter-0.3.0.tar.gz) = b65af53900ca3eef37ccc27a266ea2143000a0bc
-Size (spamass-milter-0.3.0.tar.gz) = 140126 bytes
-SHA1 (patch-aa) = d732c46132d05030e7df0c85109e9d740af22b51
+SHA1 (spamass-milter-0.3.1.tar.gz) = dd488eb9ab1f230440fba8a729bee80550f2fbff
+RMD160 (spamass-milter-0.3.1.tar.gz) = 5db6af6b31de1bf83eafbd9713d81cdc957b5033
+Size (spamass-milter-0.3.1.tar.gz) = 141144 bytes
+SHA1 (patch-aa) = a1eaf9d3d2dad72f7fa08628293f80cc15374800
diff -r c7bc40f90b2b -r e76505e2def0 mail/spamass-milter/patches/patch-aa
--- a/mail/spamass-milter/patches/patch-aa      Thu Oct 12 12:04:39 2006 +0000
+++ b/mail/spamass-milter/patches/patch-aa      Thu Oct 12 12:19:09 2006 +0000
@@ -1,61 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2005/04/07 11:27:48 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/10/12 12:19:09 obache Exp $
 
---- spamass-milter.cpp.orig    2005-02-05 08:03:22.000000000 +0100
+--- spamass-milter.cpp.orig    2006-03-23 21:41:36.000000000 +0000
 +++ spamass-milter.cpp
-@@ -898,13 +898,21 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp
-                               (envelope-from $g)$.
-                  
-               */
--              const char *macro_b, *macro_s, *macro_j, *macro__;
-+              const char *macro_b, *macro_s, *macro_j, *macro__, *macro_r;
-+              char date[32];  /* sizeof("Mon, 23 Aug 2004 18:28:43 +0900") */
-+              time_t tval;
- 
-               /* Failure to fetch {b} is not fatal.  Without this date SA can't do
-                  future/past validation on the Date: header, but sendmail doesn't
-                  default to allow milters to see it.
-               */
-               macro_b = smfi_getsymval(ctx, "b");
-+              if (!macro_b)
-+              {
-+                      (void) time(&tval);
-+                      (void) strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", localtime(&tval));
-+                      macro_b = date;
-+              }
-                       
-               /* Sendmail currently cannot pass us the {s} macro, but
-                  I do not know why.  Leave this in for the day sendmail is
-@@ -916,6 +924,10 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp
-                       macro_s = sctx->helo;
-               if (!macro_s)
-                       macro_s = "nohelo";
-+              /* Get mailer info. */
-+              macro_r = smfi_getsymval(ctx, "r");
-+              if (!macro_r)
-+                      macro_r = "SMTP"; /* Assuming it as SMTP */
- 
-               /* FQDN of this site */
-               macro_j = smfi_getsymval(ctx, "j");
-@@ -930,10 +942,10 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp
-               assassin->output((string)"X-Envelope-From: "+assassin->from()+"\r\n");
-               assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");
- 
--              if (!macro_b)
--                      assassin->output((string)"Received: from "+macro_s+" ("+macro__+") by "+macro_j+";\r\n");
--              else
--                      assassin->output((string)"Received: from "+macro_s+" ("+macro__+") by "+macro_j+"; "+macro_b+"\r\n");
-+              assassin->output((string)"Received: from "+macro_s
-+                      +" ("+macro__+")\n\tby "+macro_j
-+                      +" ("+PACKAGE_NAME+"/"+PACKAGE_VERSION  /* dummy */
-+                      +") with "+macro_r+";\n\t"+macro_b+"\r\n");
- 
-       } else
-               assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");
-@@ -1965,7 +1977,7 @@ cmp_nocase_partial(const string& s, cons
+@@ -2033,7 +2033,7 @@ cmp_nocase_partial(const string& s, cons
    string::const_iterator p=s.begin();
    string::const_iterator p2=s2.begin();
  
--  while ( p != s.end() && p2 != s2.end() ) {
+-  while ( p != s.end() && p2 <= s2.end() ) {
 +  while ( p != s.end() ) {
      if (toupper(*p) != toupper(*p2))
      {