In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/487a122b158949b56d70de46485b4f897fe1ce4e?hp=8eadc45be8aaa1605fa030d299ed66d2be512117>
- Log -----------------------------------------------------------------
commit 487a122b158949b56d70de46485b4f897fe1ce4e
Author: Steve Hay <steve.m....@googlemail.com>
Date: Tue Feb 4 09:36:45 2014 +0000
Upgrade libnet from version 1.24 to 1.25
-----------------------------------------------------------------------
Summary of changes:
Porting/Maintainers.pl | 2 +-
cpan/libnet/Makefile.PL | 2 +-
cpan/libnet/Net/Domain.pm | 4 ++--
cpan/libnet/Net/FTP.pm | 21 ++++++++++++++-------
cpan/libnet/Net/NNTP.pm | 10 ++++++++--
cpan/libnet/Net/POP3.pm | 8 +++++++-
cpan/libnet/Net/SMTP.pm | 10 +++++-----
pod/perldelta.pod | 8 ++++++++
t/porting/customized.dat | 2 +-
9 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 34d9dbd..74ec2da 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -669,7 +669,7 @@ use File::Glob qw(:case);
},
'libnet' => {
- 'DISTRIBUTION' => 'SHAY/libnet-1.24.tar.gz',
+ 'DISTRIBUTION' => 'SHAY/libnet-1.25.tar.gz',
'FILES' => q[cpan/libnet],
'EXCLUDED' => [
qw( Configure
diff --git a/cpan/libnet/Makefile.PL b/cpan/libnet/Makefile.PL
index 1d1ad8d..6f904c2 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 <gb...@pobox.com>',
ABSTRACT => 'Collection of Network protocol modules',
);
diff --git a/cpan/libnet/Net/Domain.pm b/cpan/libnet/Net/Domain.pm
index d47f8be..5b964c3 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 01e3649..8107ef7 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 9b6a894..07c3737 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 b79a3bf..4b94a11 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 5dba19e..705b5c5 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
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 6d3a7e1..ed9973d 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -201,6 +201,14 @@ specified by its prototype.
=item *
+The libnet module collection has been upgraded from version 1.24 to 1.25.
+
+The creation of L<Net::FTP> dataconnections now honour the requested timeout,
+errors from C<Net::Cmd::response()> are now handled in C<Net::FTP::pasv_wait()>
+and a warning from C<Net::Domain::domainname()> on Android is now stopped.
+
+=item *
+
L<List::Util> has been upgraded from version 1.37 to 1.38.
A backwards-compatibility issue with older perls has been fixed. [cpan #92363]
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 24639b0..1e7a575 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -15,7 +15,7 @@ Text::Balanced cpan/Text-Balanced/t/09_gentag.t
42361b5dfb3bb728bce20f4fb0d92ccf
Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t
9bae51c9b944cd5c0bbabe9d397e573976a2be8e
Text::ParseWords cpan/Text-ParseWords/t/taint.t
3cff0dae812801f7aa1738d6070508f2c5bcc2e5
autodie cpan/autodie/t/utf8_open.t 5295851351c49f939008c5aca6a798742b1e503d
-libnet cpan/libnet/Makefile.PL 8cc723f0e1d2177af46ef4e41fc1f362085520df
+libnet cpan/libnet/Makefile.PL 13a8e4a8c7fb2607219c3106cad6c3d7173f7221
podlators cpan/podlators/scripts/pod2man.PL
f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6
podlators cpan/podlators/scripts/pod2text.PL
b4693fcfe4a0a1b38a215cfb8985a65d5d025d69
version cpan/version/lib/version.pm fa9931d4db05aff9a0a6ef558610b1a472d9306e
--
Perl5 Master Repository
