ports/143560: [PATCH] mail/spamass-milter - Generated "Received" header is wrong

[Marko Njezic]

>Number:         143560
>Category:       ports
>Synopsis:       [PATCH] mail/spamass-milter - Generated "Received" header is wrong
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 04 17:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Marko Njezic
>Release:        8.0-RELEASE-p2
>Organization:
MAX Interactive corp.
>Environment:
FreeBSD vmbsd 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 16:02:27 UTC 2010     root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
spamass-milter generates "Received" header emulating MTA before passing e-mail to the spamassassin. However, generated header is wrong and can cause problems when parsing such message.

This bug has been submitted to the spamass-milter bug tracker a long time ago and you can find it at: http://savannah.nongnu.org/bugs/index.php?17178

A fix has been committed to the spamass-milter's CVS ( http://cvs.savannah.gnu.org/viewvc/spamass-milt/spamass-milter.cpp?root=spamass-milt&r1=1.90&r2=1.91 ), but no new version has been released since, and therefore the bug is present in currently available port.

I've backported the fix from spamass-milter's CVS with one additional whitespace after hostname and created the patch against current port.
>How-To-Repeat:

>Fix:
Apply the suggested patch file.

Patch attached with submission follows:

diff -Naur spamass-milter.original/files/patch-spamass-milter.cpp spamass-milter/files/patch-spamass-milter.cpp
--- spamass-milter.original/files/patch-spamass-milter.cpp	1970-01-01 01:00:00.000000000 +0100
+++ spamass-milter/files/patch-spamass-milter.cpp	2010-02-04 18:11:52.000000000 +0100
@@ -0,0 +1,14 @@
+--- spamass-milter.cpp	2006-03-23 22:41:36.000000000 +0100
++++ spamass-milter.cpp	2010-02-04 14:46:31.000000000 +0100
+@@ -1002,9 +1002,9 @@
+ 
+ 		assassin->output((string)
+ 			"Received: from "+macro_s+" ("+macro__+")\r\n\t"+
+-			"by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
++			"by "+macro_j+" ("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+";\r\n\t"+
+ 			macro_b+"\r\n\t"+
+-			"(envelope-from "+assassin->from()+"\r\n");
++			"(envelope-from "+assassin->from()+")\r\n");
+ 
+ 	} else
+ 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");


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