Mailing List Archive

Author: sidney
Date: Fri Aug 12 15:48:45 2022
New Revision: 1903375

URL: http://svn.apache.org/viewvc?rev=1903375&view=rev
Log:
bug 7666 - Make declared module dependencies more accurate. Reduce noise in make_install.t, sa_compile.t on macOS

Modified:
spamassassin/trunk/INSTALL
spamassassin/trunk/Makefile.PL
spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm

Modified: spamassassin/trunk/INSTALL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/INSTALL?rev=1903375&r1=1903374&r2=1903375&view=diff
==============================================================================
--- spamassassin/trunk/INSTALL (original)
+++ spamassassin/trunk/INSTALL Fri Aug 12 15:48:45 2022
@@ -293,7 +293,7 @@ is too low for them to be used.
This module is highly recommended to increase the speed with which
Base64 encoded messages/mail parts are decoded.

- - Encode::Detect (from CPAN)
+ - Encode::Detect::Detector (from CPAN)

For proper detection of charsets and converting them into Unicode, you
will need to install this module.

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=1903375&r1=1903374&r2=1903375&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Fri Aug 12 15:48:45 2022
@@ -5,17 +5,11 @@ use strict;
use warnings;
use Config;

-use ExtUtils::MakeMaker;
+use ExtUtils::MakeMaker 6.64;

# raising the version of makemaker to 6.64 to use TEST_REQUIRES
use constant MIN_MAKEMAKER_VERSION => 6.64;

-# avoid stupid 'Argument "6.30_01" isn't numeric in numeric ge (>=)' warnings;
-my $mm_version = eval $ExtUtils::MakeMaker::VERSION;
-if ($mm_version < MIN_MAKEMAKER_VERSION) {
- die "Apache SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v" . MIN_MAKEMAKER_VERSION;
-}
-
use constant RUNNING_ON_WINDOWS => ($^O =~ /^(mswin|dos|os2)/oi);
use constant HAS_DBI => eval { require DBI; };

@@ -187,10 +181,9 @@ my %makefile = (
'Archive::Tar' => 1.23, # for sa-update
'IO::Zlib' => 1.04, # for sa-update
'Mail::DKIM' => 0.31,
- 'Net::DNS' => (RUNNING_ON_WINDOWS ? 0.46 : 0.34), # bugs in older revs
+ 'Net::DNS' => 0.69,
'NetAddr::IP' => 4.010,
'Sys::Hostname' => 0,
- 'Test::More' => 0,
'Time::HiRes' => 0,
'Time::Local' => 0,
'Errno' => 0,
@@ -198,26 +191,18 @@ my %makefile = (

# In case MIN_MAKEMAKER_VERSION is greater than the version bundled in the core of MIN_PERL_VERSION
# use this to ensure CPAN will automatically upgrade MakeMaker if needed
+ 'BUILD_REQUIRES' => {
+ 'ExtUtils::MakeMaker' => MIN_MAKEMAKER_VERSION,
+ },
+
'CONFIGURE_REQUIRES' => {
'ExtUtils::MakeMaker' => MIN_MAKEMAKER_VERSION,
},

# The modules that are not core that are used in default tests
'TEST_REQUIRES' => {
- 'Archive::Zip' => 0,
- 'DBD::SQLite' => 0,
'Devel::Cycle' => 0,
- 'Email::Address::XS' => 0,
- 'Geo::IP' => 0,
- 'IO::String' => 0,
- 'IP::Country::DB_File' => 0,
- 'IP::Country::Fast' => 0,
- 'MaxMind::DB::Reader' => 0,
- 'Net::DNS::Nameserver' => 0,
- 'Net::CIDR::Lite' => 0,
- 'Net::LibIDN' => 0,
- 'Net::LibIDN2' => 0,
- 'Net::Patricia' => 0,
+ 'Test::More' => 0,
'Text::Diff' => 0,
'Perl::Critic::Policy::TestingAndDebugging::ProhibitNoStrict' => 0,
'Perl::Critic::Policy::Perlsecret' => 0,
@@ -225,7 +210,8 @@ my %makefile = (

'dist' => {
COMPRESS => 'gzip -9f',
- SUFFIX => 'gz',
+ SUFFIX => '.gz',
+ TARFLAGS => 'cf',
DIST_DEFAULT => 'tardist',

CI => 'svn commit',
@@ -388,25 +374,41 @@ $makefile{META_MERGE} = {
MailingList => 'http://wiki.apache.org/spamassassin/MailingLists',
},

- recommends => {
- 'MIME::Base64' => 0,
- 'DB_File' => 0,
- 'Net::SMTP' => 0,
- 'Mail::SPF' => 0,
- 'Geo::IP' => 0,
- 'Razor2::Client::Agent' => 2.61,
- 'Net::Ident' => 0,
- 'IO::Socket::INET6' => 0,
- 'IO::Socket::SSL' => 1.76,
- 'Compress::Zlib' => 0,
- 'Mail::DKIM' => 0.37,
- 'DBI' => 0,
- 'Getopt::Long' => 2.32,
- 'LWP::UserAgent' => 0,
- 'Archive::Tar' => 1.23,
- 'IO::Zlib' => 1.04,
- 'Encode::Detect' => 0
- }
+ prereqs => {
+ runtime => {
+ recommends => {
+ 'MIME::Base64' => 0,
+ 'DB_File' => 0,
+ 'Net::SMTP' => 0,
+ 'Net::LibIDN2' => 0,
+ 'Net::LibIDN' => 0,
+ 'Mail::SPF' => 0,
+ 'MaxMind::DB::Reader' => 0,
+ 'MaxMind::DB::Reader::XS' => 0,
+ 'Geo::IP' => 0,
+ 'IP::Country::DB_File' => 0,
+ 'IP::Country::Fast' => 0,
+ 'Razor2::Client::Agent' => 2.61,
+ 'IO::Socket::IP' => 0.09,
+ 'IO::Socket::INET6' => 0,
+ 'IO::Socket::SSL' => 1.76,
+ 'Compress::Zlib' => 0,
+ 'Mail::DKIM' => 0.37,
+ 'DBI' => 0,
+ 'DBD::SQLite' => 1.59,
+ 'LWP::UserAgent' => 0,
+ 'Encode::Detect::Detector' => 0,
+ 'Net::Patricia' => 1.16,
+ 'Net::CIDR::Lite' => 0,
+ 'Net::DNS::Nameserver' => 0,
+ 'BSD::Resource' => 0,
+ 'Archive::Zip' => 0,
+ 'IO::String' => 0,
+ 'Email::Address::XS' => 0,
+ 'Mail::DMARC' => 0,
+ },
+ },
+ },
};

#######################################################################
@@ -415,7 +417,7 @@ $makefile{META_MERGE} = {
$makefile{EXE_FILES} = [ values %{$makefile{EXE_FILES}} ];
$makefile{AUTHOR} =~ s/(<.+) at (.+>)/$1\@$2/;
WriteMakefile(%makefile);
-print "Makefile written by ExtUtils::MakeMaker $mm_version\n";
+print "Makefile written by ExtUtils::MakeMaker $ExtUtils::MakeMaker::VERSION\n";

#######################################################################


Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1903375&r1=1903374&r2=1903375&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Fri Aug 12 15:48:45 2022
@@ -170,6 +170,14 @@ our @OPTIONAL_MODULES = (
Country code based filtering.',
},
{
+ module => 'IP::Country::Fast',
+ version => 0,
+ desc => 'Used by the RelayCountry plugin (not enabled by default) to
+ determine the domain country codes of each relay in the path of an email.
+ Also used by the URILocalBL plugin (not enabled by default) to provide
+ Country code based filtering.',
+},
+{
module => 'Razor2::Client::Agent',
alt_name => 'Razor2',
version => '2.61',
@@ -237,6 +245,13 @@ our @OPTIONAL_MODULES = (
your database.',
},
{
+ module => 'DBD::SQLite',
+ version => 1.59,
+ desc => 'If you intend to use SpamAssassin with SQLite as the SQL database
+ backend for the DBI module, this is the DBD driver required. Version 1.59_01
+ or later is needed to provide SQLite 3.25.0 or later.',
+},
+{
module => 'LWP::UserAgent',
version => 0,
desc => 'The "sa-update" program can use this module to make HTTP requests.
@@ -385,14 +400,6 @@ problems.
sub debug_diagnostics {
my $out = "diag: perl platform: $] $^O\n";

-# # this avoids an unsightly warning due to a shortcoming of Net::Ident;
-# # "Net::Ident::_export_hooks() called too early to check prototype at
-# # /usr/share/perl5/Net/Ident.pm line 29." It only needs to be
-# # called here.
-# eval '
-# sub Net::Ident::_export_hooks;
-# ';
-
my $prefix = '';
foreach my $moddef (@MODULES, 'optional', @OPTIONAL_MODULES) {
if ($moddef eq 'optional') { $prefix = 'optional '; next; }