From 512bcd4b9a41caf9673e6d542d30d2bd3c472734 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2020 09:35:47 +0000
Subject: import perl-5.16.3-295.el7


---

diff --git a/SOURCES/perl-5.16.3-Catch-timeout-condition-while-doing-an-abort.patch b/SOURCES/perl-5.16.3-Catch-timeout-condition-while-doing-an-abort.patch
new file mode 100644
index 0000000..423540a
--- /dev/null
+++ b/SOURCES/perl-5.16.3-Catch-timeout-condition-while-doing-an-abort.patch
@@ -0,0 +1,33 @@
+From 94806970680d8f6dbb62a3ddb128aa8f5f9a6e15 Mon Sep 17 00:00:00 2001
+From: Graham Barr <gbarr@pobox.com>
+Date: Fri, 7 Sep 2018 16:37:02 +0200
+Subject: [PATCH] Catch timeout condition while doing an abort
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Petr Pisar: Ported to perl-5.16.3.
+
+CPAN RT#18504
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ cpan/libnet/Net/FTP/dataconn.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cpan/libnet/Net/FTP/dataconn.pm b/cpan/libnet/Net/FTP/dataconn.pm
+index e7645cb..bc6ba7f 100644
+--- a/cpan/libnet/Net/FTP/dataconn.pm
++++ b/cpan/libnet/Net/FTP/dataconn.pm
+@@ -63,7 +63,7 @@ sub close {
+ 
+   if (exists ${*$data}{'net_ftp_bytesread'} && !${*$data}{'net_ftp_eof'}) {
+     my $junk;
+-    $data->read($junk, 1, 0);
++    eval { local($SIG{__DIE__}); $data->read($junk, 1, 0) };
+     return $data->abort unless ${*$data}{'net_ftp_eof'};
+   }
+ 
+-- 
+2.14.4
+
diff --git a/SPECS/perl.spec b/SPECS/perl.spec
index ea94be5..bc6f0a6 100644
--- a/SPECS/perl.spec
+++ b/SPECS/perl.spec
@@ -31,7 +31,7 @@
 Name:           perl
 Version:        %{perl_version}
 # release number must be even higher, because dual-lived modules will be broken otherwise
-Release:        294%{?dist}
+Release:        295%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -179,6 +179,10 @@ Patch42:        perl-5.16.3-Fix-Math-BigInt-overload-warning.patch
 # RT#133204, in upstream after 5.29.0 - CVE-2018-18311
 Patch43:        perl-5.16.3-Perl_my_setenv-handle-integer-wrap.patch
 
+# Fix a spurious timeout in Net::FTP::close, bug #1626107, CPAN RT#18504,
+# fixed in perl-libnet-1.23
+Patch44:        perl-5.16.3-Catch-timeout-condition-while-doing-an-abort.patch
+
 # Update some of the bundled modules
 # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
 
@@ -1981,6 +1985,7 @@ tarball from perl.org.
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
+%patch44 -p1
 
 %if !%{defined perl_bootstrap}
 # Local patch tracking
@@ -2026,6 +2031,7 @@ perl -x patchlevel.h \
     'RHEL Patch41: Add SSL support to Net::SMTP (CPAN RT#93823) [4]' \
     'RHEL Patch42: Do not overload ".." in Math::BigInt (CPAN RT#80182)' \
     'RHEL Patch43: Fix CVE-2018-18311 Integer overflow leading to buffer overflow' \
+    'RHEL Patch44: Fix a spurious timeout in Net::FTP::close (CPAN RT#18504)' \
     %{nil}
 %endif
 
@@ -3708,8 +3714,11 @@ sed \
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Wed Jul 24 2019 Petr Pisar <ppisar@redhat.com> - 4:5.16.3-295
+- Fix a spurious timeout in Net::FTP::close (bug #1626107)
+
 * Mon Jan 07 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4:5.16.3-294
-- Fix CVE-2018-18311 Integer overflow leading to buffer overflow (bug #1661064)
+- Fix CVE-2018-18311 Integer overflow leading to buffer overflow (bug #1653527)
 
 * Wed Mar 21 2018 Petr Pisar <ppisar@redhat.com> - 4:5.16.3-293
 - Add SSL support to Net::SMTP (bug #1557574)