diff --git a/Net-Ping-2.74-Disable-all-network-tests-in-200_ping_tcp.patch b/Net-Ping-2.74-Disable-all-network-tests-in-200_ping_tcp.patch deleted file mode 100644 index 0dec4051f8ea0a361a9ef1747b08b52125d3b332..0000000000000000000000000000000000000000 --- a/Net-Ping-2.74-Disable-all-network-tests-in-200_ping_tcp.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up Net-Ping-2.74/t/200_ping_tcp.t.orig Net-Ping-2.74/t/200_ping_tcp.t ---- Net-Ping-2.74/t/200_ping_tcp.t.orig 2020-12-03 12:50:50.645715613 +0100 -+++ Net-Ping-2.74/t/200_ping_tcp.t 2020-12-03 12:53:14.305039861 +0100 -@@ -1,8 +1,8 @@ - use strict; - - BEGIN { -- if ($ENV{PERL_CORE}) { -- unless ($ENV{PERL_TEST_Net_Ping}) { -+ if ($ENV{NO_NETWORK_TESTING} || -+ ($ENV{PERL_CORE} && !$ENV{PERL_TEST_Net_Ping})) { - print "1..0 # Skip: network dependent test\n"; - exit; - } diff --git a/Net-Ping-2.74-Disable-all-network-tests-with-NO_NETWORK_TESTING-1.patch b/Net-Ping-2.74-Disable-all-network-tests-with-NO_NETWORK_TESTING-1.patch deleted file mode 100644 index 05c71aa88344b4acb98c503155aaa2a9702d9787..0000000000000000000000000000000000000000 --- a/Net-Ping-2.74-Disable-all-network-tests-with-NO_NETWORK_TESTING-1.patch +++ /dev/null @@ -1,143 +0,0 @@ -From ab3c25e921e15aa2923d509a9317610a1e9f1d4e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 18 Nov 2020 08:42:00 +0100 -Subject: [PATCH 2/2] Disable all network tests with NO_NETWORK_TESTING=1 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If a host cannot resolve the host names, the tests fail like: - -getaddrinfo(www.google.com.,,AF_INET) failed - Temporary failure in name resolution at /builddir/build/BUILD/Net-Ping-2.74/blib/lib/Net/Ping.pm line 1925. - -The tests recommend setting PERL_CORE=1, but PERL_CORE has a different -meaning. - -This patch recognizes a NO_NETWORK_TESTING environment variable to -skip non-localhost tests. This is alike to Test::RequiresInternet. The -patch also coerces the remaining tests to use loopback addresses -instead. - -Signed-off-by: Petr Písař ---- - t/400_ping_syn.t | 11 +++++------ - t/410_syn_host.t | 11 +++++------ - t/420_ping_syn_port.t | 11 +++++------ - t/500_ping_icmp.t | 1 + - t/501_ping_icmpv6.t | 1 + - 5 files changed, 17 insertions(+), 18 deletions(-) - -diff --git a/t/400_ping_syn.t b/t/400_ping_syn.t -index 8409aae..4e22e7c 100644 ---- a/t/400_ping_syn.t -+++ b/t/400_ping_syn.t -@@ -1,11 +1,10 @@ - use strict; - - BEGIN { -- if ($ENV{PERL_CORE}) { -- unless ($ENV{PERL_TEST_Net_Ping}) { -- print "1..0 # Skip: network dependent test\n"; -- exit; -- } -+ if ($ENV{NO_NETWORK_TESTING} || -+ ($ENV{PERL_CORE} && !$ENV{PERL_TEST_Net_Ping})) { -+ print "1..0 # Skip: network dependent test\n"; -+ exit; - } - unless (eval "require Socket") { - print "1..0 \# Skip: no Socket\n"; -@@ -30,7 +29,7 @@ BEGIN { - # connection to remote networks, but you still want the tests - # to pass, use the following: - # --# $ PERL_CORE=1 make test -+# $ NO_NETWORK_TESTING=1 make test - - # Hopefully this is never a routeable host - my $fail_ip = $ENV{NET_PING_FAIL_IP} || "192.0.2.0"; -diff --git a/t/410_syn_host.t b/t/410_syn_host.t -index 15948e2..5d58bda 100644 ---- a/t/410_syn_host.t -+++ b/t/410_syn_host.t -@@ -2,11 +2,10 @@ - use strict; - - BEGIN { -- if ($ENV{PERL_CORE}) { -- unless ($ENV{PERL_TEST_Net_Ping}) { -- print "1..0 # Skip: network dependent test\n"; -- exit; -- } -+ if ($ENV{NO_NETWORK_TESTING} || -+ ($ENV{PERL_CORE} && !$ENV{PERL_TEST_Net_Ping})) { -+ print "1..0 # Skip: network dependent test\n"; -+ exit; - } - unless (eval "require Socket") { - print "1..0 \# Skip: no Socket\n"; -@@ -31,7 +30,7 @@ BEGIN { - # connection to remote networks, but you still want the tests - # to pass, use the following: - # --# $ PERL_CORE=1 make test -+# $ NO_NETWORK_TESTING=1 make test - - # Try a few remote servers - my %webs; -diff --git a/t/420_ping_syn_port.t b/t/420_ping_syn_port.t -index 53c153f..6b8d19a 100644 ---- a/t/420_ping_syn_port.t -+++ b/t/420_ping_syn_port.t -@@ -2,11 +2,10 @@ - use strict; - - BEGIN { -- if ($ENV{PERL_CORE}) { -- unless ($ENV{PERL_TEST_Net_Ping}) { -- print "1..0 # Skip: network dependent test\n"; -- exit; -- } -+ if ($ENV{NO_NETWORK_TESTING} || -+ ($ENV{PERL_CORE} && !$ENV{PERL_TEST_Net_Ping})) { -+ print "1..0 # Skip: network dependent test\n"; -+ exit; - } - unless (eval "require Socket") { - print "1..0 \# Skip: no Socket\n"; -@@ -31,7 +30,7 @@ BEGIN { - # connection to remote networks, but you still want the tests - # to pass, use the following: - # --# $ PERL_CORE=1 make test -+# $ NO_NETWORK_TESTING=1 make test - - # Hopefully this is never a routeable host - my $fail_ip = $ENV{NET_PING_FAIL_IP} || "192.0.2.0"; -diff --git a/t/500_ping_icmp.t b/t/500_ping_icmp.t -index dea6588..7e45cc4 100644 ---- a/t/500_ping_icmp.t -+++ b/t/500_ping_icmp.t -@@ -19,6 +19,7 @@ BEGIN { - } - - my $is_devel = $ENV{PERL_CORE} || -d ".git" ? 1 : 0; -+$ENV{TEST_PING_HOST} = "127.0.0.1" if $ENV{NO_NETWORK_TESTING}; - # Note this rawsocket test code is considered anti-social in p5p and was removed in - # their variant. - # See http://nntp.perl.org/group/perl.perl5.porters/240707 -diff --git a/t/501_ping_icmpv6.t b/t/501_ping_icmpv6.t -index 165824f..9b5b8b8 100644 ---- a/t/501_ping_icmpv6.t -+++ b/t/501_ping_icmpv6.t -@@ -19,6 +19,7 @@ BEGIN { - } - - my $is_devel = $ENV{PERL_CORE} || -d ".git" ? 1 : 0; -+$ENV{TEST_PING6_HOST} = "::1" if $ENV{NO_NETWORK_TESTING}; - if (!Net::Ping::_isroot()) { - my $file = __FILE__; - my $lib = $ENV{PERL_CORE} ? '-I../../lib' : '-Mblib'; --- -2.25.4 - diff --git a/Net-Ping-2.74-Use-non-routable-addreses-for-negative-tests.patch b/Net-Ping-2.74-Use-non-routable-addreses-for-negative-tests.patch deleted file mode 100644 index 058ce6c61d472c6a97b0e52b8bb5d7cf010d3baa..0000000000000000000000000000000000000000 --- a/Net-Ping-2.74-Use-non-routable-addreses-for-negative-tests.patch +++ /dev/null @@ -1,102 +0,0 @@ -From a42c6588e33a1d6d847b60ef3386bfd122ce030b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 18 Nov 2020 09:49:48 +0100 -Subject: [PATCH 1/2] Use non-routable addreses for negative tests -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This patch uses the addresses reserved for a documentation purpose -which should be unroutable instead of just a random address. - -Signed-off-by: Petr Písař ---- - t/190_alarm.t | 2 +- - t/200_ping_tcp.t | 2 +- - t/400_ping_syn.t | 2 +- - t/410_syn_host.t | 2 +- - t/420_ping_syn_port.t | 2 +- - t/501_ping_icmpv6.t | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/t/190_alarm.t b/t/190_alarm.t -index 65276a2..f86305c 100644 ---- a/t/190_alarm.t -+++ b/t/190_alarm.t -@@ -29,7 +29,7 @@ use Test::More tests => 6; - BEGIN {use_ok 'Net::Ping'}; - - # Hopefully this is never a routeable host --my $fail_ip = $ENV{NET_PING_FAIL_IP} || "172.29.249.249"; -+my $fail_ip = $ENV{NET_PING_FAIL_IP} || "192.0.2.0"; - - eval { - my $timeout = 11; -diff --git a/t/200_ping_tcp.t b/t/200_ping_tcp.t -index e2bfe18..8e8f56d 100644 ---- a/t/200_ping_tcp.t -+++ b/t/200_ping_tcp.t -@@ -18,7 +18,7 @@ BEGIN { - } - - # Hopefully this is never a routeable host --my $fail_ip = $ENV{NET_PING_FAIL_IP} || "172.29.249.249"; -+my $fail_ip = $ENV{NET_PING_FAIL_IP} || "192.0.2.0"; - - # Remote network test using tcp protocol. - # -diff --git a/t/400_ping_syn.t b/t/400_ping_syn.t -index 1ccec9f..8409aae 100644 ---- a/t/400_ping_syn.t -+++ b/t/400_ping_syn.t -@@ -33,7 +33,7 @@ BEGIN { - # $ PERL_CORE=1 make test - - # Hopefully this is never a routeable host --my $fail_ip = $ENV{NET_PING_FAIL_IP} || "172.29.249.249"; -+my $fail_ip = $ENV{NET_PING_FAIL_IP} || "192.0.2.0"; - - # Try a few remote servers - my %webs = ( -diff --git a/t/410_syn_host.t b/t/410_syn_host.t -index d84a7eb..15948e2 100644 ---- a/t/410_syn_host.t -+++ b/t/410_syn_host.t -@@ -37,7 +37,7 @@ BEGIN { - my %webs; - BEGIN { - # Hopefully this is never a routeable host -- my $fail_ip = $ENV{NET_PING_FAIL_IP} || "172.29.249.249"; -+ my $fail_ip = $ENV{NET_PING_FAIL_IP} || "192.0.2.0"; - - %webs = ( - $fail_ip => 0, -diff --git a/t/420_ping_syn_port.t b/t/420_ping_syn_port.t -index 55ee88a..53c153f 100644 ---- a/t/420_ping_syn_port.t -+++ b/t/420_ping_syn_port.t -@@ -34,7 +34,7 @@ BEGIN { - # $ PERL_CORE=1 make test - - # Hopefully this is never a routeable host --my $fail_ip = $ENV{NET_PING_FAIL_IP} || "172.29.249.249"; -+my $fail_ip = $ENV{NET_PING_FAIL_IP} || "192.0.2.0"; - - # Try a few remote servers - my %webs; -diff --git a/t/501_ping_icmpv6.t b/t/501_ping_icmpv6.t -index 3d2b789..165824f 100644 ---- a/t/501_ping_icmpv6.t -+++ b/t/501_ping_icmpv6.t -@@ -59,7 +59,7 @@ SKIP: { - my $rightip = "2001:4860:4860::8888"; # pingable ip of google's dnsserver - # for a firewalled ipv6 network try an optional local ipv6 host - $rightip = $ENV{TEST_PING6_HOST} if $ENV{TEST_PING6_HOST}; -- my $wrongip = "2001:4860:4860::1234"; # non existing ip -+ my $wrongip = "2001:db8::"; # non existing ip - # diag "Pinging existing IPv6 "; - my $result = $p->ping($rightip); - if ($result == 1) { --- -2.25.4 - diff --git a/Net-Ping-2.74.tar.gz b/Net-Ping-2.74.tar.gz deleted file mode 100644 index 517147a8c696b4b28e034916fd40415f2d270aa5..0000000000000000000000000000000000000000 Binary files a/Net-Ping-2.74.tar.gz and /dev/null differ diff --git a/Net-Ping-2.75.tar.gz b/Net-Ping-2.75.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..65cca947c6396384152d0d29bbbc344fef5c24ee Binary files /dev/null and b/Net-Ping-2.75.tar.gz differ diff --git a/perl-Net-Ping.spec b/perl-Net-Ping.spec index dc6461dba26cc90d09271ea691cf3faa9053648c..851589b293752a6c5a519220f290e60868bff296 100644 --- a/perl-Net-Ping.spec +++ b/perl-Net-Ping.spec @@ -1,17 +1,13 @@ -%define anolis_release 2 +%define anolis_release 1 %bcond_with perl_Net_Ping_enables_optional_test Name: perl-Net-Ping -Version: 2.74 +Version: 2.75 Release: %{anolis_release}%{?dist} Summary: Check a remote host for reachability License: GPL+ or Artistic URL: https://metacpan.org/release/Net-Ping/ Source0: https://cpan.metacpan.org/authors/id/R/RU/RURBAN/Net-Ping-%{version}.tar.gz -# Improve tests that need the Internet -Patch0: Net-Ping-2.74-Use-non-routable-addreses-for-negative-tests.patch -Patch1: Net-Ping-2.74-Disable-all-network-tests-with-NO_NETWORK_TESTING-1.patch -Patch2: Net-Ping-2.74-Disable-all-network-tests-in-200_ping_tcp.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: make @@ -53,7 +49,6 @@ BuildRequires: perl(IO::Socket) BuildRequires: perl(Test::Pod) >= 1.22 # Test::Pod::Coverage not used %endif -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(IO::Socket::INET) # Keep Net::Ping::External optional Suggests: perl(Net::Ping::External) @@ -63,11 +58,16 @@ Conflicts: perl < 4:5.22.0-350 Net::Ping module contains methods to test the reachability of remote hosts on a network. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %prep %setup -q -n Net-Ping-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build unset PERL_CORE @@ -85,11 +85,17 @@ export NO_NETWORK_TESTING=1 make test %files -%doc Changes README TODO %{perl_vendorlib}/* %{_mandir}/man3/* +%files doc +%doc Changes README TODO + %changelog +* Mon Feb 06 2023 mgb01105731 - 2.75-1 +- remove versioned MODULE_COMPAT_ requires +- update to version 2.75 + * Mon Jan 30 2023 Chunmei Xu - 2.74-2 - rebuild with perl 5.36.0