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 2018/11/01 08:41:36 UTC
svn commit: r1845409 - in /spamassassin/trunk: ./ lib/Mail/SpamAssassin/
lib/Mail/SpamAssassin/BayesStore/ lib/Mail/SpamAssassin/Plugin/
masses/corpora/ masses/rule-dev/ t/
Author: hege
Date: Thu Nov 1 08:41:35 2018
New Revision: 1845409
URL: http://svn.apache.org/viewvc?rev=1845409&view=rev
Log:
Cleanup module deps, remove Digest::SHA1 use
Modified:
spamassassin/trunk/INSTALL
spamassassin/trunk/Makefile.PL
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm
spamassassin/trunk/masses/corpora/fuzzy-hash-maildir
spamassassin/trunk/masses/rule-dev/seek-phrases-in-log
spamassassin/trunk/t/mimeparse.t
spamassassin/trunk/t/sha1.t
Modified: spamassassin/trunk/INSTALL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/INSTALL?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/INSTALL (original)
+++ spamassassin/trunk/INSTALL Thu Nov 1 08:41:35 2018
@@ -243,11 +243,7 @@ SpamAssassin build directory.
The list of required modules that do not ship with Perl and must be
installed:
- - Digest::SHA1 (from CPAN),
- or the newer Digest::SHA which is a perl base module since Perl 5.10.0
-
- The Digest::SHA1 module is used as a cryptographic hash for some
- tests and the Bayes subsystem if Digest::SHA module is not available.
+ - Digest::SHA1 (from CPAN)
An external perl module razor-agents-2.84 as used by a Razor2 plugin
seems to be the only remaining component depending on Digest::SHA1
@@ -289,11 +285,6 @@ installed:
Debian/Ubuntu: apt-get install libnetaddr-ip-perl
Fedora: yum install perl-NetAddr-IP
- - Time::HiRes (from CPAN)
-
- Used by asynchronous DNS lookups to operate timeouts with subsecond
- precision and to report processing times accurately.
-
- LWP (aka libwww-perl) (from CPAN)
This set of modules will include both the LWP::UserAgent and
@@ -305,19 +296,6 @@ installed:
Used by sa-update to deal with certain Date requests.
- - IO::Zlib (from CPAN)
-
- Used by sa-update to uncompress update archives.
- Version 1.04 or later is required.
-
- Fedora: yum install perl-IO-Zlib
-
- - Archive::Tar (from CPAN)
-
- Used by sa-update to expand update archives.
- Version 1.23 or later is required.
-
- Fedora: yum install perl-Archive-Tar
Optional Modules
Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Thu Nov 1 08:41:35 2018
@@ -182,7 +182,6 @@ my %makefile = (
# be quite explicit about this; afaik CPAN.pm is sensible using this
# also see CURRENT_PM below
'PREREQ_PM' => {
- 'Digest::SHA1' => 0, # 2.0 is oldest tested version
'File::Spec' => 0.8, # older versions lack some routines we need
'File::Copy' => 2.02, # this version is shipped with 5.005_03, the oldest version known to work
'Pod::Usage' => 1.10, # all versions prior to this do seem to be buggy
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm Thu Nov 1 08:41:35 2018
@@ -35,11 +35,7 @@ use Errno qw(EBADF);
#use Data::Dumper;
use File::Basename;
use File::Path;
-
-BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1) }
-}
+use Digest::SHA qw(sha1);
use Mail::SpamAssassin::BayesStore;
use Mail::SpamAssassin::Logger;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm Thu Nov 1 08:41:35 2018
@@ -27,11 +27,7 @@ use Errno qw(EBADF);
use File::Basename;
use File::Spec;
use File::Path;
-
-BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1) }
-}
+use Digest::SHA qw(sha1);
use Mail::SpamAssassin;
use Mail::SpamAssassin::Util qw(untaint_var am_running_on_windows);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm Thu Nov 1 08:41:35 2018
@@ -119,16 +119,12 @@ use warnings;
# use bytes;
use re 'taint';
use Errno qw(EBADF);
-use Mail::SpamAssassin::Util qw(untaint_var);
-use Mail::SpamAssassin::Timeout;
+use Digest::SHA qw(sha1);
-BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1) }
-}
-
-use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::BayesStore;
+use Mail::SpamAssassin::Logger;
+use Mail::SpamAssassin::Timeout;
+use Mail::SpamAssassin::Util qw(untaint_var);
use Mail::SpamAssassin::Util::TinyRedis;
our $VERSION = 0.09;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm Thu Nov 1 08:41:35 2018
@@ -32,11 +32,7 @@ use warnings;
# use bytes;
use re 'taint';
use Errno qw(EBADF);
-
-BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1) }
-}
+use Digest::SHA qw(sha1);
use Mail::SpamAssassin::BayesStore;
use Mail::SpamAssassin::Logger;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm Thu Nov 1 08:41:35 2018
@@ -46,10 +46,7 @@ use strict;
use warnings;
use re 'taint';
-BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1 sha1_hex); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1 sha1_hex) }
-}
+use Digest::SHA qw(sha1 sha1_hex);
use Mail::SpamAssassin;
use Mail::SpamAssassin::Message::Node;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Bayes.pm Thu Nov 1 08:41:35 2018
@@ -48,12 +48,8 @@ use warnings;
# use bytes;
use re 'taint';
-BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1 sha1_hex); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1 sha1_hex) }
-}
+use Digest::SHA qw(sha1 sha1_hex);
-use Mail::SpamAssassin;
use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::PerMsgStatus;
use Mail::SpamAssassin::Logger;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Hashcash.pm Thu Nov 1 08:41:35 2018
@@ -97,10 +97,7 @@ use Fcntl;
use File::Path;
use File::Basename;
-BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1) }
-}
+use Digest::SHA qw(sha1);
our @ISA = qw(Mail::SpamAssassin::Plugin);
Modified: spamassassin/trunk/masses/corpora/fuzzy-hash-maildir
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/corpora/fuzzy-hash-maildir?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/masses/corpora/fuzzy-hash-maildir (original)
+++ spamassassin/trunk/masses/corpora/fuzzy-hash-maildir Thu Nov 1 08:41:35 2018
@@ -14,11 +14,7 @@ my $hashes3 = { };
my $hashes4 = { };
use File::Find;
-
-BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1_base64); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_base64) }
-}
+use Digest::SHA qw(sha1_base64);
my @files = ();
foreach my $file (@ARGV) {
Modified: spamassassin/trunk/masses/rule-dev/seek-phrases-in-log
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-dev/seek-phrases-in-log?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-dev/seek-phrases-in-log (original)
+++ spamassassin/trunk/masses/rule-dev/seek-phrases-in-log Thu Nov 1 08:41:35 2018
@@ -48,11 +48,7 @@ use warnings;
use strict;
use Getopt::Long qw(:config no_ignore_case);
use Data::Dumper;
-
-BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1_base64); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_base64) }
-}
+use Digest::SHA qw(sha1_base64);
sub logmsg;
Modified: spamassassin/trunk/t/mimeparse.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/mimeparse.t?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/t/mimeparse.t (original)
+++ spamassassin/trunk/t/mimeparse.t Thu Nov 1 08:41:35 2018
@@ -20,11 +20,7 @@ use strict;
use Test::More tests => 33;
use Mail::SpamAssassin;
-
-BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) }
-}
+use Digest::SHA qw(sha1_hex);
my %files = (
"$prefix/t/data/nice/mime1" => [
Modified: spamassassin/trunk/t/sha1.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sha1.t?rev=1845409&r1=1845408&r2=1845409&view=diff
==============================================================================
--- spamassassin/trunk/t/sha1.t (original)
+++ spamassassin/trunk/t/sha1.t Thu Nov 1 08:41:35 2018
@@ -18,11 +18,7 @@ if (-e 'test_dir') { # runnin
use strict;
use Mail::SpamAssassin;
-
-BEGIN {
- eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 }
- or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) }
-}
+use Digest::SHA qw(sha1_hex);
use Test::More tests => 15;
@@ -30,7 +26,7 @@ sub try {
my ($data, $want) = @_;
if ($want ne sha1_hex($data)) {
- print "Digest::SHA(1) sha1 mismatch\n";
+ print "Digest::SHA sha1 mismatch\n";
return 0;
}
return 1;