From 0d0bc2309b74ca16deba27d964086b3a30154bbd Mon Sep 17 00:00:00 2001 From: Steve Hay Date: Mon, 6 Jan 2014 08:54:50 +0000 Subject: [PATCH] Upgrade libnet from version 1.23 to 1.24 --- Porting/Maintainers.pl | 2 +- cpan/libnet/Makefile.PL | 2 +- cpan/libnet/Net/Config.pm | 18 +++++++++--------- cpan/libnet/Net/FTP/A.pm | 6 +++--- pod/perldelta.pod | 6 ++++++ t/porting/customized.dat | 2 +- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 31b4e8e..81d5fb3 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -667,7 +667,7 @@ use File::Glob qw(:case); }, 'libnet' => { - 'DISTRIBUTION' => 'SHAY/libnet-1.23.tar.gz', + 'DISTRIBUTION' => 'SHAY/libnet-1.24.tar.gz', 'FILES' => q[cpan/libnet], 'EXCLUDED' => [ qw( Configure diff --git a/cpan/libnet/Makefile.PL b/cpan/libnet/Makefile.PL index 905a283..1d1ad8d 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.23', # finds $VERSION + VERSION => '1.24', # finds $VERSION AUTHOR => 'Graham Barr ', ABSTRACT => 'Collection of Network protocol modules', ); diff --git a/cpan/libnet/Net/Config.pm b/cpan/libnet/Net/Config.pm index 885d9cb..ba16332 100644 --- a/cpan/libnet/Net/Config.pm +++ b/cpan/libnet/Net/Config.pm @@ -13,7 +13,7 @@ use strict; @EXPORT = qw(%NetConfig); @ISA = qw(Net::LocalCfg Exporter); -$VERSION = "1.12"; +$VERSION = "1.13"; eval { local $SIG{__DIE__}; require Net::LocalCfg }; @@ -213,23 +213,23 @@ sequence of commands that Net::FTP will use =over 4 -=item 0 +=item 0Z<> There is no firewall -=item 1 +=item 1Z<> USER user@remote.host PASS pass -=item 2 +=item 2Z<> USER fwuser PASS fwpass USER user@remote.host PASS pass -=item 3 +=item 3Z<> USER fwuser PASS fwpass @@ -237,7 +237,7 @@ There is no firewall USER user PASS pass -=item 4 +=item 4Z<> USER fwuser PASS fwpass @@ -245,19 +245,19 @@ There is no firewall USER user PASS pass -=item 5 +=item 5Z<> USER user@fwuser@remote.site PASS pass@fwpass -=item 6 +=item 6Z<> USER fwuser@remote.site PASS fwpass USER user PASS pass -=item 7 +=item 7Z<> USER user@remote.host PASS pass diff --git a/cpan/libnet/Net/FTP/A.pm b/cpan/libnet/Net/FTP/A.pm index 427d02b..c117d69 100644 --- a/cpan/libnet/Net/FTP/A.pm +++ b/cpan/libnet/Net/FTP/A.pm @@ -10,7 +10,7 @@ use Carp; require Net::FTP::dataconn; @ISA = qw(Net::FTP::dataconn); -$VERSION = "1.18"; +$VERSION = "1.19"; sub read { @@ -77,8 +77,8 @@ sub write { my $timeout = @_ ? shift: $data->timeout; my $nr = (my $tmp = substr($buf, 0, $size)) =~ tr/\r\n/\015\012/; - $tmp =~ s/([^\015])\012/$1\015\012/sg if $nr; - $tmp =~ s/^\012/\015\012/ unless ${*$data}{'net_ftp_outcr'}; + $tmp =~ s/(? has been upgraded from version 2.56 to 2.57. UTF-8 is no longer used in the C source (which some compilers didn't like), and some POD errors have been fixed in the documentation. +=item * + +The libnet module collection has been upgraded from version 1.23 to 1.24. + +The handling of CRLF characters in L has been fixed. + =back =head2 Removed Modules and Pragmata diff --git a/t/porting/customized.dat b/t/porting/customized.dat index bbd5040..2f4044b 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -13,7 +13,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 6b10ac98e672bfebb8f49b9720a93442645208b3 +libnet cpan/libnet/Makefile.PL 8cc723f0e1d2177af46ef4e41fc1f362085520df podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6 podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69 version cpan/version/lib/version.pm 3934bcc033f1f15aed2ba78017f71d2e5482deca -- 2.7.4