[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Preapproval of minor fix for #510665 (receive header mockup for spamass-milter)

See the attached patch which fixes #510665 (a normal bug) and along
the way #496003 (documentation); I'd like to get these into lenny, but
before uploading to unstable, pre-approval of the upload would be
nice. [I've already tested the changes on stable and unstable, and
Marco is (hopefully) double checking that they fix his problem.]

The interdiff is attached.

Don Armstrong

Your village called.
They want their idiot back.
 -- xkcd http://xkcd.com/c23.html

http://www.donarmstrong.com              http://rzlab.ucr.edu
diff -u spamass-milter-0.3.1/spamass-milter.cpp spamass-milter-0.3.1/spamass-milter.cpp
--- spamass-milter-0.3.1/spamass-milter.cpp
+++ spamass-milter-0.3.1/spamass-milter.cpp
@@ -1024,9 +1024,9 @@
 			"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"+
-			"(envelope-from "+assassin->from()+"\r\n");
+			"(envelope-from "+assassin->from()+")\r\n");
 	} else
 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");
diff -u spamass-milter-0.3.1/debian/README.Debian spamass-milter-0.3.1/debian/README.Debian
--- spamass-milter-0.3.1/debian/README.Debian
+++ spamass-milter-0.3.1/debian/README.Debian
@@ -47,14 +47,23 @@
   # spamass-milter configuration
   smtpd_milters = unix:/var/spool/postfix/spamass/spamass.sock
-should work. See http://www.postfix.org/MILTER_README.html or
+should work. Note, however, if you're using a chrooted version of
+postfix, you'll need the local path to the socket inside of the
+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
 information on how to set tempfail and the various timeouts that the
 sendmail configuration above uses.
-You'll also want to change /etc/default/spamass-milter to use the
-SOCKET above, and also enable RUNAS so that it runs as the same user
-that will be connecting to the socket.
+The defaults for spamass-milter adjust themselves so that no
+configuration in /etc/default/spamass-milter should be required.
+[However, if you are not doing so, see below.]
   Adjusting how spamass-milter is started
@@ -62,7 +71,23 @@
 You can adjust how spamass-milter starts, and the options it calls
 spamc with by adjusting /etc/default/spamass-milter. OPTIONS is passed
-directly to spamass-milter by /etc/init.d/spamass-milter.
+directly to spamass-milter by /etc/init.d/spamass-milter. [Refer to
+spamass-milter(1) for details.]
+Other settings which may be of use:
+SOCKET sets the location of the socket; defaults to
+/var/run/spamass/spamass.sock unless you are running postfix, where it
+is set to /var/spool/postfix/spamass/spamass.sock.
+SOCKETOWNER is the owner of the socket, which defaults to root:root or
+postfix:postfix if you're running postfix.
+SOCKETMODE is the mode of the socket, which defaults to 0600 or 0660
+if you're running postfix.
+RUNAS controls the user which spamass-milter runs as; defaults to
 Debugging spamass-milter
@@ -96 +121 @@
- -- Don Armstrong <don@debian.org>, Tue,  2 Jan 2007 08:22:46 -0800
+ -- Don Armstrong <don@debian.org>, Mon,  5 Jan 2009 13:03:36 -0800
diff -u spamass-milter-0.3.1/debian/NEWS.Debian spamass-milter-0.3.1/debian/NEWS.Debian
--- spamass-milter-0.3.1/debian/NEWS.Debian
+++ spamass-milter-0.3.1/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 <don@debian.org>  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 -u spamass-milter-0.3.1/debian/changelog spamass-milter-0.3.1/debian/changelog
--- spamass-milter-0.3.1/debian/changelog
+++ spamass-milter-0.3.1/debian/changelog
@@ -1,3 +1,14 @@
+spamass-milter (0.3.1-8) unstable; 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 <don@debian.org>  Mon, 05 Jan 2009 18:40:16 -0800
 spamass-milter (0.3.1-7) unstable; urgency=low
   * Add LSB options to init script (closes: #467145)

Reply to: