On 2010-03-15 15:41, Justin Mason wrote:
http://people.apache.org/~jm/devel/PROPOSED-3.3.1.txt
http://people.apache.org/~jm/devel/
please vote!
+1
Looks good enough to me.
A diff between the proposed 3.3.1 and trunk reveals a couple of
trivialities which should go into 3.3.2 (or into 3.3.1 if there will be
a re-cut).
Further down there is a diff between 3.3.1 rules as installed by sa-update
from a tarball, vs. the ones installed by sa-update from net. Seems like
some more recent edits did not make it into a tarball, please review if
there is any need for concern.
Mark
--- Mail-SpamAssassin-3.3.1/CREDITS 2010-03-15 15:29:46.000000000 +0100
+++ spamassassin-trunk/CREDITS 2010-03-11 16:04:32.000000000 +0100
@@ -29,2 +29,3 @@
- John Hardin
+ - Adam Katz
- Warren Togami http://www.amazon.com/wishlist/1RJO0CGTPEDQT
--- Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
2010-03-15 15:29:42.000000000 +0100
+++ spamassassin-trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
2010-02-05 20:19:38.000000000 +0100
@@ -25,3 +25,3 @@
-This module implementes a PostgresSQL specific bayesian storage module.
+This module implements a PostgreSQL specific bayesian storage module.
--- Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Client.pm 2010-03-15
15:29:43.000000000 +0100
+++ spamassassin-trunk/lib/Mail/SpamAssassin/Client.pm 2010-01-27
01:49:50.000000000 +0100
@@ -474,3 +474,3 @@
-We have this as a seperate method in case we ever decide to get fancy
+We have this as a separate method in case we ever decide to get fancy
with the response line.
Mail/SpamAssassin/PerMsgLearner.pm
--- Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/PerMsgLearner.pm
2010-03-15 15:29:43.000000000 +0100
+++ spamassassin-trunk/lib/Mail/SpamAssassin/PerMsgLearner.pm 2010-01-27
01:49:50.000000000 +0100
@@ -165,3 +165,3 @@
-Returns C<1> if the message was learned from or forgotten succesfully.
+Returns C<1> if the message was learned from or forgotten successfully.
b/Mail/SpamAssassin/Plugin/URIDNSBL.pm
--- Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
2010-03-15 15:29:43.000000000 +0100
+++ spamassassin-trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2010-03-10
02:38:52.000000000 +0100
@@ -314,2 +314,3 @@
my $tflags = $scanner->{conf}->{tflags}->{$rulename};
+ $tflags = '' if !defined $tflags;
--- Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin.pm 2010-03-15
15:29:43.000000000 +0100
+++ spamassassin-trunk/lib/Mail/SpamAssassin/Plugin.pm 2010-02-15
18:50:35.000000000 +0100
@@ -678,3 +678,3 @@
are a single string containing the raw token value. You can test for
-backwards compatability by checking to see if the value for a key is a
+backwards compatibility by checking to see if the value for a key is a
reference to a perl HASH, for instance:
--- Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin.pm 2010-03-15
15:29:43.000000000 +0100
+++ spamassassin-trunk/lib/Mail/SpamAssassin.pm 2010-03-11 16:04:32.000000000
+0100
@@ -231,3 +231,3 @@
If set to 1, DNS tests will not attempt to use IPv6. Use if the existing tests
-for IPv6 availablity produce incorrect results or crashes.
+for IPv6 availability produce incorrect results or crashes.
--- Mail-SpamAssassin-3.3.1/lib/spamassassin-run.pod 2010-03-15
15:29:43.000000000 +0100
+++ spamassassin-trunk/lib/spamassassin-run.pod 2010-02-15 18:50:35.000000000
+0100
@@ -208,3 +208,3 @@
IPv6 is available, using only IPv4 if it is not. Use if the existing tests
-for IPv6 availablity produce incorrect results or crashes.
+for IPv6 availability produce incorrect results or crashes.
--- Mail-SpamAssassin-3.3.1/sa-learn 2010-03-15 17:23:25.000000000 +0100
+++ spamassassin-trunk/sa-learn 2010-03-03 00:15:43.000000000 +0100
@@ -613,3 +613,3 @@
--use-ignores Use bayes_ignore_from and bayes_ignore_to
- --sync Syncronize the database and the journal if needed
+ --sync Synchronize the database and the journal if needed
--force-expire Force a database sync and expiry run
@@ -729,3 +729,3 @@
-Syncronize the journal and databases. Upon successfully syncing the
+Synchronize the journal and databases. Upon successfully syncing the
database with the entries in the journal, the journal file is removed.
@@ -1237,3 +1237,3 @@
=item - if no expire has been done before, or the last expire looks
-"wierd", do an estimation pass. The definition of "wierd" is:
+"weird", do an estimation pass. The definition of "weird" is:
--- Mail-SpamAssassin-3.3.1/sa-learn.raw 2010-03-15 15:29:46.000000000
+0100
+++ spamassassin-trunk/sa-learn.raw 2010-01-27 01:49:50.000000000 +0100
@@ -614,3 +614,3 @@
--use-ignores Use bayes_ignore_from and bayes_ignore_to
- --sync Syncronize the database and the journal if needed
+ --sync Synchronize the database and the journal if needed
--force-expire Force a database sync and expiry run
@@ -730,3 +730,3 @@
-Syncronize the journal and databases. Upon successfully syncing the
+Synchronize the journal and databases. Upon successfully syncing the
database with the entries in the journal, the journal file is removed.
@@ -1238,3 +1238,3 @@
=item - if no expire has been done before, or the last expire looks
-"wierd", do an estimation pass. The definition of "wierd" is:
+"weird", do an estimation pass. The definition of "weird" is:
--- Mail-SpamAssassin-3.3.1/t/uribl_domains_only.t 2010-03-15
15:29:45.000000000 +0100
+++ spamassassin-trunk/t/uribl_domains_only.t 2010-03-03 19:10:36.000000000
+0100
@@ -11,3 +11,3 @@
BEGIN {
- plan tests => (DO_RUN ? 2 : 0),
+ plan tests => (DO_RUN ? 4 : 0),
};
@@ -18,5 +18,3 @@
-%anti_patterns = (
- q{ X_URIBL_DOMSONLY } => 'A',
-);
+%anti_patterns = ( q{ X_URIBL_DOMSONLY } => 'A' );
@@ -38 +36,8 @@
+%patterns = ( q{ X_URIBL_DOMSONLY } => 'A' );
+%anti_patterns = ();
+
+clear_pattern_counters();
+ok sarun ("-t< data/spam/dnsbl_ipsonly.eml 2>&1", \&patterns_run_cb);
+ok_all_patterns();
+
--- Mail-SpamAssassin-3.3.1/t/uribl_ips_only.t 2010-03-15 15:29:45.000000000
+0100
+++ spamassassin-trunk/t/uribl_ips_only.t 2010-03-03 19:10:36.000000000
+0100
@@ -11,3 +11,3 @@
BEGIN {
- plan tests => (DO_RUN ? 2 : 0),
+ plan tests => (DO_RUN ? 4 : 0),
};
@@ -38 +38,8 @@
+%patterns = ( q{ X_URIBL_IPSONLY } => 'A' );
+%anti_patterns = ();
+
+clear_pattern_counters();
+ok sarun ("-t< data/spam/dnsbl_domsonly.eml 2>&1", \&patterns_run_cb);
+ok_all_patterns();
+
--- 3.003001.TAR/updates_spamassassin_org/20_freemail_domains.cf
2010-03-15 17:55:03.000000000 +0100
+++ 3.003001.NET/updates_spamassassin_org/20_freemail_domains.cf
2010-03-15 17:53:33.000000000 +0100
@@ -25,2 +25,3 @@
+#Last Update AXB 3/4/2010
ifplugin Mail::SpamAssassin::Plugin::FreeMail
@@ -112,3 +113,3 @@
freemail_domains earthling.net eastmail.com eastrolog.com easy-pages.com
easy.com
-freemail_domains easyinfomail.co.za easypeasy.com echina.com ecn.org
ecplaza.net
+freemail_domains easyinfomail.co.za easypeasy.com echina.com ecn.org
ecplaza.net eircom.net
freemail_domains edsamail.com.ph educacao.te.pt edumail.co.za eeism.com
ego.co.th
@@ -163,3 +164,3 @@
freemail_domains happycounsel.com hawaii.com hawaii.usa.com hayahaya.tg
hedgeai.com
-freemail_domains heesun.net heremail.com highveldmail.co.za hilarious.com
hildebrands.de
+freemail_domains heesun.net heremail.com hetnet.nl highveldmail.co.za
hilarious.com hildebrands.de
freemail_domains hingis.org hispavista.com hitmanrecords.com
hockeyghiaccio.com
@@ -167,3 +168,3 @@
freemail_domains homemail.co.za homenetmail.com homestead.com homosexual.net
hongkong.com
-freemail_domains hopthu.com hot-shot.com hot.ee hotbot.com hotcoolmail.com
hotdak.com
+freemail_domains hopthu.com hot-shot.com hot.ee hotbot.com hotbox.ru
hotcoolmail.com hotdak.com
freemail_domains hotfire.net hotinbox.com hotmail.* hotmail.co*.*
@@ -185,3 +186,3 @@
freemail_domains internetmailing.net inwind.it iobox.com iobox.fi iol.it
iol.pt iowa.usa.com
-freemail_domains ip3.com ipermitmail.com iqemail.com iran.com irangate.net
irelandmail.com
+freemail_domains ip3.com ipermitmail.com iqemail.com iquebec.com iran.com
irangate.net irelandmail.com
freemail_domains iscool.net islandmama.com ismart.net isonews2.com
isonfire.com isp9.net
@@ -197,3 +198,3 @@
freemail_domains kuronowish.com kyokodate.com kyokofukada.net ladymail.cz
lagoon.nc
-freemail_domains lahaonline.com lamalla.net lancsmail.com laposte.net
latinmail.com
+freemail_domains lahaonline.com lamalla.net lancsmail.com land.ru laposte.net
latinmail.com
freemail_domains lawyer.com lawyersmail.com lawyerzone.com lebanonatlas.com
leehom.net
@@ -202,3 +203,3 @@
freemail_domains libertysurf.net libre.net lightwines.org linkmaster.com
linuxfreemail.com
-freemail_domains linuxmail.org lionsfan.com.au live.com livedoor.com
llandudno.com
+freemail_domains linuxmail.org lionsfan.com.au live.* livedoor.com
llandudno.com
freemail_domains llangollen.com lmxmail.sk lobbyist.com loggain.net
loggain.nu lolnetwork.net
@@ -214,3 +215,3 @@
freemail_domains mail.goo.ne.jp mail.gr mail.lawguru.com mail.md mail.mn
mail.org mail.pf
-freemail_domains mail.pt mail.ru mail.yahoo.co.jp mail2*.com mail3000.com
+freemail_domains mail.pt mail.ru mail.yahoo.co.jp mail15.com mail2*.com
mail3000.com mail333.com
freemail_domains mail8.com mailandftp.com mailandnews.com mailas.com
mailasia.com mailbg.com
@@ -238,3 +239,3 @@
freemail_domains ms*.hinet.net mscold.com msn.com mundo-r.com munich.com
musician.org muslim.com
-freemail_domains muslimsonline.com mustangs.com mxs.de mycabin.com mycity.com
mycommail.com
+freemail_domains muslimsonline.com mustangs.com mxs.de myblue.cc mycabin.com
mycity.com mycommail.com
freemail_domains mycool.com mydomain.com myeweb.com myfastmail.com
myfunnymail.com
@@ -246,3 +247,3 @@
freemail_domains nanaseaikawa.com nandomail.com naseej.com nastything.com
national-champs.com
-freemail_domains nativeweb.net naveganas.com nebraska.usa.com nemra1.com
nenter.com
+freemail_domains nativeweb.net narod.ru naveganas.com nebraska.usa.com
nemra1.com nenter.com
freemail_domains nerdshack.com nervhq.org net.hr net4b.pt net4jesus.com
net4you.at
@@ -255,3 +256,3 @@
freemail_domains newyork.usa.com newyorkcity.com nfmail.com nicegal.com
nightimeuk.com
-freemail_domains nightly.com nightmail.com noavar.com noemail.com nonomail.com
+freemail_domains nightly.com nightmail.com nightmail.ru noavar.com noemail.com
nonomail.com
freemail_domains nonpartisan.com noolhar.com northcarolina.usa.com
northdakota.usa.com
@@ -263,3 +264,3 @@
freemail_domains online.ru onlinewiz.com onobox.com openbg.com openforyou.com
-freemail_domains opentransfer.com operamail.com oplusnet.com optician.com
orangehome.co.uk
+freemail_domains opentransfer.com operamail.com oplusnet.com optician.com
orange.* orangehome.co.uk
freemail_domains orbitel.bg orcon.net.nz oregon.usa.com oreka.com
organizer.net orgio.net
@@ -275,5 +276,5 @@
freemail_domains planetout.com plasa.com playersodds.com playful.com pluno.com
-freemail_domains plusmail.com.br pmail.net pnetmail.co.za pobox.ru pobox.sk
pochta.ru
+freemail_domains plusmail.com.br pmail.net pnetmail.co.za pobox.ru pobox.sk
pochtamt.ru pochta.ru
freemail_domains poczta.fm poetic.com pogowave.com polandmail.com polbox.com
politician.com
-freemail_domains pop.co.th popmail.com poppymail.com popsmail.com popstar.com
portafree.com
+freemail_domains pop3.ru pop.co.th popmail.com poppymail.com popsmail.com
popstar.com portafree.com
freemail_domains portaldosalunos.com portugalmail.com portugalmail.pt
post.com post.cz
@@ -286,3 +287,3 @@
freemail_domains qatar.io qlmail.com qrio.com qsl.net qudsmail.com
queerplaces.com quepasa.com
-freemail_domains quick.cz quickwebmail.com r-o-o-t.com r320.hu raakim.com
racingseat.com
+freemail_domains quick.cz quickwebmail.com r-o-o-t.com r320.hu raakim.com
rbcmail.ru racingseat.com
freemail_domains radicalz.com radiojobbank.com radiologist.net ragingbull.com
@@ -310,3 +311,3 @@
freemail_domains sistersbrothers.com sizzling.com skim.com slamdunkfan.com
slickriffs.co.uk
-freemail_domains slingshot.com slo.net slomusic.net smartemail.co.uk
snail-mail.net
+freemail_domains slingshot.com slo.net slomusic.net smartemail.co.uk smtp.ru
snail-mail.net
freemail_domains snakebite.com sndt.net sneakemail.com snoopymail.com
snowboarding.com
@@ -329,3 +330,3 @@
freemail_domains taxcutadvice.com teachers.org techemail.com techie.com
technisamail.co.za
-freemail_domains technologist.com teenmail.co.uk teenmail.co.za tejary.com
telebot.com
+freemail_domains technologist.com teenmail.co.uk teenmail.co.za tejary.com
telebot.com telefonica.net
freemail_domains telegraf.by teleline.es telinco.net telkom.net telpage.net
telstra.com
@@ -373,3 +374,3 @@
freemail_domains yaho.com yahoo.* yahoo.co*.* yalla.com.lb
-freemail_domains yam.com yamal.info yapost.com yawmail.com yebox.com yehey.com
+freemail_domains yam.com yamal.info yandex.ru yapost.com yawmail.com yebox.com
yehey.com
freemail_domains yellow-jackets.com yellowstone.net yenimail.com yepmail.net
yifan.net
--- 3.003001.TAR/updates_spamassassin_org/20_head_tests.cf 2010-03-15
17:55:03.000000000 +0100
+++ 3.003001.NET/updates_spamassassin_org/20_head_tests.cf 2010-03-15
17:53:33.000000000 +0100
@@ -508,3 +508,4 @@
-header DATE_IN_FUTURE_96_XX eval:check_for_shifted_date('96', 'undef')
+#header DATE_IN_FUTURE_96_XX eval:check_for_shifted_date('96', 'undef')
+meta DATE_IN_FUTURE_96_XX (0)
describe DATE_IN_FUTURE_96_XX Date: is 96 hours or more after Received: date
--- 3.003001.TAR/updates_spamassassin_org/20_ratware.cf 2010-03-15
17:55:03.000000000 +0100
+++ 3.003001.NET/updates_spamassassin_org/20_ratware.cf 2010-03-15
17:53:33.000000000 +0100
@@ -208,9 +208,2 @@
-# spammer tool, sometimes has "netIP with HTTP;" in Received: header
-
-# this is really badly faked. Also the spammer who uses "25250101"
-# for the build is a total hippie.
-header RATWARE_GECKO_BUILD User-Agent =~ /Gecko\/(?!200\d\d\d\d\d)\d/
-describe RATWARE_GECKO_BUILD Bulk email fingerprint (Gecko faked) found
-
########################################################################
--- 3.003001.TAR/updates_spamassassin_org/20_uri_tests.cf 2010-03-15
17:55:03.000000000 +0100
+++ 3.003001.NET/updates_spamassassin_org/20_uri_tests.cf 2010-03-15
17:53:33.000000000 +0100
@@ -65,3 +65,3 @@
# though, which actually doesn't have a weird port in it.
-uri WEIRD_PORT
m{https?://[^/\s]+?:\d+(?<!:80)(?<!:443)(?<!:8080)(?:/|\s|$)}
+uri WEIRD_PORT
m{https?://[^/?\s]+?:\d+(?<!:80)(?<!:443)(?<!:8080)(?:/|\s|$)}
describe WEIRD_PORT Uses non-standard port number for HTTP
--- 3.003001.TAR/updates_spamassassin_org/30_text_de.cf 2010-03-15
17:55:03.000000000 +0100
+++ 3.003001.NET/updates_spamassassin_org/30_text_de.cf 2010-03-15
17:53:33.000000000 +0100
@@ -314,3 +314,2 @@
lang de describe RATWARE_HASH_DASH Enthält Abwehrmaßnahme gegen Anti-Spam-Software
("hashbuster")
-lang de describe RATWARE_GECKO_BUILD Kopfzeilen enthalten gefälschte Hinweise
auf Mozilla/Gecko
lang de describe RATWARE_ZERO_TZ Seltsame Zeitzone (+0000)
--- 3.003001.TAR/updates_spamassassin_org/30_text_nl.cf 2010-03-15
17:55:03.000000000 +0100
+++ 3.003001.NET/updates_spamassassin_org/30_text_nl.cf 2010-03-15
17:53:33.000000000 +0100
@@ -236,3 +236,2 @@
lang nl describe RATWARE_HASH_DASH Bevat een hashbuster in
Send-Safe opmaak
-lang nl describe RATWARE_GECKO_BUILD Bulk email signatuur
(vervalste Gecko) gevonden
lang nl describe NUMERIC_HTTP_ADDR Gebruikt een numeriek IP
adres in een URL
--- 3.003001.TAR/updates_spamassassin_org/50_scores.cf 2010-03-15
17:55:03.000000000 +0100
+++ 3.003001.NET/updates_spamassassin_org/50_scores.cf 2010-03-15
17:53:33.000000000 +0100
@@ -458,3 +458,2 @@
score RATWARE_EGROUPS 1.898 1.258 1.406 1.621
-score RATWARE_GECKO_BUILD 0 # n=0 n=1 n=2 n=3
score RATWARE_HASH_DASH 0 # n=0 n=1 n=2 n=3
@@ -799,3 +798,4 @@
score DATE_IN_FUTURE_48_96 2.384 0.813 1.078 2.181
-score DATE_IN_FUTURE_96_XX 2.614 3.028 2.851 3.087
+#score DATE_IN_FUTURE_96_XX 2.614 3.028 2.851 3.087
+score DATE_IN_FUTURE_96_XX 0
score DATE_IN_PAST_03_06 2.399 1.076 1.200 1.592
Only in 3.003001.NET/updates_spamassassin_org: 72_scores.cf
Only in 3.003001.NET/updates_spamassassin_org: MIRRORED.BY
Only in 3.003001.NET/updates_spamassassin_org: STATISTICS-set0-72_scores.cf.txt
Only in 3.003001.NET/updates_spamassassin_org: STATISTICS-set1-72_scores.cf.txt
Only in 3.003001.NET/updates_spamassassin_org: STATISTICS-set2-72_scores.cf.txt
Only in 3.003001.NET/updates_spamassassin_org: STATISTICS-set3-72_scores.cf.txt
Only in 3.003001.NET/updates_spamassassin_org: languages
Only in 3.003001.NET/updates_spamassassin_org: local.cf
Only in 3.003001.NET/updates_spamassassin_org: regression_tests.cf
Only in 3.003001.NET/updates_spamassassin_org: sa-update-pubkey.txt
Only in 3.003001.NET/updates_spamassassin_org: user_prefs.template
--- 3.003001.TAR/updates_spamassassin_org.cf 2010-03-15 17:55:03.000000000
+0100
+++ 3.003001.NET/updates_spamassassin_org.cf 2010-03-15 17:53:33.000000000
+0100
@@ -1,2 +1,2 @@
-# UPDATE version 923257
+# UPDATE version 922507
include updates_spamassassin_org/10_default_prefs.cf
@@ -50 +50,4 @@
include updates_spamassassin_org/72_active.cf
+include updates_spamassassin_org/72_scores.cf
+include updates_spamassassin_org/local.cf
+include updates_spamassassin_org/regression_tests.cf
--- 3.003001.TAR/updates_spamassassin_org/72_active.cf 2010-03-15
17:55:03.000000000 +0100
+++ 3.003001.NET/updates_spamassassin_org/72_active.cf 2010-03-15
17:53:33.000000000 +0100
[lots of diff]
