You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2006/07/09 18:53:32 UTC
svn commit: r420317 - in /spamassassin/branches/bug-3109-shortcircuiting:
build/automc/ build/mkupdates/ lib/Mail/SpamAssassin/ masses/rule-qa/
masses/rule-qa/automc/ rules/
Author: jm
Date: Sun Jul 9 09:53:31 2006
New Revision: 420317
URL: http://svn.apache.org/viewvc?rev=420317&view=rev
Log:
merging forward changes from trunk, again; 418363:420312, now up to 420312
Modified:
spamassassin/branches/bug-3109-shortcircuiting/build/automc/etc-apache-local-conf-httpd.conf
spamassassin/branches/bug-3109-shortcircuiting/build/automc/run_nightly
spamassassin/branches/bug-3109-shortcircuiting/build/mkupdates/run_part2
spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/README.nightly
spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/automc/ruleqa.cgi
spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/corpus-nightly
spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/corpus-tagtime
spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/rule-hits-over-time
spamassassin/branches/bug-3109-shortcircuiting/rules/active.list
Modified: spamassassin/branches/bug-3109-shortcircuiting/build/automc/etc-apache-local-conf-httpd.conf
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-3109-shortcircuiting/build/automc/etc-apache-local-conf-httpd.conf?rev=420317&r1=420316&r2=420317&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/build/automc/etc-apache-local-conf-httpd.conf (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/build/automc/etc-apache-local-conf-httpd.conf Sun Jul 9 09:53:31 2006
@@ -146,3 +146,16 @@
# ---------------------------------------------------------------------------
+<VirtualHost *:80>
+ ServerName updatedist.spamassassin.org
+ <Directory /var/www/buildbot.spamassassin.org/updatestage>
+ options indexes SymLinksIfOwnerMatch
+ AllowOverride indexes
+ </Directory>
+ DocumentRoot /var/www/buildbot.spamassassin.org/updatestage
+ ServerAdmin webmaster@spamassassin.org
+ userdir disabled
+</VirtualHost>
+
+# ---------------------------------------------------------------------------
+
Modified: spamassassin/branches/bug-3109-shortcircuiting/build/automc/run_nightly
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-3109-shortcircuiting/build/automc/run_nightly?rev=420317&r1=420316&r2=420317&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/build/automc/run_nightly (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/build/automc/run_nightly Sun Jul 9 09:53:31 2006
@@ -15,10 +15,16 @@
# and where the $HOMEs are:
nightly_trees="/home/bbmass/mc-nightly"
-# ensure we're running at/just after 0900 UTC, complex due to daylight savings
+
+# ensure we're running after 0900 UTC; complex due to daylight savings.
+# If we're running in the 08xx UTC hour-space, sleep for 1 hour; when
+# we wake, we will be in 09xx.
(
TIME="%e,%U,%S"; TZ=UTC; export TIME TZ
- if date | egrep '^... ... .. (08|10):'; then exit ; fi
+ if date | egrep '^... ... .. 08:'; then
+ date; echo "sleeping for 1 hour to compensate for DST"
+ sleep 3600 ; date
+ fi
)
# create the targets files:
@@ -42,20 +48,20 @@
export HOME PERL PATH
# use bash to work around Solaris breakage
- bash $dir/svn/masses/rule-qa/corpus-nightly
+ nice bash $dir/svn/masses/rule-qa/corpus-nightly
)
done
# cycle the logfiles; keep 6 (3 days worth I think)
-(
- cd /var/www/buildbot.spamassassin.org/bbmass
- rm nightly_masschecks_6.txt
- mv nightly_masschecks_5.txt nightly_masschecks_6.txt
- mv nightly_masschecks_4.txt nightly_masschecks_5.txt
- mv nightly_masschecks_3.txt nightly_masschecks_4.txt
- mv nightly_masschecks_2.txt nightly_masschecks_3.txt
- mv nightly_masschecks_1.txt nightly_masschecks_2.txt
- mv nightly_masschecks.txt nightly_masschecks_1.txt
-)
+# (
+ # cd /var/www/buildbot.spamassassin.org/bbmass
+ # rm nightly_masschecks_6.txt
+ # mv nightly_masschecks_5.txt nightly_masschecks_6.txt
+ # mv nightly_masschecks_4.txt nightly_masschecks_5.txt
+ # mv nightly_masschecks_3.txt nightly_masschecks_4.txt
+ # mv nightly_masschecks_2.txt nightly_masschecks_3.txt
+ # mv nightly_masschecks_1.txt nightly_masschecks_2.txt
+ # mv nightly_masschecks.txt nightly_masschecks_1.txt
+# )
Modified: spamassassin/branches/bug-3109-shortcircuiting/build/mkupdates/run_part2
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-3109-shortcircuiting/build/mkupdates/run_part2?rev=420317&r1=420316&r2=420317&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/build/mkupdates/run_part2 (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/build/mkupdates/run_part2 Sun Jul 9 09:53:31 2006
@@ -85,7 +85,12 @@
(
cd $rulesdir
- tar cvf - *.cf *.pm || exit $?
+
+ # Use this to include plugin .pm files:
+ # tar cvf - *.cf *.pm || exit $?
+
+ # or this, to ban code from the updates:
+ tar cvf - *.cf || exit $?
) | gzip -9 > $tmpdir/update.tgz || exit $?
Modified: spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=420317&r1=420316&r2=420317&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/PerMsgStatus.pm Sun Jul 9 09:53:31 2006
@@ -1089,6 +1089,7 @@
###########################################################################
# public API for plugins
+
=item $status->set_tag($tagname, $value)
Set a template tag, as used in C<add_header>, report templates, etc. This API
@@ -1121,6 +1122,7 @@
}
# public API for plugins
+
=item $string = $status->get_tag($tagname)
Get the current value of a template tag, as used in C<add_header>, report
Modified: spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/README.nightly
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/README.nightly?rev=420317&r1=420316&r2=420317&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/README.nightly (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/README.nightly Sun Jul 9 09:53:31 2006
@@ -22,10 +22,10 @@
local time, this is US/Pacific, adjust appropriately for your
timezone)
- The "tagtime" and "corpus-nightly" cron jobs should be run twice a
- day to handle daylight savings since cron does not. They exit if
- it's 0800-0859 or 1000-1059 UTC (which means you can "corpus-nightly"
- any other time of day if you want).
+ The "tagtime" and "corpus-nightly" cron jobs will automatically handle
+ daylight savings, since cron does not. They do this by sleeping for 1 hour
+ if they detect that they are run in the 0800-0859 hour. (This means you can
+ "corpus-nightly" any other time of day, if you want).
The "corpus-hourly" script only needs to be run if you are producing
optional mass-check summary reports.
@@ -34,8 +34,8 @@
------- start of cut text --------------
PATH=/home/corpus/scripts:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
-0 1,2 * * * corpus-tagtime
-10 1,2 * * * corpus-nightly >/home/corpus/log/nightly 2>&1
+0 1 * * * corpus-tagtime
+10 1 * * * corpus-nightly >/home/corpus/log/nightly 2>&1
30 * * * * corpus-hourly >/home/corpus/log/hourly 2>&1
5 1 * * * pyzor discover >/dev/null 2>/dev/null
------- end ----------------------------
Modified: spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/automc/ruleqa.cgi
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/automc/ruleqa.cgi?rev=420317&r1=420316&r2=420317&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/automc/ruleqa.cgi (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/automc/ruleqa.cgi Sun Jul 9 09:53:31 2006
@@ -631,6 +631,7 @@
exec ("$myperl $automcdir/../rule-hits-over-time ".
"--cgi --scale_period=200 --rule='$saferule' ".
+ "--ignore_older=180 ".
"$safedatadir/LOGS.*.log.gz");
die "exec failed";
Modified: spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/corpus-nightly
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/corpus-nightly?rev=420317&r1=420316&r2=420317&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/corpus-nightly (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/corpus-nightly Sun Jul 9 09:53:31 2006
@@ -4,6 +4,9 @@
. $HOME/.corpus
+RSYNC_PASSWORD=$password
+export RSYNC_PASSWORD
+
renice 10 -p $$
# use $PERL from env if unset
@@ -11,17 +14,19 @@
PERL=perl
fi
-RSYNC_PASSWORD=$password ; export RSYNC_PASSWORD
-
set -x
set -e
-TIME="%e,%U,%S" ; export TIME
-TZ=UTC ; export TZ
-# ensure we're running after 0900 UTC
-if date | egrep '^... ... .. (08|10):'; then
- exit
-fi
+# ensure we're running after 0900 UTC; complex due to daylight savings.
+# If we're running in the 08xx UTC hour-space, sleep for 1 hour; when
+# we wake, we will be in 09xx.
+(
+ TIME="%e,%U,%S"; TZ=UTC; export TIME TZ
+ if date | egrep '^... ... .. 08:'; then
+ date; echo "sleeping for 1 hour to compensate for DST"
+ sleep 3600 ; date
+ fi
+)
# day of week
if date | egrep '^Sat' || [ "$1" = "net" ]; then
@@ -53,6 +58,9 @@
set +e
retry=0
while true; do
+ rm -rf rules # causing trouble for some reason
+ rm -rf rulesrc/sandbox
+
if svn update -r $revision < /dev/null && \
svn update -r $revision rulesrc < /dev/null
then
@@ -92,7 +100,6 @@
rm -f spamassassin/auto*
rm -f spamassassin/bayes*
rm -f razor-agent.log
-date > test.start
if [ -n "$net" ]; then
prefs=$prefs_weekly
opts=$opts_weekly
@@ -105,8 +112,12 @@
else
rm -f spamassassin/user_prefs
fi
+
+date | tee test.start
+
$PERL mass-check $opts
-date > test.end
+
+date | tee test.end
uptime
ls -l spam.log ham.log
Modified: spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/corpus-tagtime
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/corpus-tagtime?rev=420317&r1=420316&r2=420317&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/corpus-tagtime (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/corpus-tagtime Sun Jul 9 09:53:31 2006
@@ -3,9 +3,15 @@
# settings
tagtime=/home/corpus/tmp/tagtime
-# ensure we're running after 0900 UTC
-if TZ=UTC date | egrep -q '^... ... .. (08|10):'; then
- exit
-fi
+# ensure we're running after 0900 UTC; complex due to daylight savings.
+# If we're running in the 08xx UTC hour-space, sleep for 1 hour; when
+# we wake, we will be in 09xx.
+(
+ TIME="%e,%U,%S"; TZ=UTC; export TIME TZ
+ if date | egrep '^... ... .. 08:'; then
+ date; echo "sleeping for 1 hour to compensate for DST"
+ sleep 3600 ; date
+ fi
+)
touch $tagtime
Modified: spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/rule-hits-over-time
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/rule-hits-over-time?rev=420317&r1=420316&r2=420317&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/rule-hits-over-time (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/masses/rule-qa/rule-hits-over-time Sun Jul 9 09:53:31 2006
@@ -33,6 +33,7 @@
--rule=rulename specify rule to map
--period=secs specify period (default: 1 day)
+ --ignore_older=days ignore hits older than N days (default: 0 = none)
--scale_period=n scale period up to N items of data, 0=no scaling
(default: 0)
--size_x=pixels width of output graphs, in pixels (def: 800)
@@ -45,7 +46,7 @@
use vars qw(
$opt_rule $opt_size_x $opt_size_y $opt_text $opt_cgi
- $opt_period $opt_scale_period
+ $opt_period $opt_scale_period $opt_ignore_older
$opt_debug
);
@@ -56,6 +57,7 @@
'text',
'cgi',
'scale_period=i',
+ 'ignore_older=i',
'period=i',
'debug'
) or usage();
@@ -283,8 +285,12 @@
# limit to a range from [4 years ago, today] to avoid OOM craziness
# from corrupt input
+ #
+ if ($opt_ignore_older <= 0) {
+ $opt_ignore_older = 365 * 4;
+ }
my $limit_hi = time;
- my $limit_lo = $limit_hi - (24*60*60*365*4);
+ my $limit_lo = $limit_hi - (24*60*60*$opt_ignore_older);
$lastbucket = undef;
$nextbucket = undef;
Modified: spamassassin/branches/bug-3109-shortcircuiting/rules/active.list
URL: http://svn.apache.org/viewvc/spamassassin/branches/bug-3109-shortcircuiting/rules/active.list?rev=420317&r1=420316&r2=420317&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/rules/active.list (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/rules/active.list Sun Jul 9 09:53:31 2006
@@ -1,5 +1,5 @@
# active ruleset list, automatically generated from http://ruleqa.spamassassin.org/
-# with results from: daf parkerm theo wtogami zmi
+# with results from: net-bb-doc net-bb-zmi net-daf net-parkerm net-theo
# good enough
ADDR_NUMS_AT_BIGSITE
@@ -47,13 +47,10 @@
BAYES_99
# good enough
-CHINA_HEADER
+CUM_SHOT
# good enough
-COMPETE
-
-# good enough
-CUM_SHOT
+DATE_IN_FUTURE_03_06
# good enough
DATE_IN_FUTURE_12_24
@@ -119,10 +116,7 @@
DRUGS_ANXIETY_OBFU
# good enough
-DRUGS_DIET_OBFU
-
-# good enough
-DRUGS_ERECTILE
+DRUGS_DIET
# good enough
DRUGS_ERECTILE_OBFU
@@ -140,9 +134,15 @@
DRUG_ED_GENERIC
# good enough
+DRUG_ED_ONLINE
+
+# good enough
DRUG_ED_SILD
# good enough
+EARN_PER_WEEK
+
+# good enough
EMPTY_MESSAGE
# good enough
@@ -155,6 +155,15 @@
ENV_AND_HDR_SPF_MATCH
# good enough
+EXCUSE_24
+
+# good enough
+FAKE_HELO_EMAIL_COM
+
+# good enough
+FAKE_HELO_EXCITE
+
+# good enough
FAKE_HELO_LYCOS
# good enough
@@ -167,10 +176,10 @@
FAKE_HELO_MSN
# good enough
-FAKE_OUTBLAZE_RCVD
+FAKE_HELO_YAHOO_CA
# good enough
-FB_CIALIS_LEO2
+FAKE_OUTBLAZE_RCVD
# good enough
FB_CIALIS_LEO3
@@ -215,6 +224,9 @@
FORGED_AOL_TAGS
# good enough
+FORGED_EUDORAMAIL_RCVD
+
+# good enough
FORGED_HOTMAIL_RCVD
# good enough
@@ -290,12 +302,18 @@
FROM_BLANK_NAME
# good enough
+FROM_DOMAIN_NOVOWEL
+
+# good enough
FROM_ENDS_IN_NUMS
# good enough
FROM_HAS_MIXED_NUMS
# good enough
+FROM_HAS_ULINE_NUMS
+
+# good enough
FROM_ILLEGAL_CHARS
# good enough
@@ -308,15 +326,6 @@
FROM_NO_USER
# good enough
-FROM_OFFERS
-
-# good enough
-FR_WWW_DOMAIN_23SUBDIR
-
-# good enough
-FS_START_DOYOU2
-
-# good enough
FUZZY_MERIDIA
# good enough
@@ -328,9 +337,6 @@
# good enough
GAPPY_SUBJECT
-# good enough
-GEO_QUERY_STRING
-
# tflags net
HABEAS_ACCREDITED_COI
@@ -365,9 +371,6 @@
HASHCASH_HIGH
# good enough
-HEADER_COUNT_CTYPE
-
-# good enough
HEADER_SPAM
# good enough
@@ -398,13 +401,13 @@
HELO_DYNAMIC_SPLIT_IP
# good enough
-HS_FORGED_OE_FW
+HS_EXTRA
# good enough
-HS_GETMEOFF
+HS_FORGED_OE_FW
# good enough
-HS_INDEX_PARAM
+HS_GETMEOFF
# good enough
HS_MEETUP_FOR_SEX
@@ -434,6 +437,9 @@
HTTP_EXCESSIVE_ESCAPES
# good enough
+INFO_TLD
+
+# good enough
INTERRUPTUS
# good enough
@@ -479,7 +485,7 @@
KAM_STOCKTIP20
# good enough
-KAM_STOCKTIP3
+KAM_STOCKTIP24
# good enough
KAM_STOCKTIP6
@@ -512,6 +518,9 @@
MIME_BASE64_BLANKS
# good enough
+MIME_BASE64_NO_NAME
+
+# good enough
MIME_BASE64_TEXT
# good enough
@@ -536,10 +545,13 @@
MISSING_MIMEOLE
# good enough
-MORE_SEX
+MISSING_MIME_HB_SEP
# good enough
-MPART_ALT_DIFF
+MISSING_SUBJECT
+
+# good enough
+ML_MARKETING
# good enough
MSGID_DOLLARS_RANDOM
@@ -565,6 +577,9 @@
# good enough
MSGID_YAHOO_CAPS
+# good enough
+NOT_ADVISOR
+
# tflags net
NO_DNS_FOR_FROM
@@ -590,12 +605,15 @@
OBSCURED_EMAIL
# good enough
-ONLINE_PHARMACY
+ONE_TIME
# good enough
PERCENT_RANDOM
# good enough
+PLING_PLING
+
+# good enough
PLING_QUERY
# good enough
@@ -776,6 +794,9 @@
REPLICA_WATCH
# good enough
+REPLY_TO_EMPTY
+
+# good enough
REPTO_OVERQUOTE_THEBAT
# good enough
@@ -827,10 +848,13 @@
SPF_SOFTFAIL
# good enough
-STOCK_ALERT
+SPOOF_COM2COM
# good enough
-SUBJECT_DIET
+SPOOF_OURI
+
+# good enough
+STOCK_ALERT
# good enough
SUBJECT_DRUG_GAP_C
@@ -857,19 +881,34 @@
SUBJECT_NEEDS_ENCODING
# good enough
+SUBJECT_NOVOWEL
+
+# good enough
SUBJECT_SEXUAL
# good enough
+SUBJ_CONSONANTS
+
+# good enough
+SUBJ_HAS_SPACES
+
+# good enough
SUBJ_ILLEGAL_CHARS
# good enough
SUBJ_RE_NUM
# good enough
-SUBJ_YOUR_FAMILY
+SUSPICIOUS_RECIPS
# good enough
-SUSPICIOUS_RECIPS
+TO_CC_NONE
+
+# good enough
+TO_EMPTY
+
+# good enough
+TO_MALFORMED
# good enough
TO_NO_USER
@@ -878,6 +917,9 @@
TRACKER_ID
# good enough
+TT_MSGID_TRUNC
+
+# good enough
TVD_ACT_193
# good enough
@@ -887,9 +929,6 @@
TVD_BODY_END_STAR
# good enough
-TVD_DEAD_JOB
-
-# good enough
TVD_DEAR_HOMEOWNER
# good enough
@@ -932,9 +971,6 @@
TVD_FW_MESG1
# good enough
-TVD_FW_MESG2
-
-# good enough
TVD_HEAD_KERNEL
# good enough
@@ -986,9 +1022,6 @@
TVD_RATWARE_CB_2
# good enough
-TVD_RATWARE_MSGID_01
-
-# good enough
TVD_RATWARE_MSGID_02
# good enough
@@ -998,12 +1031,6 @@
TVD_SINGLE_SPAN_DIV
# good enough
-TVD_SPACED_SUBJECT_WORD3
-
-# good enough
-TVD_SPACED_SUBJECT_WORD5
-
-# good enough
TVD_SPACED_WORDS
# good enough
@@ -1028,14 +1055,11 @@
TVD_UA_FOSTERING
# good enough
-TVD_UNDER_VALUED
-
-# good enough
-TVD_VISIT_PHARMA
-
-# good enough
TVD_VIS_HIDDEN
+# tflags net
+DNS_FROM_DOB
+
# good enough
FORGED_IMS_HTML
@@ -1049,10 +1073,49 @@
FORGED_OUTLOOK_TAGS
# good enough
-TVD_FW_GRAPHIC_NAME_LONG
+HS_SYNDICATE_P2
+
+# tflags net
+RCVD_IN_DOB
+
+# tflags net
+RCVD_IN_DSBL
+
+# tflags net
+RCVD_IN_NJABL_DUL
+
+# tflags net
+RCVD_IN_SORBS_DUL
+
+# tflags net
+RCVD_IN_WHOIS_INVALID
+
+# tflags net
+RCVD_IN_XBL
# good enough
-TVD_FW_GRAPHIC_NAME_MID
+TVD_FW_GRAPHIC_ID1
+
+# good enough
+TVD_PH_1
+
+# good enough
+TVD_PH_BODY_ACCOUNTS_PRE
+
+# good enough
+TVD_PH_FR5
+
+# good enough
+TVD_RATWARE_MSGID_01
+
+# tflags net
+URIBL_RHS_DOB
+
+# good enough
+ZMIde_REPLICA1
+
+# good enough
+ZMIde_REPLICASURE
# good enough
UNCLAIMED_MONEY
@@ -1063,6 +1126,9 @@
# good enough
UNDISC_RECIPS
+# good enough
+UNIQUE_WORDS
+
# tflags userconf
UNPARSEABLE_RELAY
@@ -1109,10 +1175,19 @@
URIBL_WS_SURBL
# good enough
-URI_NO_WWW_INFO_CGI
+URI_4YOU
+
+# good enough
+URI_L_PHP
+
+# good enough
+URI_NOVOWEL
+
+# good enough
+URI_NO_WWW_BIZ_CGI
# good enough
-URI_UNSUBSCRIBE
+URI_NO_WWW_INFO_CGI
# tflags userconf
USER_IN_ALL_SPAM_TO
@@ -1148,6 +1223,9 @@
VIA_GAP_GRA
# good enough
+WEIRD_QUOTING
+
+# good enough
X_IP
# good enough
@@ -1157,10 +1235,10 @@
X_MESSAGE_INFO
# good enough
-X_MIME_AUTOCONVERTED
+X_MSMAIL_PRIORITY_HIGH
# good enough
-X_MSMAIL_PRIORITY_HIGH
+X_ORIG_IP_NOT_IPV4
# good enough
X_PRIORITY_CC
@@ -1172,7 +1250,13 @@
ZMIde_EBAYJOBSURI
# good enough
+ZMIde_REPLICA2
+
+# good enough
ZMIde_SEXUALEXPL1
+
+# tflags net
+__RCVD_IN_DOB
# tflags net
__RCVD_IN_IADB