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/04/15 20:59:21 UTC
svn commit: r394354 - in /spamassassin/branches/bug-3109-shortcircuiting:
MANIFEST lib/Mail/SpamAssassin/Conf/Parser.pm lib/Mail/SpamAssassin/HTML.pm
lib/Mail/SpamAssassin/Message/Metadata/Received.pm rules/active.list
sa-update.raw
Author: jm
Date: Sat Apr 15 11:59:20 2006
New Revision: 394354
URL: http://svn.apache.org/viewcvs?rev=394354&view=rev
Log:
merge forward changes 394297:393128 from trunk; this branch now includes all trunk changes from r392947 to r394351
Modified:
spamassassin/branches/bug-3109-shortcircuiting/MANIFEST
spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/HTML.pm
spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
spamassassin/branches/bug-3109-shortcircuiting/rules/active.list
spamassassin/branches/bug-3109-shortcircuiting/sa-update.raw
Modified: spamassassin/branches/bug-3109-shortcircuiting/MANIFEST
URL: http://svn.apache.org/viewcvs/spamassassin/branches/bug-3109-shortcircuiting/MANIFEST?rev=394354&r1=394353&r2=394354&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/MANIFEST (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/MANIFEST Sat Apr 15 11:59:20 2006
@@ -76,6 +76,7 @@
lib/Mail/SpamAssassin/Plugin/DKIM.pm
lib/Mail/SpamAssassin/Plugin/DomainKeys.pm
lib/Mail/SpamAssassin/Plugin/Hashcash.pm
+lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm
lib/Mail/SpamAssassin/Plugin/Pyzor.pm
lib/Mail/SpamAssassin/Plugin/Razor2.pm
Modified: spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=394354&r1=394353&r2=394354&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/Conf/Parser.pm Sat Apr 15 11:59:20 2006
@@ -238,6 +238,8 @@
$self->{if_stack} = \@if_stack;
while (defined ($line = shift @conf_lines)) {
+ local ($1); # bug 3838: prevent random taint flagging of $1
+
$line =~ s/(?<!\\)#.*$//; # remove comments
$line =~ s/^\s+//; # remove leading whitespace
$line =~ s/\s+$//; # remove tailing whitespace
Modified: spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/HTML.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/HTML.pm?rev=394354&r1=394353&r2=394354&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/HTML.pm (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/HTML.pm Sat Apr 15 11:59:20 2006
@@ -488,11 +488,11 @@
$new{size} = $1;
}
}
- elsif ($tag eq "span" && $name eq "style") {
- my $style = $new{style} = $attr->{style};
- my @parts = split(/;/, $style);
+ elsif ($name eq 'style') {
+ $new{style} = $attr->{style};
+ my @parts = split(/;/, $new{style});
foreach (@parts) {
- if (/\s*(background-)?color:\s*([^;]+)\s*/i) {
+ if (/^\s*(background-)?color:\s*(.+)\s*$/i) {
my $whcolor = $1 ? 'bgcolor' : 'fgcolor';
my $value = lc $2;
@@ -515,22 +515,21 @@
$new{$whcolor} = name_to_rgb($value);
}
}
- elsif (/\s*display:\s*none\b/i) {
- $new{display} = 'none';
- $self->put_results(span_invisible => 1);
+ elsif (/^\s*([a-z_-]+)\s*:\s*(\S.*?)\s*$/i) {
+ # "display: none", "visibility: hidden", etc.
+ $new{'style_'.$1} = $2;
}
}
}
+ elsif ($name eq "bgcolor") {
+ # overwrite with hex value, $new{bgcolor} is set below
+ $attr->{bgcolor} = name_to_rgb($attr->{bgcolor});
+ }
else {
- if ($name eq "bgcolor") {
- # overwrite with hex value, $new{bgcolor} is set below
- $attr->{bgcolor} = name_to_rgb($attr->{bgcolor});
- }
- else {
- # attribute is probably okay
- $new{$name} = $attr->{$name};
- }
+ # attribute is probably okay
+ $new{$name} = $attr->{$name};
}
+
if ($new{size} > $self->{max_size}) {
$self->{max_size} = $new{size};
}
@@ -555,7 +554,8 @@
my $fg = $self->{text_style}[-1]->{fgcolor};
my $bg = $self->{text_style}[-1]->{bgcolor};
my $size = $self->{text_style}[-1]->{size};
- my $display = $self->{text_style}[-1]->{display};
+ my $display = $self->{text_style}[-1]->{style_display};
+ my $visibility = $self->{text_style}[-1]->{style_visibility};
# invisibility
if (substr($fg,-6) eq substr($bg,-6)) {
@@ -595,6 +595,10 @@
# <span style="display: none">
if ($display && lc $display eq 'none') {
+ return 1;
+ }
+
+ if ($visibility && lc $visibility eq 'hidden') {
return 1;
}
Modified: spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=394354&r1=394353&r2=394354&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Sat Apr 15 11:59:20 2006
@@ -765,7 +765,7 @@
# Received: from cabbage.jmason.org [127.0.0.1]
# by localhost with IMAP (fetchmail-5.9.0)
# for jm@localhost (single-drop); Thu, 13 Mar 2003 20:39:56 -0800 (PST)
- if (/^from (\S+) \[(${IP_ADDRESS})\] by (\S+) with \S+ \(fetchmail/) {
+ if (/^from (\S+) (?:\[(${IP_ADDRESS})\] )?by (\S+) with \S+ \(fetchmail/) {
$self->found_pop_fetcher_sig();
return; # skip fetchmail handovers
}
Modified: spamassassin/branches/bug-3109-shortcircuiting/rules/active.list
URL: http://svn.apache.org/viewcvs/spamassassin/branches/bug-3109-shortcircuiting/rules/active.list?rev=394354&r1=394353&r2=394354&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/rules/active.list (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/rules/active.list Sat Apr 15 11:59:20 2006
@@ -1,6 +1,18 @@
# active ruleset list (automatically generated from http://buildbot.spamassassin.org/)
# good enough
+ADDR_FREE
+
+# good enough
+ADDR_NUMS_AT_BIGSITE
+
+# good enough
+ADVANCE_FEE_1
+
+# good enough
+ADVANCE_FEE_2
+
+# good enough
ADVANCE_FEE_3
# good enough
@@ -9,6 +21,12 @@
# good enough
ALL_NATURAL
+# good enough
+AMATEUR_PORN
+
+# good enough
+AS_SEEN_ON
+
# tflags userconf
AWL
@@ -46,28 +64,31 @@
BAYES_99
# good enough
-BILL_1618
+BEST_PORN
# good enough
-BODY_ENHANCEMENT
+BILLION_DOLLARS
# good enough
-BODY_ENHANCEMENT2
+BODY_ENHANCEMENT
# good enough
CHINA_HEADER
# good enough
+CONFIRMED_FORGED
+
+# good enough
CUM_SHOT
# good enough
DATE_IN_FUTURE_03_06
# good enough
-DATE_IN_FUTURE_12_24
+DATE_IN_FUTURE_06_12
# good enough
-DATE_IN_FUTURE_24_48
+DATE_IN_FUTURE_12_24
# good enough
DATE_IN_FUTURE_48_96
@@ -79,9 +100,6 @@
DATE_IN_PAST_12_24
# good enough
-DATE_IN_PAST_24_48
-
-# good enough
DATE_IN_PAST_96_XX
# good enough
@@ -91,11 +109,26 @@
DAV_NON_HOTMAIL
# good enough
+DEAR_FRIEND
+
+# good enough
DEAR_WINNER
+# good enough
+DIET_1
+
+# good enough
+DIET_2
+
+# good enough
+DIET_3
+
# tflags net
DIGEST_MULTIPLE
+# good enough
+DISGUISE_PORN_MUNDANE
+
# tflags net
DNS_FROM_AHBL_RHSBL
@@ -124,9 +157,6 @@
DRUGS_ANXIETY_EREC
# good enough
-DRUGS_ANXIETY_OBFU
-
-# good enough
DRUGS_DIET
# good enough
@@ -145,6 +175,9 @@
DRUGS_MANYKINDS
# good enough
+DRUGS_SLEEP
+
+# good enough
DRUGS_SLEEP_EREC
# good enough
@@ -157,39 +190,30 @@
DRUG_ED_GENERIC
# good enough
-DRUG_ED_ONLINE
-
-# good enough
DRUG_ED_SILD
# good enough
-EMPTY_MESSAGE
-
-# good enough
-EM_ROLEX
+EARN_PER_WEEK
# tflags userconf
ENV_AND_HDR_SPF_MATCH
# good enough
-FAKE_HELO_LYCOS
+EXTRA_MPART_TYPE
# good enough
-FAKE_HELO_MAIL_COM
+FAKE_HELO_EXCITE
# good enough
-FAKE_HELO_MAIL_COM_DOM
+FAKE_HELO_LYCOS
# good enough
-FAKE_HELO_MSN
+FAKE_HELO_MAIL_COM
# good enough
FAKE_OUTBLAZE_RCVD
# good enough
-FB_CIALIS_LEO2
-
-# good enough
FB_CIALIS_LEO3
# good enough
@@ -217,27 +241,18 @@
FH_FROM_HOODIA
# good enough
-FH_FROM_TO_PERC
-
-# good enough
FH_HELO_GMAILSMTP
# good enough
FH_RCVD_WITHSMTPFOR
# good enough
-FH_VIRUS_NORTON
-
-# good enough
FM_CUSTOMLOGODSGNc
# good enough
FORGED_AOL_TAGS
# good enough
-FORGED_EUDORAMAIL_RCVD
-
-# good enough
FORGED_HOTMAIL_RCVD
# good enough
@@ -247,6 +262,9 @@
FORGED_IMS_TAGS
# good enough
+FORGED_JUNO_RCVD
+
+# good enough
FORGED_MSGID_AOL
# good enough
@@ -292,9 +310,6 @@
FORGED_QUALCOMM_TAGS
# good enough
-FORGED_TELESP_RCVD
-
-# good enough
FORGED_THEBAT_HTML
# good enough
@@ -304,6 +319,9 @@
FORWARD_LOOKING
# good enough
+FREE_SAMPLE
+
+# good enough
FROM_ALL_NUMS
# good enough
@@ -313,19 +331,37 @@
FROM_ENDS_IN_NUMS
# good enough
+FROM_EXCESS_QP
+
+# good enough
FROM_HAS_MIXED_NUMS
# good enough
FROM_ILLEGAL_CHARS
# good enough
+FROM_LOCAL_DIGITS
+
+# good enough
+FROM_LOCAL_HEX
+
+# good enough
FROM_LOCAL_NOVOWEL
# good enough
+FROM_NO_USER
+
+# good enough
FROM_OFFERS
# good enough
-FR_WWW_DOMAIN_23SUBDIR
+FROM_STARTS_WITH_NUMS
+
+# good enough
+FRONTPAGE
+
+# good enough
+FS_START_DOYOU
# good enough
FS_START_DOYOU2
@@ -334,6 +370,9 @@
FUZZY_MERIDIA
# good enough
+FUZZY_STOCK
+
+# good enough
FU_HOODIA
# good enough
@@ -342,6 +381,12 @@
# good enough
GEO_QUERY_STRING
+# good enough
+GUARANTEED_100_PERCENT
+
+# good enough
+GUARANTEED_STUFF
+
# tflags net
HABEAS_ACCREDITED_COI
@@ -376,33 +421,15 @@
HASHCASH_HIGH
# good enough
-HEADER_COUNT_CTYPE
-
-# good enough
HEADER_SPAM
# good enough
HEAD_ILLEGAL_CHARS
# good enough
-HELO_DYNAMIC_COMCAST
-
-# good enough
-HELO_DYNAMIC_DHCP
-
-# good enough
-HELO_DYNAMIC_DIALIN
-
-# good enough
HELO_DYNAMIC_HCC
# good enough
-HELO_DYNAMIC_HOME_NL
-
-# good enough
-HELO_DYNAMIC_IPADDR
-
-# good enough
HELO_DYNAMIC_IPADDR2
# good enough
@@ -412,6 +439,9 @@
HG_HORMONE
# good enough
+HS_DRUG_DOLLAR_1
+
+# good enough
HS_EXTRA
# good enough
@@ -432,10 +462,16 @@
# good enough
HS_SUBJ_ONLINE_PHARMACEUTICAL
+# good enough
+HS_SYNDICATE_P2
+
# tflags userconf
HTML_CHARSET_FARAWAY
# good enough
+HTTPS_HTTP_MISMATCH
+
+# good enough
HTTPS_IP_MISMATCH
# good enough
@@ -454,18 +490,27 @@
INVALID_MSGID
# good enough
+INVALID_TZ_CST
+
+# good enough
INVALID_TZ_EST
# good enough
INVESTMENT_ADVICE
# good enough
+IP_LINK_PLUS
+
+# good enough
JAPANESE_UCE_SUBJECT
# good enough
KAM_STOCKOTC
# good enough
+KAM_STOCKTIP1
+
+# good enough
KAM_STOCKTIP15
# good enough
@@ -478,15 +523,9 @@
KAM_STOCKTIP21
# good enough
-KAM_STOCKTIP22
-
-# good enough
KAM_STOCKTIP23
# good enough
-KAM_STOCKTIP26
-
-# good enough
KAM_STOCKTIP3
# good enough
@@ -499,6 +538,9 @@
KAM_STOCKTIP6
# good enough
+KAM_STOCKTIP7
+
+# good enough
KAM_STOCKTIP8
# good enough
@@ -511,6 +553,9 @@
LONGWORDS
# good enough
+MAILTO_SUBJ_REMOVE
+
+# good enough
MALE_ENHANCE
# good enough
@@ -520,9 +565,6 @@
MIME_BAD_ISO_CHARSET
# good enough
-MIME_BASE64_NO_NAME
-
-# good enough
MIME_BASE64_TEXT
# good enough
@@ -538,6 +580,9 @@
MIME_BOUND_RKFINDY
# good enough
+MIME_HEADER_CTYPE_ONLY
+
+# good enough
MIME_HTML_MOSTLY
# good enough
@@ -547,22 +592,40 @@
MISSING_MIMEOLE
# good enough
+ML_MARKETING
+
+# good enough
MORE_SEX
# good enough
MPART_ALT_DIFF
# good enough
+MPART_ALT_DIFF_COUNT
+
+# good enough
+MSGID_DOLLARS
+
+# good enough
MSGID_DOLLARS_RANDOM
# good enough
-MSGID_OUTLOOK_INVALID
+MSGID_FROM_MTA_ID
# good enough
-MSGID_RANDY
+MSGID_LONG
+
+# good enough
+MSGID_MULTIPLE_AT
# good enough
-MSGID_SHORT
+MSGID_NO_HOST
+
+# good enough
+MSGID_OUTLOOK_INVALID
+
+# good enough
+MSGID_RANDY
# good enough
MSGID_SPAM_CAPS
@@ -577,6 +640,9 @@
NASTY_GIRLS
# good enough
+NA_DOLLARS
+
+# good enough
NOT_ADVISOR
# tflags net
@@ -601,22 +667,28 @@
NUMERIC_HTTP_ADDR
# good enough
+OFFSHORE_SCAM
+
+# good enough
ONE_TIME
# good enough
-PERCENT_RANDOM
+ONLINE_PHARMACY
# good enough
-PLING_QUERY
+PERCENT_RANDOM
# good enough
PORN_15
# good enough
-PREST_NON_ACCREDITED
+PORN_16
+
+# good enough
+PORN_URL_SEX
# good enough
-PRIORITY_NO_NAME
+PREST_NON_ACCREDITED
# tflags net
PYZOR_CHECK
@@ -640,6 +712,9 @@
RATWARE_MOZ_MALFORMED
# good enough
+RATWARE_MPOP_WEBMAIL
+
+# good enough
RATWARE_MS_HASH
# good enough
@@ -787,6 +862,9 @@
REMOVE_BEFORE_LINK
# good enough
+REMOVE_PAGE
+
+# good enough
REPLICA_WATCH
# good enough
@@ -802,8 +880,14 @@
REPTO_QUOTE_MSN
# good enough
+REPTO_QUOTE_QUALCOMM
+
+# good enough
REPTO_QUOTE_YAHOO
+# good enough
+RISK_FREE
+
# tflags net
ROUND_THE_WORLD
@@ -811,7 +895,7 @@
ROUND_THE_WORLD_LOCAL
# good enough
-RUDE_HTML
+SOMETHING_FOR_ADULTS
# good enough
SORTED_RECIPS
@@ -841,18 +925,12 @@
SPF_SOFTFAIL
# good enough
-SPOOF_COM2COM
+SPOOF_COM2OTH
# good enough
SPOOF_NET2COM
# good enough
-SPOOF_OURI
-
-# good enough
-STOCK_ALERT
-
-# good enough
STRONG_BUY
# good enough
@@ -883,10 +961,16 @@
SUBJECT_NEEDS_ENCODING
# good enough
-SUBJECT_NOVOWEL
+SUBJECT_SEXUAL
# good enough
-SUBJECT_SEXUAL
+SUBJ_AS_SEEN
+
+# good enough
+SUBJ_BUY
+
+# good enough
+SUBJ_FOR_ONLY
# good enough
SUBJ_ILLEGAL_CHARS
@@ -895,6 +979,9 @@
SUBJ_RE_NUM
# good enough
+SUBJ_YOUR_DEBT
+
+# good enough
SUBJ_YOUR_FAMILY
# good enough
@@ -904,6 +991,9 @@
SUSPICIOUS_RECIPS
# good enough
+TERRA_ES
+
+# good enough
TRACKER_ID
# good enough
@@ -913,10 +1003,10 @@
TVD_APP_LOAN
# good enough
-TVD_DEAR_HOMEOWNER
+TVD_DEAD_JOB
# good enough
-TVD_DOLLARS_US
+TVD_DEAR_HOMEOWNER
# good enough
TVD_EB_PHISH
@@ -925,10 +1015,10 @@
TVD_ENHANCE
# good enough
-TVD_FINGER_02
+TVD_FROM_1
# good enough
-TVD_FROM_1
+TVD_FUZZY_DEGREE
# good enough
TVD_FUZZY_FINANCE
@@ -955,6 +1045,9 @@
TVD_FW_MESG2
# good enough
+TVD_GET_STOCK
+
+# good enough
TVD_HEAD_KERNEL
# good enough
@@ -964,136 +1057,127 @@
TVD_INCREASE_SIZE
# good enough
-TVD_LONG_WORD5
-
-# good enough
TVD_NOT_SATISFIED
# good enough
-TVD_PH_11
-
-# good enough
-TVD_PH_7
-
-# good enough
-TVD_PH_META
+TVD_PH_1
# good enough
-TVD_PH_REC
+TVD_PH_SUBJ_ACCOUNTS_POST
# good enough
-TVD_PH_SEC
+TVD_PH_SUBJ_ACCOUNTS_PRE
# good enough
-TVD_PP_PHISH
+TVD_PH_SUBJ_META
# good enough
-TVD_RATWARE_CB
+TVD_PH_SUBJ_SEC_MEASURES
# good enough
-TVD_SECTION
+TVD_PH_SUBJ_UPDATE
# good enough
-TVD_SINGLE_SPAN
+TVD_PH_SUBJ_URGENT
# good enough
-TVD_SUBJ_ACC_NUM
+TVD_PP_PHISH
# good enough
-TVD_SUBJ_APPR_LOAN
+TVD_RATWARE_CB
# good enough
-TVD_SUBJ_OWE
+TVD_SECTION
# good enough
-TVD_SUBJ_WIPE_DEBT
+TVD_SPACED_SUBJECT_WORD
# good enough
-TVD_UA_FOSTERING
+TVD_SPACED_SUBJECT_WORD2
# good enough
-TVD_UNDER_VALUED
+TVD_SPACED_WORDS
# good enough
-TVD_VISIT_PHARMA
+TVD_STOCK1
# good enough
-FORGED_IMS_HTML
+TVD_SUBJ_APPR_LOAN
# good enough
-FORGED_IMS_TAGS
+TVD_SUBJ_FINGER_03
# good enough
-FORGED_OUTLOOK_HTML
+TVD_SUBJ_OWE
# good enough
-FORGED_OUTLOOK_TAGS
+TVD_SUBJ_WIPE_DEBT
# good enough
-FS_START_DOYOU
+TVD_UA_FOSTERING
# good enough
-FUZZY_SPRM
+TVD_UNDER_VALUED
# good enough
-FUZZY_STOCK
+TVD_VISIT_PHARMA
# good enough
-HS_DRUG_DOLLAR_1
+TVD_VIS_HIDDEN
# good enough
-HS_DRUG_DOLLAR_2
+FB_OBFU_URI_COM
# good enough
-HS_DRUG_DOLLAR_3
+FH_DATE_IS_19XX
# good enough
-HS_DRUG_DOLLAR_MANY
+FORGED_IMS_HTML
# good enough
-HS_NO_FLOWERS
+FORGED_IMS_TAGS
# good enough
-HS_SYNDICATE_P1
+FORGED_OUTLOOK_HTML
# good enough
-HS_SYNDICATE_P2
+FORGED_OUTLOOK_TAGS
# good enough
-KAM_STOCKTIP1
+KAM_STOCKTIP10
# good enough
-KAM_STOCKTIP11
+KAM_STOCKTIP19
# good enough
-KAM_STOCKTIP7
+KAM_STOCKTIP24
# good enough
-TVD_COMPANY_PICK
+LFUZ_PWRMALE
# good enough
-TVD_DEAD_JOB
+LINK_SWAP_1
# good enough
-TVD_FUZZY_DEGREE
+LINK_SWAP_2
# good enough
-TVD_FW_GRAPHIC_NAME_LONG
+LINK_SWAP_SUBJ
# good enough
-TVD_FW_GRAPHIC_NAME_MID
+TVD_FW_GRAPHIC_ID1
# good enough
-TVD_GET_STOCK
+TVD_FW_GRAPHIC_ID2
# good enough
-TVD_PH_1
+TVD_HEAD_EDITION
# good enough
-TVD_STOCK1
+TVD_PH_BODY_META
# good enough
-TVD_SUBJ_FINGER_03
+TVD_PH_SUBJ_META_ALL
# good enough
UNCLAIMED_MONEY
@@ -1111,6 +1195,9 @@
UNRESOLVED_TEMPLATE
# good enough
+UPPERCASE_50_75
+
+# good enough
UPPERCASE_75_100
# good enough
@@ -1147,10 +1234,19 @@
URIBL_WS_SURBL
# good enough
+URI_AFFILIATE
+
+# good enough
+URI_NOVOWEL
+
+# good enough
URI_NO_WWW_BIZ_CGI
# good enough
-URI_NO_WWW_INFO_CGI
+URI_OFFERS
+
+# good enough
+URI_SCHEME_MIXED_CASE
# good enough
URI_UNSUBSCRIBE
@@ -1183,34 +1279,37 @@
USER_IN_WHITELIST_TO
# good enough
-VERTICAL_DRUGS_1
+US_DOLLARS_3
# good enough
-VIA_GAP_GRA
+VERTICAL_DRUGS_1
# good enough
WEIRD_QUOTING
# good enough
+WHILE_YOU_SLEEP
+
+# good enough
WHY_PAY_MORE
# good enough
WITH_LC_SMTP
# good enough
-X_IP
+WRINKLES
# good enough
-X_LIBRARY
+X_IP
# good enough
-X_MESSAGE_INFO
+X_LIBRARY
# good enough
-X_MIME_AUTOCONVERTED
+X_MAILER_SPAM
# good enough
-X_MSMAIL_PRIORITY_HIGH
+X_MESSAGE_INFO
# good enough
X_PRIORITY_CC
Modified: spamassassin/branches/bug-3109-shortcircuiting/sa-update.raw
URL: http://svn.apache.org/viewcvs/spamassassin/branches/bug-3109-shortcircuiting/sa-update.raw?rev=394354&r1=394353&r2=394354&view=diff
==============================================================================
--- spamassassin/branches/bug-3109-shortcircuiting/sa-update.raw (original)
+++ spamassassin/branches/bug-3109-shortcircuiting/sa-update.raw Sat Apr 15 11:59:20 2006
@@ -120,7 +120,7 @@
@{$opt{'channel'}} = ();
my $GPG_ENABLED = 1;
-$opt{'gpghomedir'} = File::Spec->catfile($LOCAL_RULES_DIR, '/sa-update-keys');
+$opt{'gpghomedir'} = File::Spec->catfile($LOCAL_RULES_DIR, 'sa-update-keys');
Getopt::Long::Configure(
qw(bundling no_getopt_compat no_auto_abbrev no_ignore_case));