X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fvirus_spam;h=ef94c43932875cc2378ed006cccfa96cc7c8f80f;hp=3654cb10e85fc0f4ab74b1812c5361be716feb4a;hb=93b67f23751074630b463f587518047e64b181fd;hpb=54eaf4fe87478320705ac57d8a8e1343b14eadda

diff --git a/common/virus_spam b/common/virus_spam
index 3654cb1..ef94c43 100644
--- a/common/virus_spam
+++ b/common/virus_spam
@@ -95,15 +95,23 @@ describe XEROX  Scanner malware
 score XEROX     4
 
 # don 2016-11-04
-header FEDEXPACKAGE subject=~/FedEx International|(unable to deliver|problem with).*(item|parcel)|shipment delivery problem|delivery notification/i
+header FEDEXPACKAGE subject=~/FedEx International|((unable to|could not) deliver|problems? with).*(item|parcel)|shipment delivery problem|delivery notification/i
 describe FEDEXPACKAGE Fedex Package Virus spam
 score FEDEXPACKAGE 4
 
 #don 2016-11-04
-header SHIPPING_ID subject =~ /(ID:?|ID|\#)\s*\d{8,}\s*$/
-describe SHIPPING_ID Contains a long ID number at the end
+header SHIPPING_ID subject =~ /(ID:?|ID|\#|n\.)\s*\d{7,}\s*($|shipment|delivery)/
+describe SHIPPING_ID Contains a long ID number at the end or folled by shipment
 score SHIPPING_ID 3
 
-meta FEDEX_ZIP (FEDEXPACKAGE || SHIPPING_ID ) && ZIPCOMPRESSED
+header SHIP_ID_INT subject =~ /(ID:?|ID|\#|n\.)\s*\d{7,}\s*/
+describe SHIP_ID_INT Contains a long ID number inside
+score SHIP_ID_INT 1
+
+rawbody MSWORD    /application\/msword/
+describe MSWORD   Has a word attachment
+score MSWORD      2
+
+meta FEDEX_ZIP (FEDEXPACKAGE || SHIPPING_ID || SHIP_ID_INT ) && ( ZIPCOMPRESSED || ZIPFILE || MSWORD )
 describe FEDEX_ZIP Fedex package with zip file
-score FEDEX_ZIP 3
+score FEDEX_ZIP 6