You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/06/26 14:59:46 UTC
svn commit: r1862148 - in /spamassassin/trunk: ./ rules/ rulesrc/ t/ t/data/
Author: hege
Date: Wed Jun 26 14:59:45 2019
New Revision: 1862148
URL: http://svn.apache.org/viewvc?rev=1862148&view=rev
Log:
Bug 7728 - Remove HashCash support from trunk
Modified:
spamassassin/trunk/MANIFEST
spamassassin/trunk/UPGRADE
spamassassin/trunk/USAGE
spamassassin/trunk/rules/30_text_de.cf
spamassassin/trunk/rules/30_text_pt_br.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rules/init.pre
spamassassin/trunk/rulesrc/10_force_active.cf
spamassassin/trunk/spamassassin.raw
spamassassin/trunk/t/all_modules.t
spamassassin/trunk/t/data/01_test_rules.cf
spamassassin/trunk/t/data/01_test_rules.pre
spamassassin/trunk/t/debug.t
Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/trunk/MANIFEST?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Wed Jun 26 14:59:45 2019
@@ -89,7 +89,6 @@ lib/Mail/SpamAssassin/Plugin/FromNameSpo
lib/Mail/SpamAssassin/Plugin/HashBL.pm
lib/Mail/SpamAssassin/Plugin/HTMLEval.pm
lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
-lib/Mail/SpamAssassin/Plugin/Hashcash.pm
lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
@@ -452,7 +451,6 @@ t/freemail.t
t/get_all_headers.t
t/get_headers.t
t/gtube.t
-t/hashcash.t
t/header_utf8.t
t/html_colors.t
t/html_obfu.t
Modified: spamassassin/trunk/UPGRADE
URL: http://svn.apache.org/viewvc/spamassassin/trunk/UPGRADE?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/UPGRADE (original)
+++ spamassassin/trunk/UPGRADE Wed Jun 26 14:59:45 2019
@@ -7,6 +7,9 @@ Note for Users Upgrading to SpamAssassin
This is to make sure all the legacy installations and wiki guides etc
still using it needlessly get fixed.
+- HashCash module and support has been removed completely, as it has been
+ long since deprecated
+
- TxRep and Awl plugins has been modified to be compatible
with latest Postgresql versions.
You should upgrade your sql database running the following command:
Modified: spamassassin/trunk/USAGE
URL: http://svn.apache.org/viewvc/spamassassin/trunk/USAGE?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/USAGE (original)
+++ spamassassin/trunk/USAGE Wed Jun 26 14:59:45 2019
@@ -113,15 +113,6 @@ Other Installation Notes
------------------------
- - Hashcash is a useful system; it requires that senders exercise a
- CPU-intensive task before they can send mail to you, so we give that
- some bonus points. However, it requires that you list what addresses
- you expect to receive mail for, by adding 'hashcash_accept' lines to
- your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf
- files. See the Mail::SpamAssassin::Plugin::Hashcash manual page for
- details on how to specify these.
-
-
- SpamAssassin now uses a temporary file in /tmp (or $TMPDIR, if that's
set in the environment) for Pyzor and DCC checks. Make sure that this
directory is either (a) not writable by other users, or (b) not shared
Modified: spamassassin/trunk/rules/30_text_de.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_de.cf?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_de.cf (original)
+++ spamassassin/trunk/rules/30_text_de.cf Wed Jun 26 14:59:45 2019
@@ -336,17 +336,6 @@ lang de describe USER_IN_WHITELIST_TO Em
lang de describe USER_IN_MORE_SPAM_TO Empfängeradresse soll fast alle (Spam-) Nachrichten erhalten
lang de describe USER_IN_ALL_SPAM_TO Empfängeradresse soll alle (Spam-) Nachrichten erhalten
-ifplugin Mail::SpamAssassin::Plugin::Hashcash
-lang de describe HASHCASH_20 Enthält korrekte Hashcash-Kennzeichnung (20 bits)
-lang de describe HASHCASH_21 Enthält korrekte Hashcash-Kennzeichnung (21 bits)
-lang de describe HASHCASH_22 Enthält korrekte Hashcash-Kennzeichnung (22 bits)
-lang de describe HASHCASH_23 Enthält korrekte Hashcash-Kennzeichnung (23 bits)
-lang de describe HASHCASH_24 Enthält korrekte Hashcash-Kennzeichnung (24 bits)
-lang de describe HASHCASH_25 Enthält korrekte Hashcash-Kennzeichnung (25 bits)
-lang de describe HASHCASH_HIGH Enthält korrekte Hashcash-Kennzeichnung (> 25 bits)
-lang de describe HASHCASH_2SPEND Hashcash-Markierung bereits in anderer Nachricht verwendet
-endif
-
ifplugin Mail::SpamAssassin::Plugin::SPF
lang de describe SPF_PASS SPF: Senderechner entspricht SPF-Datensatz
lang de describe SPF_FAIL SPF: Senderechner entspricht nicht SPF-Datensatz (fail)
Modified: spamassassin/trunk/rules/30_text_pt_br.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_pt_br.cf?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_pt_br.cf (original)
+++ spamassassin/trunk/rules/30_text_pt_br.cf Wed Jun 26 14:59:45 2019
@@ -522,18 +522,6 @@ lang pt_BR describe NML_ADSP_CUSTOM_LOW
lang pt_BR describe NML_ADSP_CUSTOM_MED ADSP custom_med foi atingida, e não foi de uma mailing list
lang pt_BR describe NML_ADSP_CUSTOM_HIGH ADSP custom_high foi atingida, e não foi de uma mailing list
-# 25_hashcash.cf
-ifplugin Mail::SpamAssassin::Plugin::Hashcash
-lang pt_BR describe HASHCASH_20 Contém um token Hashcash válido (20 bits)
-lang pt_BR describe HASHCASH_21 Contém um token Hashcash válido (21 bits)
-lang pt_BR describe HASHCASH_22 Contém um token Hashcash válido (22 bits)
-lang pt_BR describe HASHCASH_23 Contém um token Hashcash válido (23 bits)
-lang pt_BR describe HASHCASH_24 Contém um token Hashcash válido (24 bits)
-lang pt_BR describe HASHCASH_25 Contém um token Hashcash válido (25 bits)
-lang pt_BR describe HASHCASH_HIGH Contém um token Hashcash válido (>25 bits)
-lang pt_BR describe HASHCASH_2SPEND Token Hascash já foi usado em outro email
-endif
-
# 25_pyzor.cf
lang pt_BR describe PYZOR_CHECK Listado na Pyzor (https://pyzor.readthedocs.io/en/latest/)
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Wed Jun 26 14:59:45 2019
@@ -761,18 +761,6 @@ score DKIMDOMAIN_IN_DWL_UNKNOWN 0 -0.01
# </gen:mutable>
endif
-# Hashcash
-ifplugin Mail::SpamAssassin::Plugin::Hashcash
-score HASHCASH_20 -0.5
-score HASHCASH_21 -0.7
-score HASHCASH_22 -1.0
-score HASHCASH_23 -2.0
-score HASHCASH_24 -3.0
-score HASHCASH_25 -4.0
-score HASHCASH_HIGH -5.0
-score HASHCASH_2SPEND 0.1
-endif # Mail::SpamAssassin::Plugin::Hashcash
-
# SPF
# Note that the benefit for a valid SPF record is deliberately minimal; it's
# likely that more spammers would quickly move to setting valid SPF records
Modified: spamassassin/trunk/rules/init.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/init.pre?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/rules/init.pre (original)
+++ spamassassin/trunk/rules/init.pre Wed Jun 26 14:59:45 2019
@@ -26,10 +26,6 @@
#
loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
-# Hashcash - perform hashcash verification.
-#
-loadplugin Mail::SpamAssassin::Plugin::Hashcash
-
# SPF - perform SPF verification.
#
loadplugin Mail::SpamAssassin::Plugin::SPF
Modified: spamassassin/trunk/rulesrc/10_force_active.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/10_force_active.cf?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/10_force_active.cf (original)
+++ spamassassin/trunk/rulesrc/10_force_active.cf Wed Jun 26 14:59:45 2019
@@ -212,14 +212,6 @@ publish GAPPY_SUBJECT
publish GEO_QUERY_STRING
publish GTUBE
publish GUARANTEED_100_PERCENT
-publish HASHCASH_20
-publish HASHCASH_21
-publish HASHCASH_22
-publish HASHCASH_23
-publish HASHCASH_24
-publish HASHCASH_25
-publish HASHCASH_2SPEND
-publish HASHCASH_HIGH
publish HDR_ORDER_FTSDMCXX_001C
publish HDR_ORDER_FTSDMCXX_BAT
publish HEADER_COUNT_CTYPE
Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamassassin.raw?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Wed Jun 26 14:59:45 2019
@@ -870,9 +870,6 @@ from the SpamAssassin distribution.
Mail::SpamAssassin::Plugin
SpamAssassin plugin base class
- Mail::SpamAssassin::Plugin::Hashcash
- perform hashcash verification tests
-
Mail::SpamAssassin::Plugin::RelayCountry
add message metadata indicating the country code of each relay
Modified: spamassassin/trunk/t/all_modules.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/all_modules.t?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/t/all_modules.t (original)
+++ spamassassin/trunk/t/all_modules.t Wed Jun 26 14:59:45 2019
@@ -19,7 +19,6 @@ if (eval { require BSD::Resource; }) {
tstpre ("
loadplugin Mail::SpamAssassin::Plugin::RelayCountry
loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
-loadplugin Mail::SpamAssassin::Plugin::Hashcash
loadplugin Mail::SpamAssassin::Plugin::SPF
loadplugin Mail::SpamAssassin::Plugin::DCC
loadplugin Mail::SpamAssassin::Plugin::Pyzor
Modified: spamassassin/trunk/t/data/01_test_rules.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/01_test_rules.cf?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/t/data/01_test_rules.cf (original)
+++ spamassassin/trunk/t/data/01_test_rules.cf Wed Jun 26 14:59:45 2019
@@ -100,33 +100,6 @@ header TEST_MSGID_OUTLOOK_INVALID eva
describe TEST_MSGID_OUTLOOK_INVALID Message-Id is fake (in Outlook Express format)
score TEST_MSGID_OUTLOOK_INVALID 5
-ifplugin Mail::SpamAssassin::Plugin::Hashcash
-header HASHCASH_20 eval:check_hashcash_value('20', '21')
-header HASHCASH_21 eval:check_hashcash_value('21', '22')
-header HASHCASH_22 eval:check_hashcash_value('22', '23')
-header HASHCASH_23 eval:check_hashcash_value('23', '24')
-header HASHCASH_24 eval:check_hashcash_value('24', '25')
-header HASHCASH_25 eval:check_hashcash_value('25', '26')
-header HASHCASH_HIGH eval:check_hashcash_value('26', '9999')
-tflags HASHCASH_20 nice userconf
-tflags HASHCASH_21 nice userconf
-tflags HASHCASH_22 nice userconf
-tflags HASHCASH_23 nice userconf
-tflags HASHCASH_24 nice userconf
-tflags HASHCASH_25 nice userconf
-tflags HASHCASH_HIGH nice userconf
-describe HASHCASH_20 Contains valid Hashcash token (20 bits)
-describe HASHCASH_21 Contains valid Hashcash token (21 bits)
-describe HASHCASH_22 Contains valid Hashcash token (22 bits)
-describe HASHCASH_23 Contains valid Hashcash token (23 bits)
-describe HASHCASH_24 Contains valid Hashcash token (24 bits)
-describe HASHCASH_25 Contains valid Hashcash token (25 bits)
-describe HASHCASH_HIGH Contains valid Hashcash token (>25 bits)
-header HASHCASH_2SPEND eval:check_hashcash_double_spend()
-describe HASHCASH_2SPEND Hashcash token already spent in another mail
-tflags HASHCASH_2SPEND userconf
-endif # Mail::SpamAssassin::Plugin::Hashcash
-
header MISSING_HB_SEP eval:check_msg_parse_flags('missing_head_body_separator')
describe MISSING_HB_SEP Missing blank line between message header and body
tflags MISSING_HB_SEP userconf
Modified: spamassassin/trunk/t/data/01_test_rules.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/01_test_rules.pre?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/t/data/01_test_rules.pre (original)
+++ spamassassin/trunk/t/data/01_test_rules.pre Wed Jun 26 14:59:45 2019
@@ -1,6 +1,5 @@
loadplugin Mail::SpamAssassin::Plugin::Check
loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
-loadplugin Mail::SpamAssassin::Plugin::Hashcash
loadplugin Mail::SpamAssassin::Plugin::SPF
loadplugin Mail::SpamAssassin::Plugin::AWL
loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
Modified: spamassassin/trunk/t/debug.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/debug.t?rev=1862148&r1=1862147&r2=1862148&view=diff
==============================================================================
--- spamassassin/trunk/t/debug.t (original)
+++ spamassassin/trunk/t/debug.t Wed Jun 26 14:59:45 2019
@@ -29,7 +29,7 @@ plan tests => 3;
my %facility = map( ($_, 1),
qw( accessdb archive-iterator async auto-whitelist bayes check config daemon
dcc dkim askdns dns eval generic https_http_mismatch facility FreeMail
- hashcash ident ignore info ldap learn locker log logger markup
+ ident ignore info ldap learn locker log logger markup
message metadata mimeheader netset plugin prefork progress pyzor razor2
received-header replacetags reporter rules rules-all spamd spf textcat
timing TxRep uri uridnsbl util ));