You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/10/05 18:41:46 UTC

svn commit: r582340 - /spamassassin/rules/trunk/sandbox/jm/20_basic.cf

Author: jm
Date: Fri Oct  5 09:41:43 2007
New Revision: 582340

URL: http://svn.apache.org/viewvc?rev=582340&view=rev
Log:
fix error in JM_FAKE_PSMTP_RCVD rules; needs /m

Modified:
    spamassassin/rules/trunk/sandbox/jm/20_basic.cf

Modified: spamassassin/rules/trunk/sandbox/jm/20_basic.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/jm/20_basic.cf?rev=582340&r1=582339&r2=582340&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/jm/20_basic.cf (original)
+++ spamassassin/rules/trunk/sandbox/jm/20_basic.cf Fri Oct  5 09:41:43 2007
@@ -265,9 +265,11 @@
 meta TVD_PDF_FINGER01_JO  (__TVD_MIME_CT_MM && __TVD_MIME_ATT && !__TVD_BODY)
 
 # Received: from [84.255.156.27] by northpro.net.amerion.mail5.psmtp.com; Thu, 34 Sep 2007 10:00:46 +0300
+# Received: from [189.191.12.17] by aon.co.uk.s7a1.psmtp.com; Fri, 5 Oct 2007 05:30:09 +0100
 # (I expect they'll notice "34 Sep" and fix that soon ;)
-header JM_FAKE_PSMTP_RCVD1    Received =~ /^from \[\d+\.\d+\.\d+\.\d+\] by \S+\.\S+\.psmtp\.com; /
-header JM_FAKE_PSMTP_RCVD2    Received =~ /^from \[\d+\.\d+\.\d+\.\d+\] by \S+\.\S+\.(?:com|net|org)\.\S+\.psmtp\.com; /
+header JM_FAKE_PSMTP_RCVD1    Received =~ /^from \[\d+\.\d+\.\d+\.\d+\] by \S+\.\S+\.psmtp\.com; /m
+header JM_FAKE_PSMTP_RCVD2    Received =~ /^from \[\d+\.\d+\.\d+\.\d+\] by \S+\.\S+\.(?:com|net|org|edu)\.\S+\.psmtp\.com; /m
+
 
 # use of the "I Feel Lucky" button in Google, thanks LR
 uri JM_I_FEEL_LUCKY         /(?:\&|\?)btnI=ec(?:$|\&)/