From 2ce36ef5fab81b4f8757f5efcfc9d21bd6cf37df Mon Sep 17 00:00:00 2001 From: don Date: Tue, 6 Jan 2009 02:41:02 +0000 Subject: [PATCH] * Update milter_connect_macros_line (thanks to Marco d'Itri) * Fix the code to generate a sendmail-compatible header (thanks to Marco d'Itri) (Closes: #510665). --- debian/NEWS.Debian | 8 ++++++++ debian/README.Debian | 8 +++++--- debian/changelog | 5 ++++- spamass-milter.cpp | 4 ++-- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index 5956d13..ec0469e 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,3 +1,11 @@ +spamass-milter (0.3.1-6) unstable; urgency=low + + * Note that users of postfix may wish to add "milter_connect_macros = j + {daemon_name} v {if_name} _" to their main.cf if they haven't already + done so. See README.Debian. + + -- Don Armstrong Mon, 05 Jan 2009 13:04:21 -0800 + spamass-milter (0.3.1-5) unstable; urgency=low * spamass-milter now tries to run as spamass-milter. This means that the diff --git a/debian/README.Debian b/debian/README.Debian index c141cd8..4c40aee 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -53,6 +53,8 @@ chroot. In recent versions of Debian the following should work: # spamass-milter configuration smtpd_milters = unix:/spamass/spamass.sock + # milter macros usefull for spamass-milter + milter_connect_macros = j {daemon_name} v {if_name} _ See http://www.postfix.org/MILTER_README.html or /usr/share/doc/postfix/MILTER_README.gz (in postfix-doc) for @@ -60,8 +62,8 @@ information on how to set tempfail and the various timeouts that the sendmail configuration above uses. The defaults for spamass-milter adjust themselves so that no -configuration in /etc/default/milter should be required. [However, if -you are not doing so, see below.] +configuration in /etc/default/spamass-milter should be required. +[However, if you are not doing so, see below.] ------------------------------------------------------------- Adjusting how spamass-milter is started @@ -116,4 +118,4 @@ q and send the results along with your bug report using reportbug. - -- Don Armstrong , Thu, 21 Aug 2008 16:52:22 -0700 + -- Don Armstrong , Mon, 5 Jan 2009 13:03:36 -0800 diff --git a/debian/changelog b/debian/changelog index 1a2b935..5b4343a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,11 @@ spamass-milter (0.3.1-8) UNRELEASED; urgency=low * Update the documentation in README.Debian to indicate that a different path to the postfix socket may be required in chrooted postfix installs (closes: #496003) + * Update milter_connect_macros_line (thanks to Marco d'Itri) + * Fix the code to generate a sendmail-compatible header (thanks to Marco + d'Itri) (Closes: #510665). - -- Don Armstrong Thu, 21 Aug 2008 16:54:35 -0700 + -- Don Armstrong Mon, 05 Jan 2009 18:40:16 -0800 spamass-milter (0.3.1-7) unstable; urgency=low diff --git a/spamass-milter.cpp b/spamass-milter.cpp index 1b89268..d4879f1 100644 --- a/spamass-milter.cpp +++ b/spamass-milter.cpp @@ -1024,9 +1024,9 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcpt) assassin->output((string) "Received: from "+macro_s+" ("+macro__+")\r\n\t"+ - "by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+ + "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"); } else assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n"); -- 2.39.2