svn commit: r789807 - in /spamassassin/trunk: INSTALL lib/Mail/SpamAssassin/Util/DependencyInfo.pm

[jm...@apache.org]

Author: jm
Date: Tue Jun 30 15:55:52 2009
New Revision: 789807

URL: http://svn.apache.org/viewvc?rev=789807&view=rev
Log:
bug 5960: don't refer to now-obsoleted optional dependency modules (Mail::SPF::Query and Mail::DomainKeys)

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

Modified: spamassassin/trunk/INSTALL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/INSTALL?rev=789807&r1=789806&r2=789807&view=diff
==============================================================================
--- spamassassin/trunk/INSTALL (original)
+++ spamassassin/trunk/INSTALL Tue Jun 30 15:55:52 2009
@@ -276,21 +276,17 @@
     Used when manually reporting spam to SpamCop.
 
 
-  - Mail::SPF (from CPAN) or Mail::SPF::Query (from CPAN)
+  - Mail::SPF (from CPAN)
 
     Used to check DNS Sender Policy Framework (SPF) records to fight email
-    address forgery and make it easier to identify spams.
+    address forgery and make it easier to identify spams.  This module
+    makes Mail::SPF::Query obsolete.
 
-    Either of Mail::SPF or Mail::SPF::Query can be used but Mail::SPF is
-    preferred as it is the current reference implementation for RFC 4408.
+    Net::DNS version 0.58 or higher is required.
 
-    Net::DNS version 0.58 or higher is required to use Mail::SPF.
-    Net::DNS version 0.34 or higher is required to use Mail::SPF::Query.
-
-    If using Mail::SPF note that NetAddr::IP (required by Mail::SPF)
-    versions up to and including version 4.006 include a bug that will
-    slow down the entire perl interpreter.  NetAddr::IP version 4.007 or
-    later fixes this.
+    Note that NetAddr::IP (required by Mail::SPF) versions up to and
+    including version 4.006 include a bug that will slow down the entire
+    perl interpreter.  NetAddr::IP version 4.007 or later fixes this.
 
 
   - IP::Country::Fast (from CPAN)

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=789807&r1=789806&r2=789807&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Tue Jun 30 15:55:52 2009
@@ -91,15 +91,7 @@
   module => 'Mail::SPF',
   version => '0.00',
   desc => 'Used to check DNS Sender Policy Framework (SPF) records to fight email
-  address forgery and make it easier to identify spams.  (This is preferred
-  over Mail::SPF::Query.)',
-},
-{
-  module => 'Mail::SPF::Query',
-  version => '0.00',
-  desc => 'Used to check DNS Sender Policy Framework (SPF) records to fight email
-  address forgery and make it easier to identify spams.  (Mail::SPF is
-  preferred instead of this module.)',
+  address forgery and make it easier to identify spams.',
 },
 {
   module => 'IP::Country::Fast',
@@ -154,8 +146,7 @@
   version => '0.28',
   desc => 'If this module is installed, and you enable the DKIM plugin,
   SpamAssassin will perform DKIM lookups when a DKIM-Signature
-  header is present in the message headers.  (New versions of this module
-  support both DomainKeys and DKIM, rendering Mail::DomainKeys obsolete.)'
+  header is present in the message headers.'
 },
 {
   module => 'DBI',