mmartinec at apache
Nov 9, 2009, 10:02 AM
Post #1 of 1
(204 views)
Permalink
|
|
svn commit: r834162 - /spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
|
|
Author: mmartinec
Date: Mon Nov 9 18:02:22 2009
New Revision: 834162
URL: http://svn.apache.org/viewvc?rev=834162&view=rev
Log:
Bug 6200 cont'd: fixed DependencyInfo.pm
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=834162&r1=834161&r2=834162&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Mon Nov 9 18:02:22 2009
@@ -28,10 +28,16 @@
@MODULES @OPTIONAL_MODULES $EXIT_STATUS $WARNINGS
);
-my $have_sha = eval { require Digest::SHA };
+my $have_sha = eval { require Digest::SHA };
+my $have_sha1 = eval { require Digest::SHA1 };
@MODULES = (
-{
+$have_sha1 ? {
+ 'module' => 'Digest::SHA1',
+ 'version' => '0.00',
+ 'desc' => 'The Digest::SHA1 module is used as a cryptographic hash for some
+ tests and the Bayes subsystem. It is also required by the Razor2 plugin.',
+} : {
'module' => 'Digest::SHA',
'version' => '0.00',
'desc' => 'The Digest::SHA module is used as a cryptographic hash for some
@@ -76,12 +82,14 @@
);
my @OPTIONAL_MODULES = (
-{
+$have_sha ? {
'module' => 'Digest::SHA1',
'version' => '0.00',
- 'desc' => 'The Digest::SHA1 module can be used as a cryptographic hash for
- some tests and the Bayes subsystem if Digest::SHA is not available. It is
- also required by (unpatched) razor-agents-2.84 as used by a Razor2 plugin.',
+ 'desc' => 'The Digest::SHA1 module is required by the Razor2 plugin.',
+} : {
+ 'module' => 'Digest::SHA',
+ 'version' => '0.00',
+ 'desc' => 'The Digest::SHA module is required by the DKIM plugin.',
},
{
module => 'MIME::Base64',
|
