Upgrade libnet from 3.12 to 3.13

15 files changed, 39 insertions, 57 deletions

diff --git a/cpan/libnet/Makefile.PL b/cpan/libnet/Makefile.PL
index 477739068d..df525269b2 100644
--- a/cpan/libnet/Makefile.PL
+++ b/cpan/libnet/Makefile.PL
@@ -66,7 +66,7 @@ MAIN: {
         ABSTRACT => 'Collection of network protocol modules',
         AUTHOR   => 'Graham Barr <gbarr@pobox.com>, Steve Hay <shay@cpan.org>',
         LICENSE  => 'perl_5',
-        VERSION  => '3.12',
+        VERSION  => '3.13',
 
         META_MERGE => {
             'meta-spec' => {
diff --git a/cpan/libnet/lib/Net/Cmd.pm b/cpan/libnet/lib/Net/Cmd.pm
index 650f23be96..41df8a264a 100644
--- a/cpan/libnet/lib/Net/Cmd.pm
+++ b/cpan/libnet/lib/Net/Cmd.pm
@@ -26,7 +26,7 @@ BEGIN {
   }
 }
 
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 our @ISA     = qw(Exporter);
 our @EXPORT  = qw(CMD_INFO CMD_OK CMD_MORE CMD_REJECT CMD_ERROR CMD_PENDING);
 
@@ -335,19 +335,15 @@ sub getline {
   my $rin = "";
   vec($rin, $fd, 1) = 1;
 
-  my $timeout = $cmd->timeout || undef;
-  my $initial = time;
-  my $pending = $timeout;
-
   my $buf;
 
   until (scalar(@{${*$cmd}{'net_cmd_lines'}})) {
+    my $timeout = $cmd->timeout || undef;
     my $rout;
 
-    my $select_ret = select($rout = $rin, undef, undef, $pending);
-    if (defined $select_ret and $select_ret > 0) {
-      my $r = sysread($cmd, $buf = "", 1024);
-      if (! defined($r) ) {
+    my $select_ret = select($rout = $rin, undef, undef, $timeout);
+    if ($select_ret > 0) {
+      unless (sysread($cmd, $buf = "", 1024)) {
         my $err = $!;
         $cmd->close;
         $cmd->_set_status_closed($err);
@@ -363,20 +359,6 @@ sub getline {
       push(@{${*$cmd}{'net_cmd_lines'}}, map {"$_\n"} @buf);
 
     }
-    elsif (defined $select_ret && $select_ret == -1) {
-      if ( $! == EINTR ) {
-        if ( defined($timeout) ) {
-          redo if ($pending = $timeout - ( time - $initial ) ) > 0;
-          $cmd->_set_status_timeout;
-          return;
-        }
-        redo;
-      }
-      my $err = $!;
-      $cmd->close;
-      $cmd->_set_status_closed($err);
-      return;
-    }
     else {
       $cmd->_set_status_timeout;
       return;
@@ -915,11 +897,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
 
 =head1 VERSION
 
-Version 3.12
+Version 3.13
 
 =head1 DATE
 
-09 Dec 2020
+23 Dec 2020
 
 =head1 HISTORY
 
diff --git a/cpan/libnet/lib/Net/Config.pm b/cpan/libnet/lib/Net/Config.pm
index 365cb49b16..2f8417f01a 100644
--- a/cpan/libnet/lib/Net/Config.pm
+++ b/cpan/libnet/lib/Net/Config.pm
@@ -18,7 +18,7 @@ use Socket qw(inet_aton inet_ntoa);
 
 our @EXPORT  = qw(%NetConfig);
 our @ISA     = qw(Net::LocalCfg Exporter);
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 
 our($CONFIGURE, $LIBNET_CFG);
 
@@ -368,11 +368,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
 
 =head1 VERSION
 
-Version 3.12
+Version 3.13
 
 =head1 DATE
 
-09 Dec 2020
+23 Dec 2020
 
 =head1 HISTORY
 
diff --git a/cpan/libnet/lib/Net/Domain.pm b/cpan/libnet/lib/Net/Domain.pm
index f4c93eafdb..d69ac5ba80 100644
--- a/cpan/libnet/lib/Net/Domain.pm
+++ b/cpan/libnet/lib/Net/Domain.pm
@@ -19,7 +19,7 @@ use Net::Config;
 
 our @ISA       = qw(Exporter);
 our @EXPORT_OK = qw(hostname hostdomain hostfqdn domainname);
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 
 my ($host, $domain, $fqdn) = (undef, undef, undef);
 
@@ -395,11 +395,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
 
 =head1 VERSION
 
-Version 3.12
+Version 3.13
 
 =head1 DATE
 
-09 Dec 2020
+23 Dec 2020
 
 =head1 HISTORY
 
diff --git a/cpan/libnet/lib/Net/FTP.pm b/cpan/libnet/lib/Net/FTP.pm
index b195c9c92c..37836bf657 100644
--- a/cpan/libnet/lib/Net/FTP.pm
+++ b/cpan/libnet/lib/Net/FTP.pm
@@ -23,7 +23,7 @@ use Net::Config;
 use Socket;
 use Time::Local;
 
-our $VERSION = '3.12';
+our $VERSION = '3.13';
 
 our $IOCLASS;
 my $family_key;
@@ -2044,11 +2044,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
 
 =head1 VERSION
 
-Version 3.12
+Version 3.13
 
 =head1 DATE
 
-09 Dec 2020
+23 Dec 2020
 
 =head1 HISTORY
 
diff --git a/cpan/libnet/lib/Net/FTP/A.pm b/cpan/libnet/lib/Net/FTP/A.pm
index f22c974ba9..53446386c1 100644
--- a/cpan/libnet/lib/Net/FTP/A.pm
+++ b/cpan/libnet/lib/Net/FTP/A.pm
@@ -13,7 +13,7 @@ use Carp;
 use Net::FTP::dataconn;
 
 our @ISA     = qw(Net::FTP::dataconn);
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 
 our $buf;
 
diff --git a/cpan/libnet/lib/Net/FTP/E.pm b/cpan/libnet/lib/Net/FTP/E.pm
index df281c05b9..9b1370778a 100644
--- a/cpan/libnet/lib/Net/FTP/E.pm
+++ b/cpan/libnet/lib/Net/FTP/E.pm
@@ -8,6 +8,6 @@ use warnings;
 use Net::FTP::I;
 
 our @ISA = qw(Net::FTP::I);
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 
 1;
diff --git a/cpan/libnet/lib/Net/FTP/I.pm b/cpan/libnet/lib/Net/FTP/I.pm
index 8f85e0e1cf..726cba197c 100644
--- a/cpan/libnet/lib/Net/FTP/I.pm
+++ b/cpan/libnet/lib/Net/FTP/I.pm
@@ -13,7 +13,7 @@ use Carp;
 use Net::FTP::dataconn;
 
 our @ISA     = qw(Net::FTP::dataconn);
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 
 our $buf;
 
diff --git a/cpan/libnet/lib/Net/FTP/L.pm b/cpan/libnet/lib/Net/FTP/L.pm
index 9eda6107d1..ac5e27ebad 100644
--- a/cpan/libnet/lib/Net/FTP/L.pm
+++ b/cpan/libnet/lib/Net/FTP/L.pm
@@ -8,6 +8,6 @@ use warnings;
 use Net::FTP::I;
 
 our @ISA = qw(Net::FTP::I);
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 
 1;
diff --git a/cpan/libnet/lib/Net/FTP/dataconn.pm b/cpan/libnet/lib/Net/FTP/dataconn.pm
index 51e9c2f2d2..5a257e677f 100644
--- a/cpan/libnet/lib/Net/FTP/dataconn.pm
+++ b/cpan/libnet/lib/Net/FTP/dataconn.pm
@@ -13,7 +13,7 @@ use Carp;
 use Errno;
 use Net::Cmd;
 
-our $VERSION = '3.12';
+our $VERSION = '3.13';
 
 $Net::FTP::IOCLASS or die "please load Net::FTP before Net::FTP::dataconn";
 our @ISA = $Net::FTP::IOCLASS;
@@ -224,11 +224,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
 
 =head1 VERSION
 
-Version 3.12
+Version 3.13
 
 =head1 DATE
 
-09 Dec 2020
+23 Dec 2020
 
 =head1 HISTORY
 
diff --git a/cpan/libnet/lib/Net/NNTP.pm b/cpan/libnet/lib/Net/NNTP.pm
index 9289b59432..3187f51961 100644
--- a/cpan/libnet/lib/Net/NNTP.pm
+++ b/cpan/libnet/lib/Net/NNTP.pm
@@ -19,7 +19,7 @@ use Net::Cmd;
 use Net::Config;
 use Time::Local;
 
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 
 # Code for detecting if we can use SSL
 my $ssl_class = eval {
@@ -1308,11 +1308,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
 
 =head1 VERSION
 
-Version 3.12
+Version 3.13
 
 =head1 DATE
 
-09 Dec 2020
+23 Dec 2020
 
 =head1 HISTORY
 
diff --git a/cpan/libnet/lib/Net/Netrc.pm b/cpan/libnet/lib/Net/Netrc.pm
index b66eb82d8b..50688eefd6 100644
--- a/cpan/libnet/lib/Net/Netrc.pm
+++ b/cpan/libnet/lib/Net/Netrc.pm
@@ -16,7 +16,7 @@ use warnings;
 use Carp;
 use FileHandle;
 
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 
 our $TESTING;
 
@@ -353,11 +353,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
 
 =head1 VERSION
 
-Version 3.12
+Version 3.13
 
 =head1 DATE
 
-09 Dec 2020
+23 Dec 2020
 
 =head1 HISTORY
 
diff --git a/cpan/libnet/lib/Net/POP3.pm b/cpan/libnet/lib/Net/POP3.pm
index fb442ad3c1..55f7be1342 100644
--- a/cpan/libnet/lib/Net/POP3.pm
+++ b/cpan/libnet/lib/Net/POP3.pm
@@ -18,7 +18,7 @@ use IO::Socket;
 use Net::Cmd;
 use Net::Config;
 
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 
 # Code for detecting if we can use SSL
 my $ssl_class = eval {
@@ -869,11 +869,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
 
 =head1 VERSION
 
-Version 3.12
+Version 3.13
 
 =head1 DATE
 
-09 Dec 2020
+23 Dec 2020
 
 =head1 HISTORY
 
diff --git a/cpan/libnet/lib/Net/SMTP.pm b/cpan/libnet/lib/Net/SMTP.pm
index fd81d0be97..354ed8e38f 100644
--- a/cpan/libnet/lib/Net/SMTP.pm
+++ b/cpan/libnet/lib/Net/SMTP.pm
@@ -19,7 +19,7 @@ use Net::Cmd;
 use Net::Config;
 use Socket;
 
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 
 # Code for detecting if we can use SSL
 my $ssl_class = eval {
@@ -1052,11 +1052,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
 
 =head1 VERSION
 
-Version 3.12
+Version 3.13
 
 =head1 DATE
 
-09 Dec 2020
+23 Dec 2020
 
 =head1 HISTORY
 
diff --git a/cpan/libnet/lib/Net/Time.pm b/cpan/libnet/lib/Net/Time.pm
index 4ce1daf120..7f0a724cd3 100644
--- a/cpan/libnet/lib/Net/Time.pm
+++ b/cpan/libnet/lib/Net/Time.pm
@@ -22,7 +22,7 @@ use Net::Config;
 our @ISA       = qw(Exporter);
 our @EXPORT_OK = qw(inet_time inet_daytime);
 
-our $VERSION = "3.12";
+our $VERSION = "3.13";
 
 our $TIMEOUT = 120;
 
@@ -190,11 +190,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
 
 =head1 VERSION
 
-Version 3.12
+Version 3.13
 
 =head1 DATE
 
-09 Dec 2020
+23 Dec 2020
 
 =head1 HISTORY