increase score of ZIPFILE and change SHIPPING_ID to match

diff --git a/common/misc_spam b/common/misc_spam
index 3fc3b1724d7fb88d3eaf371622c97fd4b7805a20..b406bb7b1894a966bf2e9c54afe028dbbef1c530 100644 (file)
--- a/common/misc_spam
+++ b/common/misc_spam
@@ -307,7 +307,7 @@ score TINYFONT              3
 # blarson 2008-04-03
 full ZIPFILE           /\bfilename\=.*\.zip\b/i
 describe ZIPFILE       zipfile attachment
-score ZIPFILE          0.5
+score ZIPFILE          1
 
 # blarson 2008-04-19
 header SPACESUB                subject =~ /^\s\w/

diff --git a/common/virus_spam b/common/virus_spam
index 3d00424901da569b32b867170e313eb9ff3f5fdf..2feae6f0f80f52d32c364b427eaeb63fae4120a5 100644 (file)
--- a/common/virus_spam
+++ b/common/virus_spam
@@ -100,11 +100,11 @@ describe FEDEXPACKAGE Fedex Package Virus spam
 score FEDEXPACKAGE 4
 
 #don 2016-11-04
-header SHIPPING_ID subject =~ /(ID:?|ID|\#|n\.)\s*\d{7,}\s*($|shipment|delivery)/
+header SHIPPING_ID subject =~ /(ID:?|ID|\#|n\.|UPS)\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\.)\s*\d{7,}\s*/
+header SHIP_ID_INT subject =~ /(ID:?|ID|\#|n\.|UPS)\s*\d{7,}\s*/
 describe SHIP_ID_INT Contains a long ID number inside
 score SHIP_ID_INT 1