>Number:         33206
>Category:       pkg
>Synopsis:       Update of spamass-milter to version 0.3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Apr 06 08:50:00 +0000 2006
>Originator:     Jaap Boender
>Release:        NetBSD 3.0_STABLE
>Organization:
>Environment:
	
	
System: NetBSD courbet.kerguelen.org 3.0_STABLE NetBSD 3.0_STABLE (COURBET) #4: Thu Mar 30 13:53:09 CEST 2006 root@courbet.kerguelen.org:/usr/obj/sys/arch/alpha/compile/COURBET alpha
Architecture: alpha
Machine: alpha
>Description:
A patch to update spamass-milter to version 0.3.1. This fixes the problem with
spamassasin 3.1.1 that spamass-milter had. Also, some of the patches from
patch-aa have been added; I've changed patch-aa accordingly.
>How-To-Repeat:
n/a
>Fix:
Here is the patch:
--begin patch--
diff -ur spamass-milter.old/Makefile spamass-milter/Makefile
--- spamass-milter.old/Makefile	2006-04-06 10:10:21.000000000 +0200
+++ spamass-milter/Makefile	2006-04-06 10:10:36.000000000 +0200
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.23 2006/03/04 21:30:02 jlam Exp $
 #
 
-DISTNAME=	spamass-milter-0.3.0
-PKGREVISION=	5
+DISTNAME=	spamass-milter-0.3.1
+#PKGREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://savannah.nongnu.org/download/spamass-milt/
 
diff -ur spamass-milter.old/distinfo spamass-milter/distinfo
--- spamass-milter.old/distinfo	2006-04-06 10:10:21.000000000 +0200
+++ spamass-milter/distinfo	2006-04-06 10:22:39.000000000 +0200
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.5 2005/04/07 11:27:48 wiz 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) = df23764194534fc964e9536bb788f8a554fbe67f
diff -ur spamass-milter.old/patches/patch-aa spamass-milter/patches/patch-aa
--- spamass-milter.old/patches/patch-aa	2006-04-06 10:10:21.000000000 +0200
+++ spamass-milter/patches/patch-aa	2006-04-06 10:22:26.000000000 +0200
@@ -1,61 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2005/04/07 11:27:48 wiz Exp $
-
---- spamass-milter.cpp.orig	2005-02-05 08:03:22.000000000 +0100
-+++ 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
+--- spamass-milter.cpp.orig	2006-04-06 10:17:25.000000000 +0200
++++ spamass-milter.cpp	2006-04-06 10:22:02.000000000 +0200
+@@ -2033,7 +2033,7 @@
    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))
      {
--end patch--

>Unformatted: