ports/72591: spamass-milter cannot play with p5-Mail-SpamAssassin 3.0

[Hajimu UMEMOTO]

>Number:         72591
>Category:       ports
>Synopsis:       spamass-milter cannot play with p5-Mail-SpamAssassin 3.0
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 12 17:50:28 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Hajimu UMEMOTO
>Release:        FreeBSD 5.3-BETA7 i386
>Organization:
Internet Mutual Aid Society, YOKOHAMA
>Environment:
System: FreeBSD lyrics.mahoroba.org 5.3-BETA7 FreeBSD 5.3-BETA7 #0: Sun Oct 3 07:47:11 JST 2004 root at lyrics.mahoroba.org:/ad0s3/usr/obj/usr/src/sys/LYRICS i386
>Description:
Recently, p5-Mail-SpamAssassin was updated to 3.0.  Unfortunatelly,
spamass-milter donsn't work correctly with SpamAssassin 3.0.
>How-To-Repeat:
Receive a message which is identified as spam.
>Fix:
There are two fix related to SpamAssassin 3.0 in the bug reports of
spamass-milter site:

	http://savannah.nongnu.org/bugs/?group=spamass-milt

    - #10488 	Milter adding blank line with Spamassassin-3.0.0
    - #10531 	reject with SA 3.0.0

Following patch was taken form this site.

Index: ports/mail/spamass-milter/Makefile
diff -u ports/mail/spamass-milter/Makefile.orig ports/mail/spamass-milter/Makefile
--- ports/mail/spamass-milter/Makefile.orig	Fri Jun 11 03:46:30 2004
+++ ports/mail/spamass-milter/Makefile	Wed Oct 13 02:27:15 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	spamass-milter
 PORTVERSION=	0.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	spamass-milt
Index: ports/mail/spamass-milter/files/patch-spamass-milter.cpp
diff -u ports/mail/spamass-milter/files/patch-spamass-milter.cpp.orig ports/mail/spamass-milter/files/patch-spamass-milter.cpp
--- ports/mail/spamass-milter/files/patch-spamass-milter.cpp.orig	Fri Jun 11 03:46:30 2004
+++ ports/mail/spamass-milter/files/patch-spamass-milter.cpp	Wed Oct 13 02:26:36 2004
@@ -1,5 +1,5 @@
 --- spamass-milter.cpp.orig	Thu Jun 26 16:10:44 2003
-+++ spamass-milter.cpp	Thu Jun 10 11:46:12 2004
++++ spamass-milter.cpp	Wed Oct 13 00:52:23 2004
 @@ -102,6 +102,10 @@
  #include <csignal>
  #include <string>
@@ -29,7 +29,27 @@
    update_or_insert(assassin, ctx, assassin->spam_flag(), &SpamAssassin::set_spam_flag, "X-Spam-Flag");
    update_or_insert(assassin, ctx, assassin->spam_status(), &SpamAssassin::set_spam_status, "X-Spam-Status");
  
-@@ -1341,7 +1349,11 @@
+@@ -365,7 +373,7 @@
+ 	{
+ 		int score, rv;
+ 		const char *spam_status = assassin->spam_status().c_str();
+-		rv = sscanf(spam_status,"%*s hits=%d", &score);
++		rv = sscanf(spam_status,"%*s score=%d", &score);
+ 		if (rv != 1)
+ 			debug(D_ALWAYS, "Could not extract score from <%s>", spam_status);
+ 		else 
+@@ -539,6 +547,10 @@
+ 	}
+   }
+ 
++  /* if the header line ends in \r\n, don't return the \r */
++  if (header[field_end-1] == '\r')
++	field_end--;
++
+   //  Maybe remove the whitespace picked up when a header wraps - this
+   //  might actually be a requirement
+   return header.substr( field_start, field_end - field_start );
+@@ -1341,7 +1353,11 @@
  {
    // assuming we have a recipient in the form: <username at somehost.somedomain>
    // we return 'username'


>Release-Note:
>Audit-Trail:
>Unformatted: