From 2262100fb39a021efd843c77deffb1c311c546d2 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 3 Dec 2020 13:06:17 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/perl-Net-Ping.git#8e86c060cf4eafdbb049fc5f7f57e1a2ffbfbdb0 --- ...Disable-all-network-tests-in-200_ping_tcp.patch | 14 ++++++++++++++ perl-Net-Ping.spec | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 Net-Ping-2.74-Disable-all-network-tests-in-200_ping_tcp.patch 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 new file mode 100644 index 0000000..0dec405 --- /dev/null +++ b/Net-Ping-2.74-Disable-all-network-tests-in-200_ping_tcp.patch @@ -0,0 +1,14 @@ +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/perl-Net-Ping.spec b/perl-Net-Ping.spec index 9a1c8f1..fa254fa 100644 --- a/perl-Net-Ping.spec +++ b/perl-Net-Ping.spec @@ -1,6 +1,6 @@ Name: perl-Net-Ping Version: 2.74 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Check a remote host for reachability License: GPL+ or Artistic URL: https://metacpan.org/release/Net-Ping/ @@ -11,6 +11,8 @@ Patch0: Net-Ping-2.74-Use-non-routable-addreses-for-negative-tests.patch # Disable Internet tests with NO_NETWORK_TESTING, bug #1898132, # proposed to the upstream, Patch1: Net-Ping-2.74-Disable-all-network-tests-with-NO_NETWORK_TESTING-1.patch +# Disable Internet tests in 200_ping_tcp, bug #1903747 +Patch2: Net-Ping-2.74-Disable-all-network-tests-in-200_ping_tcp.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: make @@ -64,6 +66,7 @@ a network. %setup -q -n Net-Ping-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build unset PERL_CORE @@ -86,5 +89,8 @@ make test %{_mandir}/man3/* %changelog +* Thu Dec 03 2020 Jitka Plesnikova - 2.74-2 +- Disable network tests in 200_tcp_ping + * Mon Nov 16 2020 Petr Pisar 2.74-1 - Specfile autogenerated by cpanspec 1.78.