refresh patches

diff --git a/debian/patches/auth_in_received b/debian/patches/auth_in_received
index d81e6226b6a3c1a635bed47c8bd1a2790cc2113a..45523fb49e838ce52fc34c87d2086ed6c50fc83e 100644 (file)
--- a/debian/patches/auth_in_received
+++ b/debian/patches/auth_in_received
@@ -3,11 +3,9 @@ Origin: https://www.linuxhacker.at/opensource-projects/spamass-milter
 Bug: #627989
 Author: Herbert Straub, Knut Arne Bjørndal <knut.arne.bjorndal@easyconnect.no>
 Forwarded: no
-Index: spamass-milter/spamass-milter.cpp
-===================================================================
---- spamass-milter.orig/spamass-milter.cpp     2012-06-21 13:03:42.000000000 -0700
-+++ spamass-milter/spamass-milter.cpp  2012-06-21 14:02:32.000000000 -0700
-@@ -898,7 +898,8 @@
+--- a/spamass-milter.cpp
++++ b/spamass-milter.cpp
+@@ -940,7 +940,8 @@
                   
                */
                const char *macro_b, *macro_i, *macro_j, *macro_r,
@@ -17,7 +15,7 @@ Index: spamass-milter/spamass-milter.cpp
                char date[32];
  
                /* RFC 822 date. */
-@@ -935,7 +936,22 @@
+@@ -977,7 +978,22 @@
                        macro_r = "SMTP";
                        warnmacro("r", "ENVRCPT");
                }
@@ -41,7 +39,7 @@ Index: spamass-milter/spamass-milter.cpp
                /* Sendmail currently cannot pass us the {s} macro, but
                   I do not know why.  Leave this in for the day sendmail is
                   fixed.  Until that day, use the value remembered by
-@@ -974,11 +990,22 @@
+@@ -1016,11 +1032,22 @@
                assassin->output((string)"X-Envelope-From: "+assassin->from()+"\r\n");
                assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");
  

diff --git a/debian/patches/fix_spacing_in_received_header b/debian/patches/fix_spacing_in_received_header
index 906cd3cc3fbcae25282858d535d0cf323ccd2789..7bba1b140b54a00d5a92f04e4306a5934ae0aad1 100644 (file)
--- a/debian/patches/fix_spacing_in_received_header
+++ b/debian/patches/fix_spacing_in_received_header
@@ -2,11 +2,9 @@ Description: Fix spacing in the received header
 Author: Marco d'Itri <md@linux.it>
 Bug: #510665
 Forwarded: no
-Index: spamass-milter/spamass-milter.cpp
-===================================================================
---- spamass-milter.orig/spamass-milter.cpp     2012-06-21 13:02:06.000000000 -0700
-+++ spamass-milter/spamass-milter.cpp  2012-06-21 13:02:08.000000000 -0700
-@@ -967,7 +967,7 @@
+--- a/spamass-milter.cpp
++++ b/spamass-milter.cpp
+@@ -1018,7 +1018,7 @@
  
                assassin->output((string)
                        "Received: from "+macro_s+" ("+macro__+")\r\n\t"+