Fix spacing and missing semicolon on Received: header (closes: #775183)

diff --git a/debian/changelog b/debian/changelog
index b3b0118dad81bd98a037fb95e8d56ab7ca4f5e08..3472d39c3d71d4f9297eb417df6fd0b5979db931 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ spamass-milter (0.4.0-1) unstable; urgency=medium
   * New upstream release
   * Refresh patches
   * Remove debian ipv6 patch and header cast patch which were upstreamed
+  * Fix spacing and missing semicolon on Received: header (closes:
+    #775183)
 
  -- Don Armstrong <don@debian.org>  Thu, 06 Aug 2015 20:45:55 -0700
 

diff --git a/debian/patches/auth_in_received b/debian/patches/auth_in_received
index 45523fb49e838ce52fc34c87d2086ed6c50fc83e..b8f35834ad308de157e715d7be9f4fec9572917d 100644 (file)
--- a/debian/patches/auth_in_received
+++ b/debian/patches/auth_in_received
@@ -55,11 +55,11 @@ Forwarded: no
 +                      }
 +                      rec_header+=(string)")\r\n\t";
 +              }
-+              rec_header+=(string)"by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+
++              rec_header+=(string)"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";
++                      "(envelope-from "+assassin->from()+");\r\n";
 +
 +              debug(D_SPAMC, "Received header for spamc: %s", rec_header.c_str());
 +              assassin->output(rec_header);