Upgrade libnet from version 1.24 to 1.25

6 files changed, 37 insertions, 18 deletions

diff --git a/cpan/libnet/Makefile.PL b/cpan/libnet/Makefile.PL
index 1d1ad8ddec..6f904c221e 100644
--- a/cpan/libnet/Makefile.PL
+++ b/cpan/libnet/Makefile.PL
@@ -4,7 +4,7 @@ use ExtUtils::MakeMaker;
 WriteMakefile (
     NAME            => 'Net',
     DISTNAME        => 'libnet',
-    VERSION         => '1.24', # finds $VERSION
+    VERSION         => '1.25', # finds $VERSION
     AUTHOR          => 'Graham Barr <gbarr@pobox.com>',
     ABSTRACT        => 'Collection of Network protocol modules',
 );
diff --git a/cpan/libnet/Net/Domain.pm b/cpan/libnet/Net/Domain.pm
index d47f8bee04..5b964c3d5f 100644
--- a/cpan/libnet/Net/Domain.pm
+++ b/cpan/libnet/Net/Domain.pm
@@ -16,7 +16,7 @@ use Net::Config;
 @ISA       = qw(Exporter);
 @EXPORT_OK = qw(hostname hostdomain hostfqdn domainname);
 
-$VERSION = "2.22";
+$VERSION = "2.23";
 
 my ($host, $domain, $fqdn) = (undef, undef, undef);
 
@@ -169,7 +169,7 @@ sub _hostdomain {
     }
 
     chop($dom = `domainname 2>/dev/null`)
-      unless (defined $dom || $^O =~ /^(?:cygwin|MSWin32)/);
+      unless (defined $dom || $^O =~ /^(?:cygwin|MSWin32|android)/);
 
     if (defined $dom) {
       my @h = ();
diff --git a/cpan/libnet/Net/FTP.pm b/cpan/libnet/Net/FTP.pm
index 01e3649109..8107ef77e6 100644
--- a/cpan/libnet/Net/FTP.pm
+++ b/cpan/libnet/Net/FTP.pm
@@ -21,7 +21,7 @@ use Net::Cmd;
 use Net::Config;
 use Fcntl qw(O_WRONLY O_RDONLY O_APPEND O_CREAT O_TRUNC);
 
-$VERSION = '2.78';
+$VERSION = '2.79';
 @ISA     = qw(Exporter Net::Cmd IO::Socket::INET);
 
 # Someday I will "use constant", when I am not bothered to much about
@@ -943,7 +943,8 @@ sub _dataconn {
       PeerAddr  => join(".", @port[0 .. 3]),
       PeerPort  => $port[4] * 256 + $port[5],
       LocalAddr => ${*$ftp}{'net_ftp_localaddr'},
-      Proto     => 'tcp'
+      Proto     => 'tcp',
+      Timeout   => $ftp->timeout
     );
   }
   elsif (defined ${*$ftp}{'net_ftp_listen'}) {
@@ -1166,8 +1167,11 @@ sub pasv_wait {
   vec($rin = '', fileno($ftp), 1) = 1;
   select($rout = $rin, undef, undef, undef);
 
-  $ftp->response();
-  $non_pasv->response();
+  my $dres = $ftp->response();
+  my $sres = $non_pasv->response();
+
+  return undef
+    unless $dres == CMD_OK && $sres == CMD_OK;
 
   return undef
     unless $ftp->ok() && $non_pasv->ok();
@@ -1297,6 +1301,8 @@ C<Net::FTP> is a class implementing a simple FTP client in Perl as
 described in RFC959.  It provides wrappers for a subset of the RFC959
 commands.
 
+The Net::FTP class is a subclass of Net::Cmd and IO::Socket::INET.
+
 =head1 OVERVIEW
 
 FTP stands for File Transfer Protocol.  It is a way of transferring
@@ -1403,6 +1409,10 @@ value, with I<true> meaning that the operation was a success. When a method
 states that it returns a value, failure will be returned as I<undef> or an
 empty list.
 
+C<Net::FTP> inherits from C<Net::Cmd> so methods defined in C<Net::Cmd> may
+be used to send commands to the remote FTP server in addition to the methods
+documented here.
+
 =over 4
 
 =item login ([LOGIN [,PASSWORD [, ACCOUNT] ] ])
@@ -1701,9 +1711,6 @@ Send the QUIT command to the remote FTP server and close the socket connection.
 
 =head2 Methods for the adventurous
 
-C<Net::FTP> inherits from C<Net::Cmd> so methods defined in C<Net::Cmd> may
-be used to send commands to the remote FTP server.
-
 =over 4
 
 =item quot (CMD [,ARGS])
diff --git a/cpan/libnet/Net/NNTP.pm b/cpan/libnet/Net/NNTP.pm
index 9b6a8945e2..07c373776e 100644
--- a/cpan/libnet/Net/NNTP.pm
+++ b/cpan/libnet/Net/NNTP.pm
@@ -14,7 +14,7 @@ use Carp;
 use Time::Local;
 use Net::Config;
 
-$VERSION = "2.25";
+$VERSION = "2.26";
 @ISA     = qw(Net::Cmd IO::Socket::INET);
 
 
@@ -715,7 +715,9 @@ Net::NNTP - NNTP Client class
 =head1 DESCRIPTION
 
 C<Net::NNTP> is a class implementing a simple NNTP client in Perl as described
-in RFC977. C<Net::NNTP> inherits its communication methods from C<Net::Cmd>
+in RFC977.
+
+The Net::NNTP class is a subclass of Net::Cmd and IO::Socket::INET.
 
 =head1 CONSTRUCTOR
 
@@ -764,6 +766,10 @@ value, with I<true> meaning that the operation was a success. When a method
 states that it returns a value, failure will be returned as I<undef> or an
 empty list.
 
+C<Net::NNTP> inherits from C<Net::Cmd> so methods defined in C<Net::Cmd> may
+be used to send commands to the remote NNTP server in addition to the methods
+documented here.
+
 =over 4
 
 =item article ( [ MSGID|MSGNUM ], [FH] )
diff --git a/cpan/libnet/Net/POP3.pm b/cpan/libnet/Net/POP3.pm
index b79a3bfe36..4b94a11a87 100644
--- a/cpan/libnet/Net/POP3.pm
+++ b/cpan/libnet/Net/POP3.pm
@@ -13,7 +13,7 @@ use Net::Cmd;
 use Carp;
 use Net::Config;
 
-$VERSION = "2.30";
+$VERSION = "2.31";
 
 @ISA = qw(Net::Cmd IO::Socket::INET);
 
@@ -557,6 +557,8 @@ A new Net::POP3 object must be created with the I<new> method. Once
 this has been done, all POP3 commands are accessed via method calls
 on the object.
 
+The Net::POP3 class is a subclass of Net::Cmd and IO::Socket::INET.
+
 =head1 CONSTRUCTOR
 
 =over 4
@@ -596,6 +598,10 @@ value, with I<true> meaning that the operation was a success. When a method
 states that it returns a value, failure will be returned as I<undef> or an
 empty list.
 
+C<Net::POP3> inherits from C<Net::Cmd> so methods defined in C<Net::Cmd> may
+be used to send commands to the remote POP3 server in addition to the methods
+documented here.
+
 =over 4
 
 =item auth ( USERNAME, PASSWORD )
diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm
index 5dba19edb1..705b5c5ab5 100644
--- a/cpan/libnet/Net/SMTP.pm
+++ b/cpan/libnet/Net/SMTP.pm
@@ -16,7 +16,7 @@ use IO::Socket;
 use Net::Cmd;
 use Net::Config;
 
-$VERSION = "2.32";
+$VERSION = "2.33";
 
 @ISA = qw(Net::Cmd IO::Socket::INET);
 
@@ -670,6 +670,10 @@ value, with I<true> meaning that the operation was a success. When a method
 states that it returns a value, failure will be returned as I<undef> or an
 empty list.
 
+C<Net::SMTP> inherits from C<Net::Cmd> so methods defined in C<Net::Cmd> may
+be used to send commands to the remote SMTP server in addition to the methods
+documented here.
+
 =over 4
 
 =item banner ()
@@ -836,10 +840,6 @@ Verify that C<ADDRESS> is a legitimate mailing address.
 Most sites usually disable this feature in their SMTP service configuration.
 Use "Debug => 1" option under new() to see if disabled.
 
-=item message ()
-
-Returns the text message returned from the last command. (Net::Cmd method)
-
 =item help ( [ $subject ] )
 
 Request help text from the server. Returns the text or undef upon failure