[Pkg-roundcube-maintainers] Bug#486493: Message-ID should be below Recieved field

[Reinhard Tartler]

Package: roundcube
Severity: normal
Tags: patch

Spamassassin produces an MSGID_FROM_MTA_HEADER hit (see
http://wiki.apache.org/spamassassin/Rules/MSGID_FROM_MTA_HEADER) when
RoundCube send mail.

In file sendmail.inc string

$headers['Message-ID'] = $message_id;

must be below any strings containing field Received.

This issue is known and fixed upstream:

http://trac.roundcube.net/ticket/1484966

Patch follows:

Index: /trunk/roundcubemail/program/steps/mail/sendmail.inc
===================================================================
--- /trunk/roundcubemail/program/steps/mail/sendmail.inc (revision 1232)
+++ /trunk/roundcubemail/program/steps/mail/sendmail.inc (revision 1261)
@@ -211,7 +211,4 @@
 
 // additional headers
-$headers['Message-ID'] = $message_id;
-$headers['X-Sender'] = $from;
-
 if ($CONFIG['http_received_header'])
 {
@@ -224,4 +221,7 @@
 }
 
+$headers['Message-ID'] = $message_id;
+$headers['X-Sender'] = $from;
+
 if (!empty($CONFIG['useragent']))
   $headers['User-Agent'] = $CONFIG['useragent'];


-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (500, 'testing'), (50, 'unstable')
Architecture: i386 (x86_64)

Kernel: Linux 2.6.25.2-gernoth-64bit (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash