In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/6233097676c277b9213c6a4a9a165c2b60d0418e?hp=2901a52fea8ccd833938decc986db4e4ad633985>
- Log ----------------------------------------------------------------- commit 6233097676c277b9213c6a4a9a165c2b60d0418e Author: Chris 'BinGOs' Williams <[email protected]> Date: Sat Nov 29 19:47:50 2014 +0000 Update libnet to CPAN version 3.04 [DELTA] 3.04 2014-11-29 - SNI is now only used for SSL connections if it is supported by IO::Socket::SSL (i.e. OpenSSL version >= 1). (The previous release switched to using SNI by default, which caused some CPAN Testers failures.) [Steffen Ullrich, PR#10] ----------------------------------------------------------------------- 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 | 10 +++++++--- 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 | 4 ++-- cpan/libnet/lib/Net/Netrc.pm | 2 +- cpan/libnet/lib/Net/POP3.pm | 4 ++-- cpan/libnet/lib/Net/SMTP.pm | 4 ++-- cpan/libnet/lib/Net/Time.pm | 2 +- 16 files changed, 25 insertions(+), 21 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 9f8177e..1d4bd46 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -681,7 +681,7 @@ use File::Glob qw(:case); }, 'libnet' => { - 'DISTRIBUTION' => 'SHAY/libnet-3.03.tar.gz', + 'DISTRIBUTION' => 'SHAY/libnet-3.04.tar.gz', 'FILES' => q[cpan/libnet], 'EXCLUDED' => [ qw( Configure diff --git a/cpan/libnet/Makefile.PL b/cpan/libnet/Makefile.PL index bbbdf85..59ff9e3 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.03', + VERSION => '3.04', META_MERGE => { 'meta-spec' => { diff --git a/cpan/libnet/lib/Net/Cmd.pm b/cpan/libnet/lib/Net/Cmd.pm index 8c6e23a..03b27a2 100644 --- a/cpan/libnet/lib/Net/Cmd.pm +++ b/cpan/libnet/lib/Net/Cmd.pm @@ -41,7 +41,7 @@ BEGIN { } } -our $VERSION = "3.03"; +our $VERSION = "3.04"; 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 a9fa24e..e23a448 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.03"; +our $VERSION = "3.04"; our($CONFIGURE, $LIBNET_CFG); diff --git a/cpan/libnet/lib/Net/Domain.pm b/cpan/libnet/lib/Net/Domain.pm index 356a3e9..41d49c3 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.03"; +our $VERSION = "3.04"; my ($host, $domain, $fqdn) = (undef, undef, undef); diff --git a/cpan/libnet/lib/Net/FTP.pm b/cpan/libnet/lib/Net/FTP.pm index e95da87..ea0d7ae 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.03'; +our $VERSION = '3.04'; our $IOCLASS; BEGIN { @@ -103,7 +103,8 @@ sub new { %tlsargs = ( SSL_verifycn_scheme => 'ftp', SSL_verifycn_name => $hostname, - SSL_hostname => $hostname, + # use SNI if supported by IO::Socket::SSL + $pkg->can_client_sni ? (SSL_hostname => $hostname):(), # reuse SSL session of control connection in data connections SSL_session_cache => Net::FTP::_SSL_SingleSessionCache->new, ); @@ -1039,7 +1040,10 @@ sub _dataconn { $ftp->is_SSL ? ( SSL_reuse_ctx => $ftp, SSL_verifycn_name => ${*$ftp}{net_ftp_tlsargs}{SSL_verifycn_name}, - SSL_hostname => ${*$ftp}{net_ftp_tlsargs}{SSL_hostname}, + # This will cause the use of SNI if supported by IO::Socket::SSL. + $ftp->can_client_sni ? ( + SSL_hostname => ${*$ftp}{net_ftp_tlsargs}{SSL_hostname} + ):(), ) :( %{${*$ftp}{net_ftp_tlsargs}} ), ):(), ) or return; diff --git a/cpan/libnet/lib/Net/FTP/A.pm b/cpan/libnet/lib/Net/FTP/A.pm index 45429af..dd51399 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.03"; +our $VERSION = "3.04"; our $buf; diff --git a/cpan/libnet/lib/Net/FTP/E.pm b/cpan/libnet/lib/Net/FTP/E.pm index 51722e8..8db2f5b 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.03"; +our $VERSION = "3.04"; 1; diff --git a/cpan/libnet/lib/Net/FTP/I.pm b/cpan/libnet/lib/Net/FTP/I.pm index 09e70b2..7dc5f5b 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.03"; +our $VERSION = "3.04"; our $buf; diff --git a/cpan/libnet/lib/Net/FTP/L.pm b/cpan/libnet/lib/Net/FTP/L.pm index ccd0de1..2f6d4e7 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.03"; +our $VERSION = "3.04"; 1; diff --git a/cpan/libnet/lib/Net/FTP/dataconn.pm b/cpan/libnet/lib/Net/FTP/dataconn.pm index 8dbbc6d..a671d64 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.03'; +our $VERSION = '3.04'; $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 ba375e0..ef838d2 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.03"; +our $VERSION = "3.04"; # Code for detecting if we can use SSL my $ssl_class = eval { @@ -758,7 +758,7 @@ sub DESTROY { ( $arg{SSL_verifycn_name} ||= $nntp->host ) =~s{(?<!:):[\w()]+$}{}; # strip port $arg{SSL_hostname} = $arg{SSL_verifycn_name} - if ! defined $arg{SSL_hostname}; + if ! defined $arg{SSL_hostname} && $class->can_client_sni; my $ok = $class->SUPER::start_SSL($nntp, SSL_verifycn_scheme => 'nntp', %arg diff --git a/cpan/libnet/lib/Net/Netrc.pm b/cpan/libnet/lib/Net/Netrc.pm index 567e082..1143cd7 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.03"; +our $VERSION = "3.04"; our $TESTING; diff --git a/cpan/libnet/lib/Net/POP3.pm b/cpan/libnet/lib/Net/POP3.pm index 5bebe9b..0c71e71 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.03"; +our $VERSION = "3.04"; # Code for detecting if we can use SSL my $ssl_class = eval { @@ -579,7 +579,7 @@ sub banner { ( $arg{SSL_verifycn_name} ||= $pop3->host ) =~s{(?<!:):[\w()]+$}{}; # strip port $arg{SSL_hostname} = $arg{SSL_verifycn_name} - if ! defined $arg{SSL_hostname}; + if ! defined $arg{SSL_hostname} && $class->can_client_sni; $arg{SSL_verifycn_scheme} ||= 'pop3'; my $ok = $class->SUPER::start_SSL($pop3,%arg); $@ = $ssl_class->errstr if !$ok; diff --git a/cpan/libnet/lib/Net/SMTP.pm b/cpan/libnet/lib/Net/SMTP.pm index 23a0cca..3036b2a 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.03"; +our $VERSION = "3.04"; # Code for detecting if we can use SSL my $ssl_class = eval { @@ -616,7 +616,7 @@ sub _STARTTLS { shift->command("STARTTLS")->response() == CMD_OK } ( $arg{SSL_verifycn_name} ||= $smtp->host ) =~s{(?<!:):[\w()]+$}{}; # strip port $arg{SSL_hostname} = $arg{SSL_verifycn_name} - if ! defined $arg{SSL_hostname}; + if ! defined $arg{SSL_hostname} && $class->can_client_sni; $arg{SSL_verifycn_scheme} ||= 'smtp'; my $ok = $class->SUPER::start_SSL($smtp,%arg); $@ = $ssl_class->errstr if !$ok; diff --git a/cpan/libnet/lib/Net/Time.pm b/cpan/libnet/lib/Net/Time.pm index 15bb6c4..49365cf 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.03"; +our $VERSION = "3.04"; our $TIMEOUT = 120; -- Perl5 Master Repository
