You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2017/11/04 04:13:11 UTC
svn commit: r1814251 - in /spamassassin/branches/3.4: MANIFEST MANIFEST.SKIP
META.yml Makefile.PL lib/Mail/SpamAssassin/Util/DependencyInfo.pm
Author: kmcgrail
Date: Sat Nov 4 04:13:10 2017
New Revision: 1814251
URL: http://svn.apache.org/viewvc?rev=1814251&view=rev
Log:
Remove META.yml file from MANIFEST. It is added with make dist automatically. Added .gitignore and build/pga dir to MANIFEST.SKIP. Removed META.yml from svn, it is created from make dist. Requiring MakeMaker v6.17 to make. Cleaned up some meta file information. Set the minimum version for IO::Socket::SSL to 1.76.
Removed:
spamassassin/branches/3.4/META.yml
Modified:
spamassassin/branches/3.4/MANIFEST
spamassassin/branches/3.4/MANIFEST.SKIP
spamassassin/branches/3.4/Makefile.PL
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
Modified: spamassassin/branches/3.4/MANIFEST
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/MANIFEST?rev=1814251&r1=1814250&r2=1814251&view=diff
==============================================================================
--- spamassassin/branches/3.4/MANIFEST (original)
+++ spamassassin/branches/3.4/MANIFEST Sat Nov 4 04:13:10 2017
@@ -5,7 +5,6 @@ INSTALL.VMS
LICENSE
MANIFEST
MANIFEST.SKIP
-META.yml
Makefile.PL
NOTICE
PACKAGING
Modified: spamassassin/branches/3.4/MANIFEST.SKIP
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/MANIFEST.SKIP?rev=1814251&r1=1814250&r2=1814251&view=diff
==============================================================================
--- spamassassin/branches/3.4/MANIFEST.SKIP (original)
+++ spamassassin/branches/3.4/MANIFEST.SKIP Sat Nov 4 04:13:10 2017
@@ -10,6 +10,7 @@
\.pid$
\.so$
\.svn/
+\.gitignore$
\.swp$
\.tmp$
\.tst$
@@ -31,6 +32,7 @@
^build/replace_license_blocks$
^build/tag_.*$
^build/update_.*$
+^build/pga.*$
^debian/
^doc/
^lib/Mail/SpamAssassin/Plugin/NetCache\.pm$
Modified: spamassassin/branches/3.4/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/Makefile.PL?rev=1814251&r1=1814250&r2=1814251&view=diff
==============================================================================
--- spamassassin/branches/3.4/Makefile.PL (original)
+++ spamassassin/branches/3.4/Makefile.PL Sat Nov 4 04:13:10 2017
@@ -10,8 +10,9 @@ use ExtUtils::MakeMaker;
# avoid stupid 'Argument "6.30_01" isn't numeric in numeric ge (>=)' warnings;
my $mm_version = eval $ExtUtils::MakeMaker::VERSION;
-if ($mm_version < 6.17) {
- die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v6.17";
+# raising the version of makemaker to 6.46 per bug 6598 & 6131
+if ($mm_version < 6.46) {
+ die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v6.46";
}
use constant RUNNING_ON_WINDOWS => ($^O =~ /^(mswin|dos|os2)/oi);
@@ -235,7 +236,7 @@ my %makefile = (
},
'AUTHOR' => 'The Apache SpamAssassin Project <dev at spamassassin.apache.org>',
- 'ABSTRACT' => 'SpamAssassin is an extensible email filter which is used to identify spam',
+ 'ABSTRACT' => 'Apache SpamAssassin is an extensible email filter which is used to identify spam',
# We have only this Makefile.PL and this option keeps MakeMaker from
# asking all questions twice after a 'make dist*'.
@@ -312,7 +313,7 @@ $makefile{'macro'}{'CONTACT_ADDRESS'} =
print
'NOTE: settings for "make test" are now controlled using "t/config.dist".
-See that file if you wish to customise what tests are run, and how.
+See that file if you wish to customize what tests are run, and how.
';
@@ -333,15 +334,26 @@ foreach my $file (@FILES_THAT_MUST_EXIST
#######################################################################
-# bug 6131
-($mm_version >= 6.46) and $makefile{META_MERGE} = {
- license => 'apache',
+# See Bug 6131 & 6598 for changes to META_MERGE and increased requirement
+# for MakeMaker version
+#
+$makefile{META_MERGE} = {
+
+ 'meta-spec' => {
+ version => '2',
+ url => 'http://search.cpan.org/perldoc?CPAN::Meta::Spec',
+ },
+
+ license => 'apache_2_0',
resources => {
license => 'http://www.apache.org/licenses/LICENSE-2.0.html',
- homepage => 'http://spamassassin.apache.com/',
+ homepage => 'http://spamassassin.apache.org/',
bugtracker => 'https://issues.apache.org/SpamAssassin/',
- repository => 'http://svn.apache.org/repos/asf/spamassassin/',
+ repository => {
+ url=>'http://svn.apache.org/repos/asf/spamassassin/',
+ type=>'svn'
+ },
MailingList => 'http://wiki.apache.org/spamassassin/MailingLists',
},
@@ -354,7 +366,7 @@ foreach my $file (@FILES_THAT_MUST_EXIST
'Razor2::Client::Agent' => 2.61,
'Net::Ident' => 0,
'IO::Socket::INET6' => 0,
- 'IO::Socket::SSL' => 0,
+ 'IO::Socket::SSL' => 1.76,
'Compress::Zlib' => 0,
'Mail::DKIM' => 0.37,
'DBI' => 0,
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1814251&r1=1814250&r2=1814251&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Sat Nov 4 04:13:10 2017
@@ -179,7 +179,7 @@ my @OPTIONAL_MODULES = (
},
{
module => 'IO::Socket::SSL',
- version => 0,
+ version => 1.76,
desc => 'If you wish to use SSL encryption to communicate between spamc and
spamd (the --ssl option to spamd), you need to install this
module. (You will need the OpenSSL libraries and use the
@@ -268,7 +268,9 @@ my $lwp_note = " Sa-update will use cu
3.4.0 will use these standard programs to download rule updates
leaving LWP as a fallback if none of the programs are found.
- *IMPORTANT NOTE*: You only need one of these programs.";
+ *IMPORTANT NOTE*: You only need one of these programs
+ It's only a concern if you are warned about all 3
+ i.e. (curl, wget & fetch) missing";
my @OPTIONAL_BINARIES = (
{
@@ -309,7 +311,7 @@ my @OPTIONAL_BINARIES = (
binary => 're2c',
version => '0',
- desc => 'The "re2c" program used by sa-compile to compile rules
+ desc => 'The "re2c" program is used by sa-compile to compile rules
for regular expressions to speed up scanning.',
}
);