You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by kh...@apache.org on 2010/05/19 17:19:19 UTC

svn commit: r946217 - in /spamassassin/trunk/rulesrc/sandbox/khopesh: 20_khop_experimental.cf 20_khop_lists.cf

Author: khopesh
Date: Wed May 19 15:19:19 2010
New Revision: 946217

URL: http://svn.apache.org/viewvc?rev=946217&view=rev
Log:
emergency commit.  weird meta dependency issue broke hudson build 5484, http://hudson.zones.apache.org/hudson/job/SpamAssassin-trunk/5484/testReport/make_test/t_basic_meta_t/test______2/ despite the dependency existing.  probably due to T_ prefix, which I had thought was automagically fixed by the system.  solved by converting to a meta rule.

Modified:
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf?rev=946217&r1=946216&r2=946217&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf Wed May 19 15:19:19 2010
@@ -213,7 +213,7 @@ ifplugin Mail::SpamAssassin::Plugin::MIM
   # which might hit only ham and virii
   full	__BASE64_MDAW	/^(?:MDAw){12}/
 
-  meta	REMOTE_IMAGE	(__HTML_IMG_ONLY || __HTML_LINK_IMAGE) && !(KHOP_NEWSLETTER || __VIA_ML || __SENDER_BOT || __ANY_IMAGE_ATTACH)
+  meta	REMOTE_IMAGE	(__HTML_IMG_ONLY || __HTML_LINK_IMAGE) && !(__SUBSCRIPTION_INFO || __VIA_ML || __SENDER_BOT || __ANY_IMAGE_ATTACH)
   describe REMOTE_IMAGE	Message contains an external image
 
 endif # }

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf?rev=946217&r1=946216&r2=946217&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf Wed May 19 15:19:19 2010
@@ -12,7 +12,8 @@ uri	 __MAIL_LINK	/\?.{0,200}\w\@[\w-]{1,
 header   __MSGID_LIST	Message-ID =~ /-\w+\#[\w.]+\.\w{2,4}\@/
 tflags   __MSGID_LIST	nice
 
-body     KHOP_NEWSLETTER	/\b(?:e?newsletters?|(?:un)?(?:subscrib|register)|you(?:r| are) subscri(?:b|ption)|opt(?:.|ing)?out\b|further info|you do ?n[o']t w(?:ish|ant)|remov\w{1,3}.{1,9}\blists?\b|to your white.?list)/i
+body     __SUBSCRIPTION_INFO	/\b(?:e?newsletters?|(?:un)?(?:subscrib|register)|you(?:r| are) subscri(?:b|ption)|opt(?:.|ing)?out\b|further info|you do ?n[o']t w(?:ish|ant)|remov\w{1,3}.{1,9}\blists?\b|to your white.?list)/i
+meta	 KHOP_NEWSLETTER	__SUBSCRIPTION_INFO
 describe KHOP_NEWSLETTER	Is a newsletter or has list managing details
 score    KHOP_NEWSLETTER	0.4 0.5 0.6 0.7 # 20090219
 tflags	 KHOP_NEWSLETTER	nopublish