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

[km...@apache.org]

Author: kmcgrail
Date: Thu Jan  3 20:41:13 2013
New Revision: 1428581

URL: http://svn.apache.org/viewvc?rev=1428581&view=rev
Log:
Documentation in INSTALL and DependencyInfo.pm because sa-update now uses binaries before LWP for better ipv6 support - bug 6655

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=1428581&r1=1428580&r2=1428581&view=diff
==============================================================================
--- spamassassin/trunk/INSTALL (original)
+++ spamassassin/trunk/INSTALL Thu Jan  3 20:41:13 2013
@@ -89,6 +89,10 @@ http://wiki.apache.org/spamassassin/Sing
    See the "Installing Rules" section below if you do not wish to download
    the rules directly from the internet.
 
+   NOTE: Because LWP does not support IPv6, sa-update as of 3.4.0 will use
+   the binaries curl, wget or fetch to download rule updates with LWP used 
+   as a fallback if none of the binaries exist.
+
 5. If you already use procmail, skip to step 7.  If not, ensure procmail
    is installed using "which procmail" or install it from www.procmail.org.
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1428581&r1=1428580&r2=1428581&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Thu Jan  3 20:41:13 2013
@@ -258,6 +258,10 @@ $have_sha ? {
 
 my @BINARIES = ();
 
+my $lwp_note = "   Because LWP does not support IPv6, sa-update as of 3.4.0 will use
+   the binaries curl, wget or fetch to download rule updates with LWP used 
+   as a fallback if none of the binaries exist.";
+
 my @OPTIONAL_BINARIES = (
 {
   binary => 'gpg',
@@ -268,6 +272,23 @@ my @OPTIONAL_BINARIES = (
   desc => 'The "sa-update" program requires this executable to verify  
   encryption signatures.  It is not recommended, but you can use 
   "sa-update" with the --no-gpg to skip the verification. ',
+},
+{
+  binary => 'wget',
+  version => '0',
+  recommended_min_version => '1.8.2',
+  version_check_params => '--version',
+  version_check_regex => 'Gnu Wget ([\d\.]*)',
+  desc => $lwp_note,
+},
+
+# I DO NOT HAVE FETCH TO CHECK.
+{
+  binary => 'fetch',
+  version => '0',
+  version_check_params => '--version',
+  version_check_regex => 'fetch ([\d\.]*)',
+  desc => $lwp_note,
 }
 );