56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
From 11be1db5e0fa09188bb049cabd6568eb8bf56bbe Mon Sep 17 00:00:00 2001
|
|
From: Ali Abdallah <aabdallah@suse.de>
|
|
Date: Tue, 7 Dec 2021 18:12:22 +0100
|
|
Subject: [PATCH] Stabilize Socket::VERSION comparisons
|
|
|
|
This commit backports the following two upstream commits
|
|
|
|
80388908f57e7b64b2e72c9d0973aa796626d7c5: Stabilize Socket::VERSION
|
|
comparisons
|
|
52f5670577550d05bb914beaca6a81069f88bc3c: Fix Socket::VERSION evaluation
|
|
---
|
|
dist/Net-Ping/lib/Net/Ping.pm | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/dist/Net-Ping/lib/Net/Ping.pm b/dist/Net-Ping/lib/Net/Ping.pm
|
|
index 13cbe81..cb3d860 100644
|
|
--- a/dist/Net-Ping/lib/Net/Ping.pm
|
|
+++ b/dist/Net-Ping/lib/Net/Ping.pm
|
|
@@ -45,6 +45,7 @@ my $IPPROTO_IPV6 = eval { Socket::IPPROTO_IPV6() };
|
|
#my $IPV6_HOPLIMIT = eval { Socket::IPV6_HOPLIMIT() }; # ping6 -h 0-255
|
|
my $qr_family = qr/^(?:(?:(:?ip)?v?(?:4|6))|${\AF_INET}|$AF_INET6)$/;
|
|
my $qr_family4 = qr/^(?:(?:(:?ip)?v?4)|${\AF_INET})$/;
|
|
+my $Socket_VERSION = eval $Socket::VERSION;
|
|
|
|
if ($^O =~ /Win32/i) {
|
|
# Hack to avoid this Win32 spewage:
|
|
@@ -1798,7 +1799,7 @@ sub _resolv {
|
|
|
|
# address check
|
|
# new way
|
|
- if ($Socket::VERSION >= 1.94) {
|
|
+ if ($Socket_VERSION > 1.94) {
|
|
my %hints = (
|
|
family => $AF_UNSPEC,
|
|
protocol => IPPROTO_TCP,
|
|
@@ -1831,7 +1832,7 @@ sub _resolv {
|
|
|
|
# resolve
|
|
# new way
|
|
- if ($Socket::VERSION >= 1.94) {
|
|
+ if ($Socket_VERSION >= 1.94) {
|
|
my %hints = (
|
|
family => $family,
|
|
protocol => IPPROTO_TCP
|
|
@@ -1908,7 +1909,7 @@ sub _inet_ntoa {
|
|
) = @_;
|
|
|
|
my $ret;
|
|
- if ($Socket::VERSION >= 1.94) {
|
|
+ if ($Socket_VERSION >= 1.94) {
|
|
my ($err, $address) = Socket::getnameinfo($addr, $NI_NUMERICHOST);
|
|
if (defined($address)) {
|
|
$ret = $address;
|
|
--
|
|
2.26.2
|
|
|