In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/162b417c061ec9190135629d421e3685e8d31dc0?hp=e329daf3ba953a2ebc9795af8f3903568fba1b7b>
- Log ----------------------------------------------------------------- commit 162b417c061ec9190135629d421e3685e8d31dc0 Author: Chris 'BinGOs' Williams <[email protected]> Date: Tue Jan 13 11:11:37 2015 +0000 Update libnet to CPAN version 3.05 [DELTA] 3.05 2015-01-12 - Fixed infinite loop in Net::SMTP::auth(). [CPAN RT#100235] ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- cpan/libnet/Makefile.PL | 2 +- cpan/libnet/lib/Net/Cmd.pm | 2 +- cpan/libnet/lib/Net/Config.pm | 2 +- cpan/libnet/lib/Net/Domain.pm | 2 +- cpan/libnet/lib/Net/FTP.pm | 2 +- cpan/libnet/lib/Net/FTP/A.pm | 2 +- cpan/libnet/lib/Net/FTP/E.pm | 2 +- cpan/libnet/lib/Net/FTP/I.pm | 2 +- cpan/libnet/lib/Net/FTP/L.pm | 2 +- cpan/libnet/lib/Net/FTP/dataconn.pm | 2 +- cpan/libnet/lib/Net/NNTP.pm | 2 +- cpan/libnet/lib/Net/Netrc.pm | 2 +- cpan/libnet/lib/Net/POP3.pm | 2 +- cpan/libnet/lib/Net/SMTP.pm | 5 +++-- cpan/libnet/lib/Net/Time.pm | 2 +- cpan/libnet/t/config.t | 4 ++-- cpan/libnet/t/datasend.t | 4 ++-- cpan/libnet/t/ftp.t | 4 ++-- cpan/libnet/t/hostname.t | 4 ++-- cpan/libnet/t/netrc.t | 4 ++-- cpan/libnet/t/nntp.t | 4 ++-- cpan/libnet/t/nntp_ipv6.t | 6 +++--- cpan/libnet/t/nntp_ssl.t | 4 ++-- cpan/libnet/t/pop3_ipv6.t | 6 +++--- cpan/libnet/t/pop3_ssl.t | 4 ++-- cpan/libnet/t/require.t | 4 ++-- cpan/libnet/t/smtp.t | 4 ++-- cpan/libnet/t/smtp_ipv6.t | 6 +++--- cpan/libnet/t/smtp_ssl.t | 4 ++-- cpan/libnet/t/time.t | 4 ++-- 31 files changed, 51 insertions(+), 50 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 71204e4..6c465d1 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -673,7 +673,7 @@ use File::Glob qw(:case); }, 'libnet' => { - 'DISTRIBUTION' => 'SHAY/libnet-3.04.tar.gz', + 'DISTRIBUTION' => 'SHAY/libnet-3.05.tar.gz', 'FILES' => q[cpan/libnet], 'EXCLUDED' => [ qw( Configure diff --git a/cpan/libnet/Makefile.PL b/cpan/libnet/Makefile.PL index 59ff9e3..db7cfe2 100644 --- a/cpan/libnet/Makefile.PL +++ b/cpan/libnet/Makefile.PL @@ -64,7 +64,7 @@ MAIN: { ABSTRACT => 'Collection of network protocol modules', AUTHOR => 'Graham Barr <[email protected]>, Steve Hay <[email protected]>', LICENSE => 'perl_5', - VERSION => '3.04', + VERSION => '3.05', META_MERGE => { 'meta-spec' => { diff --git a/cpan/libnet/lib/Net/Cmd.pm b/cpan/libnet/lib/Net/Cmd.pm index 03b27a2..2614e69 100644 --- a/cpan/libnet/lib/Net/Cmd.pm +++ b/cpan/libnet/lib/Net/Cmd.pm @@ -41,7 +41,7 @@ BEGIN { } } -our $VERSION = "3.04"; +our $VERSION = "3.05"; our @ISA = qw(Exporter); our @EXPORT = qw(CMD_INFO CMD_OK CMD_MORE CMD_REJECT CMD_ERROR CMD_PENDING); diff --git a/cpan/libnet/lib/Net/Config.pm b/cpan/libnet/lib/Net/Config.pm index e23a448..953a826 100644 --- a/cpan/libnet/lib/Net/Config.pm +++ b/cpan/libnet/lib/Net/Config.pm @@ -19,7 +19,7 @@ use Socket qw(inet_aton inet_ntoa); our @EXPORT = qw(%NetConfig); our @ISA = qw(Net::LocalCfg Exporter); -our $VERSION = "3.04"; +our $VERSION = "3.05"; our($CONFIGURE, $LIBNET_CFG); diff --git a/cpan/libnet/lib/Net/Domain.pm b/cpan/libnet/lib/Net/Domain.pm index 41d49c3..3b274a6 100644 --- a/cpan/libnet/lib/Net/Domain.pm +++ b/cpan/libnet/lib/Net/Domain.pm @@ -20,7 +20,7 @@ use Net::Config; our @ISA = qw(Exporter); our @EXPORT_OK = qw(hostname hostdomain hostfqdn domainname); -our $VERSION = "3.04"; +our $VERSION = "3.05"; my ($host, $domain, $fqdn) = (undef, undef, undef); diff --git a/cpan/libnet/lib/Net/FTP.pm b/cpan/libnet/lib/Net/FTP.pm index ea0d7ae..c791fac 100644 --- a/cpan/libnet/lib/Net/FTP.pm +++ b/cpan/libnet/lib/Net/FTP.pm @@ -24,7 +24,7 @@ use Net::Config; use Socket; use Time::Local; -our $VERSION = '3.04'; +our $VERSION = '3.05'; our $IOCLASS; BEGIN { diff --git a/cpan/libnet/lib/Net/FTP/A.pm b/cpan/libnet/lib/Net/FTP/A.pm index dd51399..9f83e6c 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.04"; +our $VERSION = "3.05"; our $buf; diff --git a/cpan/libnet/lib/Net/FTP/E.pm b/cpan/libnet/lib/Net/FTP/E.pm index 8db2f5b..1984a0e 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.04"; +our $VERSION = "3.05"; 1; diff --git a/cpan/libnet/lib/Net/FTP/I.pm b/cpan/libnet/lib/Net/FTP/I.pm index 7dc5f5b..c388d8f 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.04"; +our $VERSION = "3.05"; our $buf; diff --git a/cpan/libnet/lib/Net/FTP/L.pm b/cpan/libnet/lib/Net/FTP/L.pm index 2f6d4e7..dda51c4 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.04"; +our $VERSION = "3.05"; 1; diff --git a/cpan/libnet/lib/Net/FTP/dataconn.pm b/cpan/libnet/lib/Net/FTP/dataconn.pm index a671d64..eaa769d 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.04'; +our $VERSION = '3.05'; $Net::FTP::IOCLASS or die "please load Net::FTP before Net::FTP::dataconn"; our @ISA = $Net::FTP::IOCLASS; diff --git a/cpan/libnet/lib/Net/NNTP.pm b/cpan/libnet/lib/Net/NNTP.pm index ef838d2..3796798 100644 --- a/cpan/libnet/lib/Net/NNTP.pm +++ b/cpan/libnet/lib/Net/NNTP.pm @@ -20,7 +20,7 @@ use Net::Cmd; use Net::Config; use Time::Local; -our $VERSION = "3.04"; +our $VERSION = "3.05"; # Code for detecting if we can use SSL my $ssl_class = eval { diff --git a/cpan/libnet/lib/Net/Netrc.pm b/cpan/libnet/lib/Net/Netrc.pm index 1143cd7..9cf06b1 100644 --- a/cpan/libnet/lib/Net/Netrc.pm +++ b/cpan/libnet/lib/Net/Netrc.pm @@ -17,7 +17,7 @@ use warnings; use Carp; use FileHandle; -our $VERSION = "3.04"; +our $VERSION = "3.05"; our $TESTING; diff --git a/cpan/libnet/lib/Net/POP3.pm b/cpan/libnet/lib/Net/POP3.pm index 0c71e71..0c6c4b1 100644 --- a/cpan/libnet/lib/Net/POP3.pm +++ b/cpan/libnet/lib/Net/POP3.pm @@ -19,7 +19,7 @@ use IO::Socket; use Net::Cmd; use Net::Config; -our $VERSION = "3.04"; +our $VERSION = "3.05"; # Code for detecting if we can use SSL my $ssl_class = eval { diff --git a/cpan/libnet/lib/Net/SMTP.pm b/cpan/libnet/lib/Net/SMTP.pm index 3036b2a..afd017a 100644 --- a/cpan/libnet/lib/Net/SMTP.pm +++ b/cpan/libnet/lib/Net/SMTP.pm @@ -20,7 +20,7 @@ use Net::Cmd; use Net::Config; use Socket; -our $VERSION = "3.04"; +our $VERSION = "3.05"; # Code for detecting if we can use SSL my $ssl_class = eval { @@ -193,10 +193,11 @@ sub auth { if ($client) { # $client mechanism failed, so we need to exclude this mechanism from list my $failed_mechanism = $client->mechanism; + return unless defined $failed_mechanism; $self->debug_text("Auth mechanism failed: $failed_mechanism") if $self->debug; $mechanisms =~ s/\b\Q$failed_mechanism\E\b//; - last unless $mechanisms =~ /\S/; + return unless $mechanisms =~ /\S/; $sasl->mechanism($mechanisms); } diff --git a/cpan/libnet/lib/Net/Time.pm b/cpan/libnet/lib/Net/Time.pm index 49365cf..da25942 100644 --- a/cpan/libnet/lib/Net/Time.pm +++ b/cpan/libnet/lib/Net/Time.pm @@ -23,7 +23,7 @@ use Net::Config; our @ISA = qw(Exporter); our @EXPORT_OK = qw(inet_time inet_daytime); -our $VERSION = "3.04"; +our $VERSION = "3.05"; our $TIMEOUT = 120; diff --git a/cpan/libnet/t/config.t b/cpan/libnet/t/config.t index d686ab1..3c29a03 100644 --- a/cpan/libnet/t/config.t +++ b/cpan/libnet/t/config.t @@ -6,12 +6,12 @@ use strict; use warnings; BEGIN { - if (!eval { require Socket; 1 }) { + if (!eval { require Socket }) { print "1..0 # no Socket\n"; exit 0; } undef *{Socket::inet_aton}; undef *{Socket::inet_ntoa}; - if (ord('A') == 193 && !eval { require Convert::EBCDIC; 1 }) { + if (ord('A') == 193 && !eval { require Convert::EBCDIC }) { print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0; } $INC{'Socket.pm'} = 1; diff --git a/cpan/libnet/t/datasend.t b/cpan/libnet/t/datasend.t index cdbdc29..3a97c4b 100644 --- a/cpan/libnet/t/datasend.t +++ b/cpan/libnet/t/datasend.t @@ -6,10 +6,10 @@ use strict; use warnings; BEGIN { - if (!eval { require Socket; 1 }) { + if (!eval { require Socket }) { print "1..0 # no Socket\n"; exit 0; } - if (ord('A') == 193 && !eval { require Convert::EBCDIC; 1 }) { + if (ord('A') == 193 && !eval { require Convert::EBCDIC }) { print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0; } } diff --git a/cpan/libnet/t/ftp.t b/cpan/libnet/t/ftp.t index 288cdbc..16cb868 100644 --- a/cpan/libnet/t/ftp.t +++ b/cpan/libnet/t/ftp.t @@ -6,10 +6,10 @@ use strict; use warnings; BEGIN { - if (!eval { require Socket; 1 }) { + if (!eval { require Socket }) { print "1..0 # Skip: no Socket module\n"; exit 0; } - if (ord('A') == 193 && !eval { require Convert::EBCDIC; 1 }) { + if (ord('A') == 193 && !eval { require Convert::EBCDIC }) { print "1..0 # Skip: EBCDIC but no Convert::EBCDIC\n"; exit 0; } } diff --git a/cpan/libnet/t/hostname.t b/cpan/libnet/t/hostname.t index 25f1cda..55031bf 100644 --- a/cpan/libnet/t/hostname.t +++ b/cpan/libnet/t/hostname.t @@ -6,10 +6,10 @@ use strict; use warnings; BEGIN { - if (!eval { require Socket; 1 }) { + if (!eval { require Socket }) { print "1..0 # no Socket\n"; exit 0; } - if (ord('A') == 193 && !eval { require Convert::EBCDIC; 1 }) { + if (ord('A') == 193 && !eval { require Convert::EBCDIC }) { print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0; } } diff --git a/cpan/libnet/t/netrc.t b/cpan/libnet/t/netrc.t index 1149bb8..e270b36 100644 --- a/cpan/libnet/t/netrc.t +++ b/cpan/libnet/t/netrc.t @@ -6,10 +6,10 @@ use strict; use warnings; BEGIN { - if (!eval { require Socket; 1 }) { + if (!eval { require Socket }) { print "1..0 # no Socket\n"; exit 0; } - if (ord('A') == 193 && !eval { require Convert::EBCDIC; 1 }) { + if (ord('A') == 193 && !eval { require Convert::EBCDIC }) { print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0; } } diff --git a/cpan/libnet/t/nntp.t b/cpan/libnet/t/nntp.t index 303aac4..559f398 100644 --- a/cpan/libnet/t/nntp.t +++ b/cpan/libnet/t/nntp.t @@ -6,10 +6,10 @@ use strict; use warnings; BEGIN { - if (!eval { require Socket; 1 }) { + if (!eval { require Socket }) { print "1..0 # no Socket\n"; exit 0; } - if (ord('A') == 193 && !eval { require Convert::EBCDIC; 1 }) { + if (ord('A') == 193 && !eval { require Convert::EBCDIC }) { print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0; } } diff --git a/cpan/libnet/t/nntp_ipv6.t b/cpan/libnet/t/nntp_ipv6.t index fbb1458..1992618 100644 --- a/cpan/libnet/t/nntp_ipv6.t +++ b/cpan/libnet/t/nntp_ipv6.t @@ -28,7 +28,7 @@ my $srv = $inet6class->new( plan skip_all => "cannot create listener on ::1: $!" if ! $srv; my $host = $srv->sockhost; my $port = $srv->sockport; -diag("server on $host port $port"); +note("server on $host port $port"); plan tests => 1; @@ -36,7 +36,7 @@ defined( my $pid = fork()) or die "fork failed: $!"; exit(nntp_server()) if ! $pid; my $cl = Net::NNTP->new(Host => $host, Port => $port,, Debug => $debug); -diag("created Net::NNTP object"); +note("created Net::NNTP object"); if (!$cl) { fail("IPv6 NNTP connect failed"); } else { @@ -62,5 +62,5 @@ sub nntp_server { print "500 unknown cmd\r\n"; } } - diag("NNTP dialog done"); + note("NNTP dialog done"); } diff --git a/cpan/libnet/t/nntp_ssl.t b/cpan/libnet/t/nntp_ssl.t index 66789fb..387899f 100644 --- a/cpan/libnet/t/nntp_ssl.t +++ b/cpan/libnet/t/nntp_ssl.t @@ -73,7 +73,7 @@ sub nntp_client { Debug => $debug, %sslopt, ); - diag("created Net::NNTP object"); + note("created Net::NNTP object"); if (!$cl) { fail( ($ssl ? "SSL ":"" )."NNTP connect failed"); } elsif ($ssl) { @@ -125,5 +125,5 @@ sub nntp_server { } } - diag("NNTP dialog done"); + note("NNTP dialog done"); } diff --git a/cpan/libnet/t/pop3_ipv6.t b/cpan/libnet/t/pop3_ipv6.t index 004a642..5100951 100644 --- a/cpan/libnet/t/pop3_ipv6.t +++ b/cpan/libnet/t/pop3_ipv6.t @@ -27,7 +27,7 @@ my $srv = $inet6class->new( ); plan skip_all => "cannot create listener on ::1: $!" if ! $srv; my $saddr = "[".$srv->sockhost."]".':'.$srv->sockport; -diag("server on $saddr"); +note("server on $saddr"); plan tests => 1; @@ -35,7 +35,7 @@ defined( my $pid = fork()) or die "fork failed: $!"; exit(pop3_server()) if ! $pid; my $cl = Net::POP3->new($saddr, Debug => $debug); -diag("created Net::POP3 object"); +note("created Net::POP3 object"); if (!$cl) { fail("IPv6 POP3 connect failed"); } else { @@ -62,5 +62,5 @@ sub pop3_server { } } - diag("POP3 dialog done"); + note("POP3 dialog done"); } diff --git a/cpan/libnet/t/pop3_ssl.t b/cpan/libnet/t/pop3_ssl.t index 31b2bbd..3eca064 100644 --- a/cpan/libnet/t/pop3_ssl.t +++ b/cpan/libnet/t/pop3_ssl.t @@ -67,7 +67,7 @@ sub pop3_client { ); $sslopt{SSL} = 1 if $ssl; my $cl = Net::POP3->new($saddr, %sslopt, Debug => $debug); - diag("created Net::POP3 object"); + note("created Net::POP3 object"); if (!$cl) { fail( ($ssl ? "SSL ":"" )."POP3 connect failed"); } elsif ($ssl) { @@ -121,5 +121,5 @@ sub pop3_server { } } - diag("POP3 dialog done"); + note("POP3 dialog done"); } diff --git a/cpan/libnet/t/require.t b/cpan/libnet/t/require.t index a48951a..70ec1f6 100644 --- a/cpan/libnet/t/require.t +++ b/cpan/libnet/t/require.t @@ -6,10 +6,10 @@ use strict; use warnings; BEGIN { - if (!eval { require Socket; 1 }) { + if (!eval { require Socket }) { print "1..0 # no Socket\n"; exit 0; } - if (ord('A') == 193 && !eval { require Convert::EBCDIC; 1 }) { + if (ord('A') == 193 && !eval { require Convert::EBCDIC }) { print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0; } } diff --git a/cpan/libnet/t/smtp.t b/cpan/libnet/t/smtp.t index 634390f..9d6f65a 100644 --- a/cpan/libnet/t/smtp.t +++ b/cpan/libnet/t/smtp.t @@ -6,10 +6,10 @@ use strict; use warnings; BEGIN { - if (!eval { require Socket; 1 }) { + if (!eval { require Socket }) { print "1..0 # no Socket\n"; exit 0; } - if (ord('A') == 193 && eval { require Convert::EBCDIC; 1 }) { + if (ord('A') == 193 && eval { require Convert::EBCDIC }) { print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0; } } diff --git a/cpan/libnet/t/smtp_ipv6.t b/cpan/libnet/t/smtp_ipv6.t index 78a14fe..48c7246 100644 --- a/cpan/libnet/t/smtp_ipv6.t +++ b/cpan/libnet/t/smtp_ipv6.t @@ -27,7 +27,7 @@ my $srv = $inet6class->new( ); plan skip_all => "cannot create listener on ::1: $!" if ! $srv; my $saddr = "[".$srv->sockhost."]".':'.$srv->sockport; -diag("server on $saddr"); +note("server on $saddr"); plan tests => 1; @@ -35,7 +35,7 @@ defined( my $pid = fork()) or die "fork failed: $!"; exit(smtp_server()) if ! $pid; my $cl = Net::SMTP->new($saddr, Debug => $debug); -diag("created Net::SMTP object"); +note("created Net::SMTP object"); if (!$cl) { fail("IPv6 SMTP connect failed"); } else { @@ -64,5 +64,5 @@ sub smtp_server { } } - diag("SMTP dialog done"); + note("SMTP dialog done"); } diff --git a/cpan/libnet/t/smtp_ssl.t b/cpan/libnet/t/smtp_ssl.t index 108d094..e91cc9b 100644 --- a/cpan/libnet/t/smtp_ssl.t +++ b/cpan/libnet/t/smtp_ssl.t @@ -67,7 +67,7 @@ sub smtp_client { ); $sslopt{SSL} = 1 if $ssl; my $cl = Net::SMTP->new($saddr, %sslopt, Debug => $debug); - diag("created Net::SMTP object"); + note("created Net::SMTP object"); if (!$cl) { fail( ($ssl ? "SSL ":"" )."SMTP connect failed"); } elsif ($ssl) { @@ -123,5 +123,5 @@ sub smtp_server { } } - diag("SMTP dialog done"); + note("SMTP dialog done"); } diff --git a/cpan/libnet/t/time.t b/cpan/libnet/t/time.t index 43b0e0e..6dcba3a 100644 --- a/cpan/libnet/t/time.t +++ b/cpan/libnet/t/time.t @@ -6,10 +6,10 @@ use strict; use warnings; BEGIN { - if (!eval { require Socket; 1 }) { + if (!eval { require Socket }) { print "1..0 # no Socket\n"; exit 0; } - if (ord('A') == 193 && !eval { require Convert::EBCDIC; 1 }) { + if (ord('A') == 193 && !eval { require Convert::EBCDIC }) { print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0; } $INC{'IO/Socket.pm'} = 1; -- Perl5 Master Repository
