You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/02/15 20:07:18 UTC
svn commit: r508081 - in /spamassassin/trunk: INSTALL
lib/Mail/SpamAssassin/Plugin/DKIM.pm
lib/Mail/SpamAssassin/Plugin/DomainKeys.pm rules/v310.pre rules/v312.pre
Author: jm
Date: Thu Feb 15 11:07:18 2007
New Revision: 508081
URL: http://svn.apache.org/viewvc?view=rev&rev=508081
Log:
bug 5330: document that Mail::DKIM 0.20 will perform DomainKeys lookups automatically, as well as DKIM ones
Modified:
spamassassin/trunk/INSTALL
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm
spamassassin/trunk/rules/v310.pre
spamassassin/trunk/rules/v312.pre
Modified: spamassassin/trunk/INSTALL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/INSTALL?view=diff&rev=508081&r1=508080&r2=508081
==============================================================================
--- spamassassin/trunk/INSTALL (original)
+++ spamassassin/trunk/INSTALL Thu Feb 15 11:07:18 2007
@@ -326,21 +326,29 @@
more precisely.
+ - Mail::DKIM (from CPAN)
+
+ 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. If Mail::DKIM version 0.20 or later
+ is installed, this will also perform Domain Key lookups on
+ DomainKey-Signature headers, without requiring the Mail::DomainKeys
+ module.
+
+ Note that the Mail::DKIM module in turn requres the OpenSSL libraries.
+
+
- Mail::DomainKeys (from CPAN)
If this module is installed, and you enable the DomainKeys plugin,
SpamAssassin will perform Domain Key lookups when Domain Key
- information is present in the message headers. Note that the
- Mail::DomainKeys module in turn requres the OpenSSL libraries and the
- CPAN module Crypt::OpenSSL::Bignum.
+ information is present in the message headers.
-
- - Mail::DKIM (from CPAN)
-
- 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. Note that the Mail::DKIM module in
- turn requres the OpenSSL libraries.
+ Note that Mail::DKIM version 0.20 or later will perform Domain Key
+ lookups, so this may be redundant.
+
+ Note that the Mail::DomainKeys module in turn requres the OpenSSL
+ libraries and the CPAN module Crypt::OpenSSL::Bignum.
- DBI *and* DBD driver/modules for your database (from CPAN)
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm?view=diff&rev=508081&r1=508080&r2=508081
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Thu Feb 15 11:07:18 2007
@@ -36,6 +36,9 @@
It requires the C<Mail::DKIM> CPAN module to operate. Many thanks to Jason Long
for that module.
+Note that if C<Mail::DKIM> version 0.20 or later is installed, this plugin will
+also perform Domain Key lookups on DomainKey-Signature headers.
+
=head1 SEE ALSO
C<Mail::DKIM>, C<Mail::SpamAssassin::Plugin>
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm?view=diff&rev=508081&r1=508080&r2=508081
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm Thu Feb 15 11:07:18 2007
@@ -48,6 +48,10 @@
This is the DomainKeys plugin and it needs lots more documentation.
+Note that if the C<Mail::SpamAssassin::Plugin::DKIM> plugin is installed with
+C<Mail::DKIM> version 0.20 or later, that plugin will also perform Domain Key
+lookups on DomainKey-Signature headers, in which case this plugin is redundant.
+
=cut
package Mail::SpamAssassin::Plugin::DomainKeys;
Modified: spamassassin/trunk/rules/v310.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/v310.pre?view=diff&rev=508081&r1=508080&r2=508081
==============================================================================
--- spamassassin/trunk/rules/v310.pre (original)
+++ spamassassin/trunk/rules/v310.pre Thu Feb 15 11:07:18 2007
@@ -61,6 +61,7 @@
# DomainKeys - perform DomainKeys verification
#
# External modules required for use, see INSTALL for more information.
+# Note that this may be redundant if you also plan to use the DKIM plugin.
#
#loadplugin Mail::SpamAssassin::Plugin::DomainKeys
Modified: spamassassin/trunk/rules/v312.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/v312.pre?view=diff&rev=508081&r1=508080&r2=508081
==============================================================================
--- spamassassin/trunk/rules/v312.pre (original)
+++ spamassassin/trunk/rules/v312.pre Thu Feb 15 11:07:18 2007
@@ -17,6 +17,9 @@
# DKIM - perform DKIM verification
#
# Mail::DKIM module required for use, see INSTALL for more information.
+#
+# Note that if C<Mail::DKIM> version 0.20 or later is installed, this
+# renders the DomainKeys plugin redundant.
#
#loadplugin Mail::SpamAssassin::Plugin::DKIM