Bug#766718: Argument "0.80_2" isn't numeric in numeric ge (>=) at /usr/share/perl5/Mail/SpamAssassin/Plugin/AskDNS.pm

[Noah Meyerhans]

Control: tags -1 - wontfix
Control: tags -1 + pending

Ok, in the interest of moving on from this bug and shipping a less
annoying jessie, I'll be uploading 3.4.0-4 containing the attached
patch. Will follow up with upstream later.

noah


Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/Dns.pm
===================================================================
--- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/Dns.pm        2014-02-07 
00:36:28.000000000 -0800
+++ spamassassin-3.4.0/lib/Mail/SpamAssassin/Dns.pm     2014-11-14 
13:38:27.515047348 -0800
@@ -511,14 +511,15 @@
 
   # Check version numbers - runtime check only
   if (defined $Net::DNS::VERSION) {
+    use version 0.77;
     if (am_running_on_windows()) {
-      if ($Net::DNS::VERSION < 0.46) {
+      if (version->parse($Net::DNS::VERSION) < version->parse('0.46')) {
        warn("dns: Net::DNS version is $Net::DNS::VERSION, but need 0.46 for 
Win32");
        return $IS_DNS_AVAILABLE;
       }
     }
     else {
-      if ($Net::DNS::VERSION < 0.34) {
+      if (version->parse($Net::DNS::VERSION) < version->parse('0.34')) {
        warn("dns: Net::DNS version is $Net::DNS::VERSION, but need 0.34");
        return $IS_DNS_AVAILABLE;
       }
Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
===================================================================
--- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/Plugin/AskDNS.pm      
2014-02-07 00:36:27.000000000 -0800
+++ spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm   2014-11-14 
14:07:51.671795329 -0800
@@ -211,7 +211,9 @@
 
   $self->set_config($sa_main->{conf});
 
-  $txtdata_can_provide_a_list = Net::DNS->VERSION >= 0.69;
+  use version 0.77;
+  $txtdata_can_provide_a_list =
+      version->parse(Net::DNS->VERSION) >= version->parse('0.69');
 
   return $self;
 }

signature.asc
Description: Digital signature