svn commit: r1603304 - in /spamassassin/trunk: Makefile.PL lib/Mail/SpamAssassin/Util/DependencyInfo.pm

[km...@apache.org]

Author: kmcgrail
Date: Tue Jun 17 22:49:09 2014
New Revision: 1603304

URL: http://svn.apache.org/r1603304
Log:
Moved Net::DNS::Nameserver to optional since it is just use in make test - Bug 7052

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

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=1603304&r1=1603303&r2=1603304&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Tue Jun 17 22:49:09 2014
@@ -186,7 +186,6 @@ my %makefile = (
         'IO::Zlib'             => 1.04,          # for sa-update
         'Mail::DKIM'           => 0.31,
         'Net::DNS'             => (RUNNING_ON_WINDOWS ? 0.46 : 0.34), # bugs in older revs
-	'Net::DNS::Nameserver' => 0,
         'NetAddr::IP'          => 4.010,
         'Sys::Hostname'        => 0,
         'Time::HiRes'          => 0,

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1603304&r1=1603303&r2=1603304&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Tue Jun 17 22:49:09 2014
@@ -72,13 +72,6 @@ $have_sha1 ? {
   - version 0.46 or higher on Windows systems',
 },
 {
-  module => 'Net::DNS::Nameserver',
-  version => 0,
-  desc => 'Net::DNS:Nameserver is typically part of Net::DNS.  However, RHEL/
-  CentOS systems may install it using separate packages.  Because of this, we
-  check for both Net::DNS and Net::DNS::Nameserver.',
-},
-{
   'module' => 'NetAddr::IP',
   'version' => '4.010',
   'desc' => "Used in determining which DNS tests are to be done for each of
@@ -261,6 +254,14 @@ $have_sha ? {
   specifying more specific subnets (longest netmask) first, followed by
   wider subnets ensures predictable results.',
 },
+{
+  module => 'Net::DNS::Nameserver',
+  version => 0,
+  desc => 'Net::DNS:Nameserver is typically part of Net::DNS.  However, RHEL/
+  CentOS systems may install it using separate packages.  Because of this, we
+  check for both Net::DNS and Net::DNS::Nameserver.  However, 
+  Net::DNS::Nameserver is only used in make test as of June 2014.',
+},
 );
 
 my @BINARIES = ();