X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fspamass-milter.git;a=blobdiff_plain;f=debian%2Fpatches%2Fauth_in_received;fp=debian%2Fpatches%2Fauth_in_received;h=45523fb49e838ce52fc34c87d2086ed6c50fc83e;hp=d81e6226b6a3c1a635bed47c8bd1a2790cc2113a;hb=a1c98979ec7fd844f60d071da49a4d0007285372;hpb=ae3144f104c73cb7ba16ffb783902753ce70821a

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 <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");