X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fvirus_spam;h=8801084f2c466ee810e91f2173b2cf4627b0c430;hp=151b21d6a94880504d3f06c376d30834ad0ca647;hb=8cef733f4d4bf5622a6fe85ee899d9e02a231ad8;hpb=728db2e653d88568b0d59a91fa59843a17c4b01f

diff --git a/common/virus_spam b/common/virus_spam
index 151b21d..8801084 100644
--- a/common/virus_spam
+++ b/common/virus_spam
@@ -95,10 +95,15 @@ describe XEROX  Scanner malware
 score XEROX     4
 
 # don 2016-11-04
-header FEDEXPACKAGE subject=~/FedEx International|unable to deliver.*(item|parcel)/i
+header FEDEXPACKAGE subject=~/FedEx International|((unable to|could not) deliver|problem with).*(item|parcel)|shipment delivery problem|delivery notification/i
 describe FEDEXPACKAGE Fedex Package Virus spam
 score FEDEXPACKAGE 4
 
-meta FEDEX_ZIP FEDEXPACKAGE && ZIPCOMPRESSED
+#don 2016-11-04
+header SHIPPING_ID subject =~ /(ID:?|ID|\#|n\.)\s*\d{8,}\s*$/
+describe SHIPPING_ID Contains a long ID number at the end
+score SHIPPING_ID 3
+
+meta FEDEX_ZIP (FEDEXPACKAGE || SHIPPING_ID ) && ( ZIPCOMPRESSED | ZIPFILE )
 describe FEDEX_ZIP Fedex package with zip file
 score FEDEX_ZIP 3