Mailing List Archive

Author: billcole
Date: Tue Jun 23 19:06:48 2020
New Revision: 1879126

URL: http://svn.apache.org/viewvc?rev=1879126&view=rev
Log:
ACTUALLY revert 1879125

Modified:
spamassassin/trunk/rules/20_head_tests.cf
spamassassin/trunk/rulesrc/sandbox/billcole/80_test.cf

Modified: spamassassin/trunk/rules/20_head_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_head_tests.cf?rev=1879126&r1=1879125&r2=1879126&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_head_tests.cf (original)
+++ spamassassin/trunk/rules/20_head_tests.cf Tue Jun 23 19:06:48 2020
@@ -311,9 +311,7 @@ header __HAS_MSMAIL_PRI exists:X
header __HAS_SQUIRRELMAIL_IN_MAILER X-Mailer =~ /SquirrelMail\b/
# Ever growing Office version list without X-MimeOLE, bug 6346, 7122, 7463.
header __HAS_OFFICE1214_IN_MAILER X-Mailer =~ /^Microsoft (?:Office )?Outlook 1[2456]\.0/
-# CGP MAPI module fingerprint, to protect from MISSING_MIMEOLE
-header __HAS_CGP_MAPI_IN_MAILER X-Mailer =~ /CommuniGate Pro MAPI/
-meta MISSING_MIMEOLE (__HAS_MSMAIL_PRI && !__HAS_MIMEOLE && !__HAS_SQUIRRELMAIL_IN_MAILER && !__HAS_OFFICE1214_IN_MAILER && !__HAS_CGP_MAPI_IN_MAILER)
+meta MISSING_MIMEOLE (__HAS_MSMAIL_PRI && !__HAS_MIMEOLE && !__HAS_SQUIRRELMAIL_IN_MAILER && !__HAS_OFFICE1214_IN_MAILER)
describe MISSING_MIMEOLE Message has X-MSMail-Priority, but no X-MimeOLE

header __HAS_X_MAILER exists:X-Mailer

Modified: spamassassin/trunk/rulesrc/sandbox/billcole/80_test.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/billcole/80_test.cf?rev=1879126&r1=1879125&r2=1879126&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/billcole/80_test.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/billcole/80_test.cf Tue Jun 23 19:06:48 2020
@@ -46,7 +46,4 @@ rawbody T_SCC_SPECIAL_GUID /^([[:xdigi
tflags T_SCC_SPECIAL_GUID multiple maxhits=15
#score T_SCC_SPECIAL_GUID 0.3

-# CGP MAPI module fingerprint, to protect from MISSING_MIMEOLE
-describe __HAS_CGP_MAPI_IN_MAILER
-header __HAS_CGP_MAPI_IN_MAILER X-Mailer =~ 'CommuniGate Pro MAPI'
-tflags __HAS_CGP_MAPI_IN_MAILER publish
+