X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fvirus_spam;h=66a579475f69b70d5703c2881adbbb632b29befe;hp=55abbd4a972a633c0db5e73ff18ef70e7c94d797;hb=e061ea79cf741b96083f0c22ec02a1831e65554d;hpb=3ef0211eb3435b4041a40d2dabf35e917bfe70d4

diff --git a/common/virus_spam b/common/virus_spam
index 55abbd4..66a5794 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