summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves Orton <demerphq@gmail.com>2023-03-20 18:52:13 +0100
committerYves Orton <demerphq@gmail.com>2023-03-20 21:31:24 +0100
commit6755d87e212e8b23e6975cb6ed741f3cd84e16b3 (patch)
treed229fdc3f621658a6d03003699442f636559a5cc
parent655778a2875f291b148aff1339db591f682577da (diff)
downloadperl-6755d87e212e8b23e6975cb6ed741f3cd84e16b3.tar.gz
cpan/libnet - update to version 3.15 and remove old customization info
We were bundling something that claimed to be 3.14 but which was not. This removes the customization info and sync with a rereleased 3.15 which is the same as the actual 3.14 but with a version bump to keep cmp_version.t happy. This is the change log 3.15 and 3.14: 3.15 2023-03-20 - Release for updating bleadperl to avoid cmp_version.t trouble. No code changes. 3.14 2022-05-22 - Remove broken link in Net::FTP manpage. [Mike Blackwell] - Fix EBCDIC detection. [Karl Williamson, PR#45] - Fix non-deterministic output in libnet.cfg. [Sergei Trofimovich, PR#44] - Fix TLS session reuse for dataconn with TLS 1.3 when using passive mode. [Steffen Ullrich, PR#41]
-rw-r--r--MANIFEST44
-rwxr-xr-xPorting/Maintainers.pl20
-rw-r--r--cpan/libnet/Makefile.PL2
-rw-r--r--cpan/libnet/lib/Net/Cmd.pm10
-rw-r--r--cpan/libnet/lib/Net/Config.pm6
-rw-r--r--cpan/libnet/lib/Net/Domain.pm6
-rw-r--r--cpan/libnet/lib/Net/FTP.pm32
-rw-r--r--cpan/libnet/lib/Net/FTP/A.pm2
-rw-r--r--cpan/libnet/lib/Net/FTP/E.pm2
-rw-r--r--cpan/libnet/lib/Net/FTP/I.pm2
-rw-r--r--cpan/libnet/lib/Net/FTP/L.pm2
-rw-r--r--cpan/libnet/lib/Net/FTP/dataconn.pm6
-rw-r--r--cpan/libnet/lib/Net/NNTP.pm6
-rw-r--r--cpan/libnet/lib/Net/Netrc.pm6
-rw-r--r--cpan/libnet/lib/Net/POP3.pm6
-rw-r--r--cpan/libnet/lib/Net/SMTP.pm6
-rw-r--r--cpan/libnet/lib/Net/Time.pm6
-rw-r--r--t/porting/customized.dat14
18 files changed, 64 insertions, 114 deletions
diff --git a/MANIFEST b/MANIFEST
index f390bd9319..9e2f768df8 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1529,36 +1529,36 @@ cpan/JSON-PP/t/rt_116998_wrong_character_offset.t
cpan/JSON-PP/t/rt_122270_old_xs_boolean.t
cpan/JSON-PP/t/rt_90071_incr_parse.t
cpan/JSON-PP/t/zero-mojibake.t
-cpan/libnet/lib/Net/Cmd.pm
-cpan/libnet/lib/Net/Config.pm
-cpan/libnet/lib/Net/Domain.pm
-cpan/libnet/lib/Net/FTP.pm
-cpan/libnet/lib/Net/FTP/A.pm
-cpan/libnet/lib/Net/FTP/dataconn.pm
-cpan/libnet/lib/Net/FTP/E.pm
-cpan/libnet/lib/Net/FTP/I.pm
-cpan/libnet/lib/Net/FTP/L.pm
-cpan/libnet/lib/Net/libnetFAQ.pod
-cpan/libnet/lib/Net/Netrc.pm
-cpan/libnet/lib/Net/NNTP.pm
-cpan/libnet/lib/Net/POP3.pm
-cpan/libnet/lib/Net/SMTP.pm
-cpan/libnet/lib/Net/Time.pm
-cpan/libnet/Makefile.PL
+cpan/libnet/lib/Net/Cmd.pm Module related to libnet
+cpan/libnet/lib/Net/Config.pm Module related to libnet
+cpan/libnet/lib/Net/Domain.pm Module related to libnet
+cpan/libnet/lib/Net/FTP.pm Module related to libnet
+cpan/libnet/lib/Net/FTP/A.pm Module related to libnet
+cpan/libnet/lib/Net/FTP/dataconn.pm Module related to libnet
+cpan/libnet/lib/Net/FTP/E.pm Module related to libnet
+cpan/libnet/lib/Net/FTP/I.pm Module related to libnet
+cpan/libnet/lib/Net/FTP/L.pm Module related to libnet
+cpan/libnet/lib/Net/libnetFAQ.pod libnet
+cpan/libnet/lib/Net/Netrc.pm Module related to libnet
+cpan/libnet/lib/Net/NNTP.pm Module related to libnet
+cpan/libnet/lib/Net/POP3.pm Module related to libnet
+cpan/libnet/lib/Net/SMTP.pm Module related to libnet
+cpan/libnet/lib/Net/Time.pm Module related to libnet
+cpan/libnet/Makefile.PL libnet
cpan/libnet/t/config.t libnet
cpan/libnet/t/datasend.t libnet
cpan/libnet/t/ftp.t libnet
cpan/libnet/t/hostname.t libnet
cpan/libnet/t/netrc.t libnet
cpan/libnet/t/nntp.t libnet
-cpan/libnet/t/nntp_ipv6.t
-cpan/libnet/t/nntp_ssl.t
-cpan/libnet/t/pop3_ipv6.t
-cpan/libnet/t/pop3_ssl.t
+cpan/libnet/t/nntp_ipv6.t Test file related to libnet
+cpan/libnet/t/nntp_ssl.t Test file related to libnet
+cpan/libnet/t/pop3_ipv6.t Test file related to libnet
+cpan/libnet/t/pop3_ssl.t Test file related to libnet
cpan/libnet/t/require.t libnet
cpan/libnet/t/smtp.t libnet
-cpan/libnet/t/smtp_ipv6.t
-cpan/libnet/t/smtp_ssl.t
+cpan/libnet/t/smtp_ipv6.t Test file related to libnet
+cpan/libnet/t/smtp_ssl.t Test file related to libnet
cpan/libnet/t/time.t libnet
cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm Locale::Simple
cpan/Locale-Maketext-Simple/t/0-signature.t Locale::Simple tests
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 2ff7bdb091..ee95d71c72 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -699,7 +699,8 @@ use File::Glob qw(:case);
},
'libnet' => {
- 'DISTRIBUTION' => 'SHAY/libnet-3.14.tar.gz',
+ 'DISTRIBUTION' => 'SHAY/libnet-3.15.tar.gz',
+ 'SYNCINFO' => 'yorton on Mon Mar 20 20:48:38 2023',
'MAIN_MODULE' => 'Net::Cmd',
'FILES' => q[cpan/libnet],
'EXCLUDED' => [
@@ -712,23 +713,6 @@ use File::Glob qw(:case);
qr(^demos/),
qr(^t/external/),
],
- # https://github.com/steve-m-hay/perl-libnet/pull/45
- 'CUSTOMIZED' => [
- 'lib/Net/Cmd.pm',
- 'lib/Net/Config.pm',
- 'lib/Net/Domain.pm',
- 'lib/Net/FTP.pm',
- 'lib/Net/FTP/A.pm',
- 'lib/Net/FTP/E.pm',
- 'lib/Net/FTP/I.pm',
- 'lib/Net/FTP/L.pm',
- 'lib/Net/FTP/dataconn.pm',
- 'lib/Net/NNTP.pm',
- 'lib/Net/Netrc.pm',
- 'lib/Net/POP3.pm',
- 'lib/Net/SMTP.pm',
- 'lib/Net/Time.pm',
- ],
},
'Locale::Maketext' => {
diff --git a/cpan/libnet/Makefile.PL b/cpan/libnet/Makefile.PL
index b0e9a7942c..141b27635e 100644
--- a/cpan/libnet/Makefile.PL
+++ b/cpan/libnet/Makefile.PL
@@ -66,7 +66,7 @@ MAIN: {
ABSTRACT => 'Collection of network protocol modules',
AUTHOR => 'Graham Barr <gbarr@pobox.com>, Steve Hay <shay@cpan.org>',
LICENSE => 'perl_5',
- VERSION => '3.14',
+ VERSION => '3.15',
META_MERGE => {
'meta-spec' => {
diff --git a/cpan/libnet/lib/Net/Cmd.pm b/cpan/libnet/lib/Net/Cmd.pm
index b8dc728937..f10df74354 100644
--- a/cpan/libnet/lib/Net/Cmd.pm
+++ b/cpan/libnet/lib/Net/Cmd.pm
@@ -1,7 +1,7 @@
# Net::Cmd.pm
#
# Copyright (C) 1995-2006 Graham Barr. All rights reserved.
-# Copyright (C) 2013-2016, 2020 Steve Hay. All rights reserved.
+# Copyright (C) 2013-2016, 2020, 2022 Steve Hay. All rights reserved.
# This module is free software; you can redistribute it and/or modify it under
# the same terms as Perl itself, i.e. under the terms of either the GNU General
# Public License or the Artistic License, as specified in the F<LICENCE> file.
@@ -26,7 +26,7 @@ BEGIN {
}
}
-our $VERSION = "3.14";
+our $VERSION = "3.15";
our @ISA = qw(Exporter);
our @EXPORT = qw(CMD_INFO CMD_OK CMD_MORE CMD_REJECT CMD_ERROR CMD_PENDING);
@@ -887,7 +887,7 @@ libnet as of version 1.22_02.
Copyright (C) 1995-2006 Graham Barr. All rights reserved.
-Copyright (C) 2013-2016, 2020 Steve Hay. All rights reserved.
+Copyright (C) 2013-2016, 2020, 2022 Steve Hay. All rights reserved.
=head1 LICENCE
@@ -897,11 +897,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.14
+Version 3.15
=head1 DATE
-23 Dec 2020
+20 March 2023
=head1 HISTORY
diff --git a/cpan/libnet/lib/Net/Config.pm b/cpan/libnet/lib/Net/Config.pm
index b9eb82792b..bdbd0034d8 100644
--- a/cpan/libnet/lib/Net/Config.pm
+++ b/cpan/libnet/lib/Net/Config.pm
@@ -18,7 +18,7 @@ use Socket qw(inet_aton inet_ntoa);
our @EXPORT = qw(%NetConfig);
our @ISA = qw(Net::LocalCfg Exporter);
-our $VERSION = "3.14";
+our $VERSION = "3.15";
our($CONFIGURE, $LIBNET_CFG);
@@ -368,11 +368,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.14
+Version 3.15
=head1 DATE
-23 Dec 2020
+20 March 2023
=head1 HISTORY
diff --git a/cpan/libnet/lib/Net/Domain.pm b/cpan/libnet/lib/Net/Domain.pm
index 7c017f2435..bf1ad2547b 100644
--- a/cpan/libnet/lib/Net/Domain.pm
+++ b/cpan/libnet/lib/Net/Domain.pm
@@ -19,7 +19,7 @@ use Net::Config;
our @ISA = qw(Exporter);
our @EXPORT_OK = qw(hostname hostdomain hostfqdn domainname);
-our $VERSION = "3.14";
+our $VERSION = "3.15";
my ($host, $domain, $fqdn) = (undef, undef, undef);
@@ -395,11 +395,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.14
+Version 3.15
=head1 DATE
-23 Dec 2020
+20 March 2023
=head1 HISTORY
diff --git a/cpan/libnet/lib/Net/FTP.pm b/cpan/libnet/lib/Net/FTP.pm
index b6b220df1f..cee0b2846b 100644
--- a/cpan/libnet/lib/Net/FTP.pm
+++ b/cpan/libnet/lib/Net/FTP.pm
@@ -1,7 +1,7 @@
# Net::FTP.pm
#
# Copyright (C) 1995-2004 Graham Barr. All rights reserved.
-# Copyright (C) 2013-2017, 2020 Steve Hay. All rights reserved.
+# Copyright (C) 2013-2017, 2020, 2022 Steve Hay. All rights reserved.
# This module is free software; you can redistribute it and/or modify it under
# the same terms as Perl itself, i.e. under the terms of either the GNU General
# Public License or the Artistic License, as specified in the F<LICENCE> file.
@@ -23,7 +23,7 @@ use Net::Config;
use Socket;
use Time::Local;
-our $VERSION = '3.14';
+our $VERSION = '3.15';
our $IOCLASS;
my $family_key;
@@ -1052,14 +1052,7 @@ sub _dataconn {
Timeout => $ftp->timeout,
can_ssl() ? (
SSL_startHandshake => 0,
- $ftp->is_SSL ? (
- SSL_reuse_ctx => $ftp,
- SSL_verifycn_name => ${*$ftp}{net_ftp_tlsargs}{SSL_verifycn_name},
- # 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}} ),
+ %{${*$ftp}{net_ftp_tlsargs}},
):(),
) or return;
} elsif (my $listen = delete ${*$ftp}{net_ftp_listen}) {
@@ -1966,19 +1959,6 @@ Reinitialize the connection, flushing all I/O and account information.
=back
-=head1 EXAMPLES
-
-For an example of the use of Net::FTP see
-
-=over 4
-
-=item L<https://www.csh.rit.edu/~adam/Progs/>
-
-C<autoftp> is a program that can retrieve, send, or list files via
-the FTP protocol in a non-interactive manner.
-
-=back
-
=head1 EXPORTS
I<None>.
@@ -2034,7 +2014,7 @@ libnet as of version 1.22_02.
Copyright (C) 1995-2004 Graham Barr. All rights reserved.
-Copyright (C) 2013-2017, 2020 Steve Hay. All rights reserved.
+Copyright (C) 2013-2017, 2020, 2022 Steve Hay. All rights reserved.
=head1 LICENCE
@@ -2044,11 +2024,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.14
+Version 3.15
=head1 DATE
-23 Dec 2020
+20 March 2023
=head1 HISTORY
diff --git a/cpan/libnet/lib/Net/FTP/A.pm b/cpan/libnet/lib/Net/FTP/A.pm
index 1ea4831023..9b93e16cbc 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.14";
+our $VERSION = "3.15";
our $buf;
diff --git a/cpan/libnet/lib/Net/FTP/E.pm b/cpan/libnet/lib/Net/FTP/E.pm
index 7b8c2ea8b1..a10b9729f0 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.14";
+our $VERSION = "3.15";
1;
diff --git a/cpan/libnet/lib/Net/FTP/I.pm b/cpan/libnet/lib/Net/FTP/I.pm
index afcc51f71e..1c2b8a6088 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.14";
+our $VERSION = "3.15";
our $buf;
diff --git a/cpan/libnet/lib/Net/FTP/L.pm b/cpan/libnet/lib/Net/FTP/L.pm
index 9dfe4912c9..d04fd920aa 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.14";
+our $VERSION = "3.15";
1;
diff --git a/cpan/libnet/lib/Net/FTP/dataconn.pm b/cpan/libnet/lib/Net/FTP/dataconn.pm
index 979be7c9c2..3db008df95 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.14';
+our $VERSION = '3.15';
$Net::FTP::IOCLASS or die "please load Net::FTP before Net::FTP::dataconn";
our @ISA = $Net::FTP::IOCLASS;
@@ -224,11 +224,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.14
+Version 3.15
=head1 DATE
-23 Dec 2020
+20 March 2023
=head1 HISTORY
diff --git a/cpan/libnet/lib/Net/NNTP.pm b/cpan/libnet/lib/Net/NNTP.pm
index bbdc8843d2..59ed0ef5b3 100644
--- a/cpan/libnet/lib/Net/NNTP.pm
+++ b/cpan/libnet/lib/Net/NNTP.pm
@@ -19,7 +19,7 @@ use Net::Cmd;
use Net::Config;
use Time::Local;
-our $VERSION = "3.14";
+our $VERSION = "3.15";
# Code for detecting if we can use SSL
my $ssl_class = eval {
@@ -1308,11 +1308,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.14
+Version 3.15
=head1 DATE
-23 Dec 2020
+20 March 2023
=head1 HISTORY
diff --git a/cpan/libnet/lib/Net/Netrc.pm b/cpan/libnet/lib/Net/Netrc.pm
index 3dec11e733..fe9abb9ddd 100644
--- a/cpan/libnet/lib/Net/Netrc.pm
+++ b/cpan/libnet/lib/Net/Netrc.pm
@@ -16,7 +16,7 @@ use warnings;
use Carp;
use FileHandle;
-our $VERSION = "3.14";
+our $VERSION = "3.15";
our $TESTING;
@@ -353,11 +353,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.14
+Version 3.15
=head1 DATE
-23 Dec 2020
+20 March 2023
=head1 HISTORY
diff --git a/cpan/libnet/lib/Net/POP3.pm b/cpan/libnet/lib/Net/POP3.pm
index a4ed8ebbe7..e6239c7c86 100644
--- a/cpan/libnet/lib/Net/POP3.pm
+++ b/cpan/libnet/lib/Net/POP3.pm
@@ -18,7 +18,7 @@ use IO::Socket;
use Net::Cmd;
use Net::Config;
-our $VERSION = "3.14";
+our $VERSION = "3.15";
# Code for detecting if we can use SSL
my $ssl_class = eval {
@@ -869,11 +869,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.14
+Version 3.15
=head1 DATE
-23 Dec 2020
+20 March 2023
=head1 HISTORY
diff --git a/cpan/libnet/lib/Net/SMTP.pm b/cpan/libnet/lib/Net/SMTP.pm
index c04a362d19..e592bb53e4 100644
--- a/cpan/libnet/lib/Net/SMTP.pm
+++ b/cpan/libnet/lib/Net/SMTP.pm
@@ -19,7 +19,7 @@ use Net::Cmd;
use Net::Config;
use Socket;
-our $VERSION = "3.14";
+our $VERSION = "3.15";
# Code for detecting if we can use SSL
my $ssl_class = eval {
@@ -1052,11 +1052,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.14
+Version 3.15
=head1 DATE
-23 Dec 2020
+20 March 2023
=head1 HISTORY
diff --git a/cpan/libnet/lib/Net/Time.pm b/cpan/libnet/lib/Net/Time.pm
index 7906c1ad22..237c1747a4 100644
--- a/cpan/libnet/lib/Net/Time.pm
+++ b/cpan/libnet/lib/Net/Time.pm
@@ -22,7 +22,7 @@ use Net::Config;
our @ISA = qw(Exporter);
our @EXPORT_OK = qw(inet_time inet_daytime);
-our $VERSION = "3.14";
+our $VERSION = "3.15";
our $TIMEOUT = 120;
@@ -190,11 +190,11 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.14
+Version 3.15
=head1 DATE
-23 Dec 2020
+20 March 2023
=head1 HISTORY
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 3e29db9c21..03ad16b5ff 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -15,18 +15,4 @@ Pod::Perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm 582be34c077c9ff44d99914724a0cc2
Test::Harness cpan/Test-Harness/t/harness.t 38b13cfc479d37d91c104b97dd364a74dfde0f2f
Win32API::File cpan/Win32API-File/File.pm 8fd212857f821cb26648878b96e57f13bf21b99e
Win32API::File cpan/Win32API-File/File.xs beb870fed4490d2faa547b4a8576b8d64d1d27c5
-libnet cpan/libnet/lib/Net/Cmd.pm effaa3ba5c2ea320869d0c769aa206fb75d7dd89
-libnet cpan/libnet/lib/Net/Config.pm 0f60601c070988f06a89347df74350b2521f40f1
-libnet cpan/libnet/lib/Net/Domain.pm 9b4c8e8f5a5cc8ce112a3eb5d266baf951b50d50
-libnet cpan/libnet/lib/Net/FTP.pm 46580751a97ddf9fededd846dc16e6d90ecf1fa1
-libnet cpan/libnet/lib/Net/FTP/A.pm 0168df59404d9974b889fd8afb19b99c55f21fdc
-libnet cpan/libnet/lib/Net/FTP/dataconn.pm 8c0285111481d2919305bf2fd5d566d2a4dcccd6
-libnet cpan/libnet/lib/Net/FTP/E.pm ddac78c22e36fd320f2dfe361fac57c3494561c3
-libnet cpan/libnet/lib/Net/FTP/I.pm cf2d9df91339c5b10f343d652e8673e587f8403e
-libnet cpan/libnet/lib/Net/FTP/L.pm 34db024e515a0364d9e4dd7075643b9ce8704853
-libnet cpan/libnet/lib/Net/Netrc.pm e9d809813b976163fe5e0d94dbd2a8f2edac91dc
-libnet cpan/libnet/lib/Net/NNTP.pm 4349ac4c908e6dbcfb16ec77eaf1a9a00d7c6e57
-libnet cpan/libnet/lib/Net/POP3.pm 55a74121d7e6a122f63a12cec945777f6b8aa80b
-libnet cpan/libnet/lib/Net/SMTP.pm 33efbd55e75486fe8201f9c63cf3f0704310a7b6
-libnet cpan/libnet/lib/Net/Time.pm 3c86cd4d4db9ae207070d2e54f4d523b9ad58230
version cpan/version/lib/version.pm a963b513cf812bd7f4d28b3422efd9904e70a34c