From a1c98979ec7fd844f60d071da49a4d0007285372 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Thu, 6 Aug 2015 20:44:16 -0700 Subject: [PATCH] refresh patches --- debian/patches/auth_in_received | 12 +++++------- debian/patches/fix_spacing_in_received_header | 8 +++----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/debian/patches/auth_in_received b/debian/patches/auth_in_received index d81e622..45523fb 100644 --- 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 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 906cd3c..7bba1b1 100644 --- 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 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"+ -- 2.39.2