X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fvirus_spam;h=fb5a2eae62b26848ba7221e7857dd43305af5c08;hp=cb2f0ae7d2235eaea994ce37e88361c05b2317aa;hb=HEAD;hpb=b387f2f7e58aa81fbf565bc4f70d27a72996eea0

diff --git a/common/virus_spam b/common/virus_spam
index cb2f0ae..fb5a2ea 100644
--- a/common/virus_spam
+++ b/common/virus_spam
@@ -95,19 +95,23 @@ describe XEROX  Scanner malware
 score XEROX     4
 
 # don 2016-11-04
-header FEDEXPACKAGE subject=~/FedEx International|((unable to|could not) deliver|problem with).*(item|parcel)|shipment delivery problem|delivery notification/i
+header FEDEXPACKAGE subject=~/(FedEx International|USPS courier)|((unable to|could not) deliver|problems? with).*(item|parcel)|shipment delivery problem|delivery notification|US?PS delivery/i
 describe FEDEXPACKAGE Fedex Package Virus spam
 score FEDEXPACKAGE 4
 
 #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
+header SHIPPING_ID subject =~ /(ID:?|ID|\#|n\.|UPS(| parcel)|code:?)\s*\d{7,}\s*\)?\s*($|shipment|delivery)/
+describe SHIPPING_ID Contains a long ID number at the end or folled by shipment
 score SHIPPING_ID 3
 
+header SHIP_ID_INT subject =~ /(ID:?|ID|\#|n\.|UPS(| parcel)|code:?)\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 ) && ( ZIPCOMPRESSED || ZIPFILE || MSWORD )
+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 7