From: Debian BTS <debbugs@rietz>
Date: Fri, 15 Feb 2008 21:47:55 +0000 (+0000)
Subject: merge changes from dla source
X-Git-Tag: release/2.6.0~502
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=340b936dd0c6d22f07c19fc78518cd23e614ffbd;hp=e6da6293941545aef76565c9a48ab8684c4e5767;p=debbugs.git

merge changes from dla source
---

diff --git a/scripts/spamscan-sa b/scripts/spamscan-sa
index 3dd5f19..02d6ae5 100755
--- a/scripts/spamscan-sa
+++ b/scripts/spamscan-sa
@@ -101,13 +101,10 @@ while (my $id = <STDIN>) {
 	    $out .= "  spam $score\n";
 	    $nseen = $score;
 	} else {
+	    my ($before, $received, $after) = $headers =~
+		/(^.*?)(^Received\: \(at .*?\n)(.*$)/ms;
 	    open OUT, "> incoming/I$id" or die "open incoming/I$id: $!";
-	    my ($received, $from, $other_headers) =
-		split(/\n/, $headers, 3);
-	    if ($recevied =~ /^From /) {
-		($received, $from) = ($from, $received);
-	    }
-	    print OUT "$received\n$from\n$other_headers"
+	    print OUT $received . $before . $after
 		or die "print incoming/I$id: $!";
 	    if ($ca_score > 1) {
 		print OUT "X-CrossAssassin-Score: $ca_score\n"