[Bug 2620] Use version.pm for checking version numbers in NTP::Util

bk: 53b61b9etGUSRPObI-FYTStlmefRrw

diff --git a/ChangeLog b/ChangeLog
index f3657b314e23ec772e0432e2fd81250d55f72af1..16d302258209c21d92795527ac3b4a29a7bcf9db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2620] Use version.pm for checking version numbers in NTP::Util.
 (4.2.7p446) 2014/06/28 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2597] leap file processing -- loose ends.
 * [Bug 2614] use 'unsigned long' consistently in ntp_random.c

diff --git a/scripts/lib/NTP/Util.pm b/scripts/lib/NTP/Util.pm
index 31fa57514c81f0cfbbbaee605c265a9f542d5fab..66f2453bf0cfd9a80c4a9edb194db68f38dbedc3 100644 (file)
--- a/scripts/lib/NTP/Util.pm
+++ b/scripts/lib/NTP/Util.pm
@@ -3,6 +3,7 @@ use strict;
 use warnings;
 use Exporter 'import';
 use Carp;
+use version 0.77;
 
 our @EXPORT_OK = qw(ntp_read_vars do_dns ntp_peers ntp_sntp_line);
 
@@ -13,7 +14,7 @@ our $IP_AGNOSTIC;
 
 BEGIN {
     require Socket;
-    if ($Socket::VERSION >= 1.94) {
+    if (version->parse($Socket::VERSION) >= version->parse(1.94)) {
         Socket->import(qw(getaddrinfo getnameinfo SOCK_RAW AF_INET));
         $IP_AGNOSTIC = 1;
     }