Upgrade to 3.14 as provided in perl-5.35.11

This commit is contained in:
Jitka Plesnikova 2022-05-12 09:56:39 +02:00
parent a5d5429c4a
commit 18dce84b4d
2 changed files with 924 additions and 9 deletions

View File

@ -0,0 +1,911 @@
From b8cbf3b3789baeba499d2aa32f9dc56d50ab141b Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Thu, 12 May 2022 09:41:15 +0200
Subject: [PATCH] Upgrade to 3.14
---
Makefile.PL | 2 +-
lib/Net/Cmd.pm | 8 +-
lib/Net/Config.pm | 4 +-
lib/Net/Domain.pm | 4 +-
lib/Net/FTP.pm | 6 +-
lib/Net/FTP/A.pm | 2 +-
lib/Net/FTP/E.pm | 2 +-
lib/Net/FTP/I.pm | 2 +-
lib/Net/FTP/L.pm | 2 +-
lib/Net/FTP/dataconn.pm | 4 +-
lib/Net/NNTP.pm | 4 +-
lib/Net/Netrc.pm | 4 +-
lib/Net/POP3.pm | 4 +-
lib/Net/SMTP.pm | 4 +-
lib/Net/Time.pm | 4 +-
t/changes.t | 48 -----------
t/critic.t | 48 -----------
t/external/ftp-ssl.t | 173 ----------------------------------------
t/external/pop3-ssl.t | 58 --------------
t/external/smtp-ssl.t | 57 -------------
t/pod.t | 51 ------------
t/pod_coverage.t | 85 --------------------
22 files changed, 28 insertions(+), 548 deletions(-)
delete mode 100644 t/changes.t
delete mode 100644 t/critic.t
delete mode 100644 t/external/ftp-ssl.t
delete mode 100644 t/external/pop3-ssl.t
delete mode 100644 t/external/smtp-ssl.t
delete mode 100644 t/pod.t
delete mode 100644 t/pod_coverage.t
diff --git a/Makefile.PL b/Makefile.PL
index bca19b1..df52526 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -235,7 +235,7 @@ MAIN: {
sub MY::post_initialize {
my $self = shift;
- return '';
+ return '' if $self->{PERL_CORE};
if (not -f $CfgFile) {
my @args = qw(Configure);
diff --git a/lib/Net/Cmd.pm b/lib/Net/Cmd.pm
index 41df8a2..b8dc728 100644
--- a/lib/Net/Cmd.pm
+++ b/lib/Net/Cmd.pm
@@ -19,14 +19,14 @@ use Symbol 'gensym';
use Errno 'EINTR';
BEGIN {
- if ($^O eq 'os390') {
+ if (ord "A" == 193) {
require Convert::EBCDIC;
# Convert::EBCDIC->import;
}
}
-our $VERSION = "3.13";
+our $VERSION = "3.14";
our @ISA = qw(Exporter);
our @EXPORT = qw(CMD_INFO CMD_OK CMD_MORE CMD_REJECT CMD_ERROR CMD_PENDING);
@@ -41,7 +41,7 @@ use constant DEF_REPLY_CODE => 421;
my %debug = ();
-my $tr = $^O eq 'os390' ? Convert::EBCDIC->new() : undef;
+my $tr = ord "A" == 193 ? Convert::EBCDIC->new() : undef;
sub toebcdic {
my $cmd = shift;
@@ -897,7 +897,7 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.13
+Version 3.14
=head1 DATE
diff --git a/lib/Net/Config.pm b/lib/Net/Config.pm
index 2f8417f..b9eb827 100644
--- a/lib/Net/Config.pm
+++ b/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.13";
+our $VERSION = "3.14";
our($CONFIGURE, $LIBNET_CFG);
@@ -368,7 +368,7 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.13
+Version 3.14
=head1 DATE
diff --git a/lib/Net/Domain.pm b/lib/Net/Domain.pm
index d69ac5b..7c017f2 100644
--- a/lib/Net/Domain.pm
+++ b/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.13";
+our $VERSION = "3.14";
my ($host, $domain, $fqdn) = (undef, undef, undef);
@@ -395,7 +395,7 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.13
+Version 3.14
=head1 DATE
diff --git a/lib/Net/FTP.pm b/lib/Net/FTP.pm
index 37836bf..b6b220d 100644
--- a/lib/Net/FTP.pm
+++ b/lib/Net/FTP.pm
@@ -23,7 +23,7 @@ use Net::Config;
use Socket;
use Time::Local;
-our $VERSION = '3.13';
+our $VERSION = '3.14';
our $IOCLASS;
my $family_key;
@@ -66,7 +66,7 @@ use constant TELNET_IAC => 255;
use constant TELNET_IP => 244;
use constant TELNET_DM => 242;
-use constant EBCDIC => $^O eq 'os390';
+use constant EBCDIC => ord 'A' == 193;
sub new {
my $pkg = shift;
@@ -2044,7 +2044,7 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.13
+Version 3.14
=head1 DATE
diff --git a/lib/Net/FTP/A.pm b/lib/Net/FTP/A.pm
index 5344638..1ea4831 100644
--- a/lib/Net/FTP/A.pm
+++ b/lib/Net/FTP/A.pm
@@ -13,7 +13,7 @@ use Carp;
use Net::FTP::dataconn;
our @ISA = qw(Net::FTP::dataconn);
-our $VERSION = "3.13";
+our $VERSION = "3.14";
our $buf;
diff --git a/lib/Net/FTP/E.pm b/lib/Net/FTP/E.pm
index 9b13707..7b8c2ea 100644
--- a/lib/Net/FTP/E.pm
+++ b/lib/Net/FTP/E.pm
@@ -8,6 +8,6 @@ use warnings;
use Net::FTP::I;
our @ISA = qw(Net::FTP::I);
-our $VERSION = "3.13";
+our $VERSION = "3.14";
1;
diff --git a/lib/Net/FTP/I.pm b/lib/Net/FTP/I.pm
index 726cba1..afcc51f 100644
--- a/lib/Net/FTP/I.pm
+++ b/lib/Net/FTP/I.pm
@@ -13,7 +13,7 @@ use Carp;
use Net::FTP::dataconn;
our @ISA = qw(Net::FTP::dataconn);
-our $VERSION = "3.13";
+our $VERSION = "3.14";
our $buf;
diff --git a/lib/Net/FTP/L.pm b/lib/Net/FTP/L.pm
index ac5e27e..9dfe491 100644
--- a/lib/Net/FTP/L.pm
+++ b/lib/Net/FTP/L.pm
@@ -8,6 +8,6 @@ use warnings;
use Net::FTP::I;
our @ISA = qw(Net::FTP::I);
-our $VERSION = "3.13";
+our $VERSION = "3.14";
1;
diff --git a/lib/Net/FTP/dataconn.pm b/lib/Net/FTP/dataconn.pm
index 5a257e6..979be7c 100644
--- a/lib/Net/FTP/dataconn.pm
+++ b/lib/Net/FTP/dataconn.pm
@@ -13,7 +13,7 @@ use Carp;
use Errno;
use Net::Cmd;
-our $VERSION = '3.13';
+our $VERSION = '3.14';
$Net::FTP::IOCLASS or die "please load Net::FTP before Net::FTP::dataconn";
our @ISA = $Net::FTP::IOCLASS;
@@ -224,7 +224,7 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.13
+Version 3.14
=head1 DATE
diff --git a/lib/Net/NNTP.pm b/lib/Net/NNTP.pm
index 3187f51..bbdc884 100644
--- a/lib/Net/NNTP.pm
+++ b/lib/Net/NNTP.pm
@@ -19,7 +19,7 @@ use Net::Cmd;
use Net::Config;
use Time::Local;
-our $VERSION = "3.13";
+our $VERSION = "3.14";
# Code for detecting if we can use SSL
my $ssl_class = eval {
@@ -1308,7 +1308,7 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.13
+Version 3.14
=head1 DATE
diff --git a/lib/Net/Netrc.pm b/lib/Net/Netrc.pm
index 50688ee..3dec11e 100644
--- a/lib/Net/Netrc.pm
+++ b/lib/Net/Netrc.pm
@@ -16,7 +16,7 @@ use warnings;
use Carp;
use FileHandle;
-our $VERSION = "3.13";
+our $VERSION = "3.14";
our $TESTING;
@@ -353,7 +353,7 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.13
+Version 3.14
=head1 DATE
diff --git a/lib/Net/POP3.pm b/lib/Net/POP3.pm
index 55f7be1..a4ed8eb 100644
--- a/lib/Net/POP3.pm
+++ b/lib/Net/POP3.pm
@@ -18,7 +18,7 @@ use IO::Socket;
use Net::Cmd;
use Net::Config;
-our $VERSION = "3.13";
+our $VERSION = "3.14";
# Code for detecting if we can use SSL
my $ssl_class = eval {
@@ -869,7 +869,7 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.13
+Version 3.14
=head1 DATE
diff --git a/lib/Net/SMTP.pm b/lib/Net/SMTP.pm
index 354ed8e..c04a362 100644
--- a/lib/Net/SMTP.pm
+++ b/lib/Net/SMTP.pm
@@ -19,7 +19,7 @@ use Net::Cmd;
use Net::Config;
use Socket;
-our $VERSION = "3.13";
+our $VERSION = "3.14";
# Code for detecting if we can use SSL
my $ssl_class = eval {
@@ -1052,7 +1052,7 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.13
+Version 3.14
=head1 DATE
diff --git a/lib/Net/Time.pm b/lib/Net/Time.pm
index 7f0a724..7906c1a 100644
--- a/lib/Net/Time.pm
+++ b/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.13";
+our $VERSION = "3.14";
our $TIMEOUT = 120;
@@ -190,7 +190,7 @@ License or the Artistic License, as specified in the F<LICENCE> file.
=head1 VERSION
-Version 3.13
+Version 3.14
=head1 DATE
diff --git a/t/changes.t b/t/changes.t
deleted file mode 100644
index 8235c1b..0000000
--- a/t/changes.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!perl
-#===============================================================================
-#
-# t/changes.t
-#
-# DESCRIPTION
-# Test script to check CPAN::Changes conformance.
-#
-# COPYRIGHT
-# Copyright (C) 2014 Steve Hay. All rights reserved.
-#
-# LICENCE
-# This script 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 LICENCE
-# file.
-#
-#===============================================================================
-
-use 5.008001;
-
-use strict;
-use warnings;
-
-use Test::More;
-
-#===============================================================================
-# MAIN PROGRAM
-#===============================================================================
-
-MAIN: {
- plan skip_all => 'Author testing only' unless $ENV{AUTHOR_TESTING};
-
- my $ok = eval {
- require Test::CPAN::Changes;
- Test::CPAN::Changes->import();
- 1;
- };
-
- if (not $ok) {
- plan skip_all => 'Test::CPAN::Changes required to test Changes';
- }
- else {
- changes_ok();
- }
-}
-
-#===============================================================================
diff --git a/t/critic.t b/t/critic.t
deleted file mode 100644
index 339dadb..0000000
--- a/t/critic.t
+++ /dev/null
@@ -1,48 +0,0 @@
-#!perl
-#===============================================================================
-#
-# t/critic.t
-#
-# DESCRIPTION
-# Test script to check Perl::Critic conformance.
-#
-# COPYRIGHT
-# Copyright (C) 2014 Steve Hay. All rights reserved.
-#
-# LICENCE
-# This script 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 LICENCE
-# file.
-#
-#===============================================================================
-
-use 5.008001;
-
-use strict;
-use warnings;
-
-use Test::More;
-
-#===============================================================================
-# MAIN PROGRAM
-#===============================================================================
-
-MAIN: {
- plan skip_all => 'Author testing only' unless $ENV{AUTHOR_TESTING};
-
- my $ok = eval {
- require Test::Perl::Critic;
- Test::Perl::Critic->import(-profile => '');
- 1;
- };
-
- if (not $ok) {
- plan skip_all => 'Test::Perl::Critic required to test with Perl::Critic';
- }
- else {
- all_critic_ok('.');
- }
-}
-
-#===============================================================================
diff --git a/t/external/ftp-ssl.t b/t/external/ftp-ssl.t
deleted file mode 100644
index 28c038a..0000000
--- a/t/external/ftp-ssl.t
+++ /dev/null
@@ -1,173 +0,0 @@
-#!perl
-
-use 5.008001;
-
-use strict;
-use warnings;
-
-use Net::FTP;
-use Test::More;
-use File::Temp;
-use IO::Socket::INET;
-
-my $server = 'test.rebex.net';
-my $debug = 0;
-
-plan skip_all => "no SSL support" if ! Net::FTP->can_ssl;
-require IO::Socket::SSL;
-
-
-# first try to connect w/o ftp
-# plain
-diag( "connect inet to $server:21" );
-IO::Socket::INET->new( "$server:21" ) or do {
- plan skip_all => "$server:21 not reachable";
-};
-
-# ssl to the right host
-diag( "connect inet to $server:990" );
-my $sock = IO::Socket::INET->new( "$server:990") or do {
- plan skip_all => "$server:990 not reachable";
-};
-
-# now we need CAs
-my $cafh = File::Temp->new( UNLINK => 0, SUFFIX => '.crt' );
-my %sslargs = ( SSL_ca_file => $cafh->filename );
-print $cafh <DATA>;
-close($cafh);
-
-diag( "upgrade to ssl $server:990" );
-IO::Socket::SSL->start_SSL($sock,
- SSL_verify_mode => 1,
- SSL_verifycn_name => $server,
- SSL_verifycn_scheme => 'ftp',
- %sslargs,
-) or do {
- plan skip_all => "$server:990 not upgradable to SSL: ".
- $IO::Socket::SSL::SSL_ERROR;
-};
-
-plan tests => 9;
-
-# first direct SSL
-diag( "connect ftp over ssl to $server" );
-my $ftp = Net::FTP->new($server,
- SSL => 1,
- %sslargs,
- Debug => $debug,
- Passive => 1,
-);
-ok($ftp,"ftp ssl connect $server");
-$ftp->login("anonymous",'net-sslglue-ftp@test.perl')
- or die "login to $server failed";
-diag("logged in");
-# check that we can talk on connection
-ok(~~$ftp->ls,"directory listing protected");
-$ftp->prot('C');
-ok(~~$ftp->ls,"directory listing clear");
-
-# then TLS upgrade inside plain connection
-$ftp = Net::FTP->new($server,
- Passive => 1,
- Debug => $debug,
- %sslargs
-);
-ok($ftp,"ftp plain connect $server");
-my $ok = $ftp->starttls;
-ok($ok,"ssl upgrade");
-$ftp->login("anonymous",'net-sslglue-ftp@test.perl')
- or die "login to $server failed";
-diag("logged in");
-# check that we can talk on connection
-ok(~~$ftp->ls,"directory listing protected");
-$ftp->prot('C');
-ok(~~$ftp->ls,"directory listing clear");
-$ok = $ftp->stoptls;
-ok($ok,"ssl downgrade");
-ok(~~$ftp->ls,"directory listing after downgrade");
-
-
-__DATA__
-# Subject: C=IL, O=StartCom Ltd., OU=Secure Digital Certificate Signing, CN=StartCom Class 2 Primary Intermediate Server CA
-# Issuer: C=IL, O=StartCom Ltd., OU=Secure Digital Certificate Signing, CN=StartCom Certification Authority
------BEGIN CERTIFICATE-----
-MIIGNDCCBBygAwIBAgIBGjANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
-Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDcxMDI0MjA1NzA5WhcNMTcxMDI0MjA1NzA5WjCB
-jDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsT
-IlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0
-YXJ0Q29tIENsYXNzIDIgUHJpbWFyeSBJbnRlcm1lZGlhdGUgU2VydmVyIENBMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4k85L6GMmoWtCA4IPlfyiAEh
-G5SpbOK426oZGEY6UqH1D/RujOqWjJaHeRNAUS8i8gyLhw9l33F0NENVsTUJm9m8
-H/rrQtCXQHK3Q5Y9upadXVACHJuRjZzArNe7LxfXyz6CnXPrB0KSss1ks3RVG7RL
-hiEs93iHMuAW5Nq9TJXqpAp+tgoNLorPVavD5d1Bik7mb2VsskDPF125w2oLJxGE
-d2H2wnztwI14FBiZgZl1Y7foU9O6YekO+qIw80aiuckfbIBaQKwn7UhHM7BUxkYa
-8zVhwQIpkFR+ZE3EMFICgtffziFuGJHXuKuMJxe18KMBL47SLoc6PbQpZ4rEAwID
-AQABo4IBrTCCAakwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFBHbI0X9VMxqcW+EigPXvvcBLyaGMB8GA1UdIwQYMBaAFE4L7xqkQFul
-F2mHMMo0aEPQQa7yMGYGCCsGAQUFBwEBBFowWDAnBggrBgEFBQcwAYYbaHR0cDov
-L29jc3Auc3RhcnRzc2wuY29tL2NhMC0GCCsGAQUFBzAChiFodHRwOi8vd3d3LnN0
-YXJ0c3NsLmNvbS9zZnNjYS5jcnQwWwYDVR0fBFQwUjAnoCWgI4YhaHR0cDovL3d3
-dy5zdGFydHNzbC5jb20vc2ZzY2EuY3JsMCegJaAjhiFodHRwOi8vY3JsLnN0YXJ0
-c3NsLmNvbS9zZnNjYS5jcmwwgYAGA1UdIAR5MHcwdQYLKwYBBAGBtTcBAgEwZjAu
-BggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBkZjA0
-BggrBgEFBQcCARYoaHR0cDovL3d3dy5zdGFydHNzbC5jb20vaW50ZXJtZWRpYXRl
-LnBkZjANBgkqhkiG9w0BAQUFAAOCAgEAnQfh7pB2MWcWRXCMy4SLS1doRKWJwfJ+
-yyiL9edwd9W29AshYKWhdHMkIoDW2LqNomJdCTVCKfs5Y0ULpLA4Gmj0lRPM4EOU
-7Os5GuxXKdmZbfWEzY5zrsncavqenRZkkwjHHMKJVJ53gJD2uSl26xNnSFn4Ljox
-uMnTiOVfTtIZPUOO15L/zzi24VuKUx3OrLR2L9j3QGPV7mnzRX2gYsFhw3XtsntN
-rCEnME5ZRmqTF8rIOS0Bc2Vb6UGbERecyMhK76F2YC2uk/8M1TMTn08Tzt2G8fz4
-NVQVqFvnhX76Nwn/i7gxSZ4Nbt600hItuO3Iw/G2QqBMl3nf/sOjn6H0bSyEd6Si
-BeEX/zHdmvO4esNSwhERt1Axin/M51qJzPeGmmGSTy+UtpjHeOBiS0N9PN7WmrQQ
-oUCcSyrcuNDUnv3xhHgbDlePaVRCaHvqoO91DweijHOZq1X1BwnSrzgDapADDC+P
-4uhDwjHpb62H5Y29TiyJS1HmnExUdsASgVOb7KD8LJzaGJVuHjgmQid4YAjff20y
-6NjAbx/rJnWfk/x7G/41kNxTowemP4NVCitOYoIlzmYwXSzg+RkbdbmdmFamgyd6
-0Y+NWZP8P3PXLrQsldiL98l+x/ydrHIEH9LMF/TtNGCbnkqXBP7dcg5XVFEGcE3v
-qhykguAzx/Q=
------END CERTIFICATE-----
-# Subject: C=IL, O=StartCom Ltd., OU=Secure Digital Certificate Signing, CN=StartCom Certification Authority
-# Issuer: C=IL, O=StartCom Ltd., OU=Secure Digital Certificate Signing, CN=StartCom Certification Authority
------BEGIN CERTIFICATE-----
-MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
-Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
-pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
-Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
-Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
-HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
-Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
-+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
-Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
-Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
-26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
-AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
-F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
-ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
-ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
-aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
-YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
-c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
-d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
-CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
-wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
-Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
-0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
-pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
-CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
-P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
-1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
-KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
-JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
-8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
-fyWl8kgAwKQB2j8=
------END CERTIFICATE-----
diff --git a/t/external/pop3-ssl.t b/t/external/pop3-ssl.t
deleted file mode 100644
index 554a8db..0000000
--- a/t/external/pop3-ssl.t
+++ /dev/null
@@ -1,58 +0,0 @@
-#!perl
-
-use 5.008001;
-
-use strict;
-use warnings;
-
-use Net::POP3;
-use Test::More;
-
-my $host = 'pop.gmx.net';
-my $debug = 0;
-
-plan skip_all => "no SSL support" if ! Net::POP3->can_ssl;
-{
-no warnings 'once';
-plan skip_all => "no verified SSL connection to $host:995 - $@" if ! eval {
- IO::Socket::SSL->new(PeerAddr => "$host:995", Timeout => 10)
- || die($IO::Socket::SSL::SSL_ERROR||$!);
-};
-}
-
-plan tests => 2;
-
-SKIP: {
- diag( "connect inet to $host:110" );
- skip "no inet connect to $host:110",1
- if ! IO::Socket::INET->new(PeerAddr => "$host:110", Timeout => 10);
- my $pop3 = Net::POP3->new($host, Debug => $debug, Timeout => 10)
- or skip "normal POP3 failed: $@",1;
- skip "no STARTTLS support",1 if $pop3->message !~/STARTTLS/;
-
- if (!$pop3->starttls) {
- fail("starttls failed: ".$pop3->code." $@")
- } else {
- # we now should have access to SSL stuff
- my $cipher = eval { $pop3->get_cipher };
- if (!$cipher) {
- fail("after starttls: not an SSL object");
- } elsif ( $pop3->quit ) {
- pass("starttls + quit ok, cipher=$cipher");
- } else {
- fail("quit after starttls failed: ".$pop3->code);
- }
- }
-}
-
-
-my $pop3 = Net::POP3->new($host, SSL => 1, Timeout => 10, Debug => $debug);
-# we now should have access to SSL stuff
-my $cipher = eval { $pop3->get_cipher };
-if (!$cipher) {
- fail("after ssl connect: not an SSL object");
-} elsif ( $pop3->quit ) {
- pass("ssl connect ok, cipher=$cipher");
-} else {
- fail("quit after direct ssl failed: ".$pop3->code);
-}
diff --git a/t/external/smtp-ssl.t b/t/external/smtp-ssl.t
deleted file mode 100644
index ccacbae..0000000
--- a/t/external/smtp-ssl.t
+++ /dev/null
@@ -1,57 +0,0 @@
-#!perl
-
-use 5.008001;
-
-use strict;
-use warnings;
-
-use Net::SMTP;
-use Test::More;
-
-my $host = 'mail.gmx.net';
-my $debug = 0;
-
-plan skip_all => "no SSL support" if ! Net::SMTP->can_ssl;
-{
-no warnings 'once';
-plan skip_all => "no verified SSL connection to $host:465 - $@" if ! eval {
- IO::Socket::SSL->new("$host:465")
- || die($IO::Socket::SSL::SSL_ERROR||$!);
-};
-}
-
-plan tests => 2;
-
-SKIP: {
- diag( "connect inet to $host:25" );
- skip "no inet connect to $host:25",1 if ! IO::Socket::INET->new("$host:25");
- my $smtp = Net::SMTP->new($host, Debug => $debug)
- or skip "normal SMTP failed: $@",1;
- skip "no STARTTLS support",1 if $smtp->message !~/STARTTLS/;
-
- if (!$smtp->starttls) {
- fail("starttls failed: ".$smtp->code." $@")
- } else {
- # we now should have access to SSL stuff
- my $cipher = eval { $smtp->get_cipher };
- if (!$cipher) {
- fail("after starttls: not an SSL object");
- } elsif ( $smtp->quit ) {
- pass("starttls + quit ok, cipher=$cipher");
- } else {
- fail("quit after starttls failed: ".$smtp->code);
- }
- }
-}
-
-
-my $smtp = Net::SMTP->new($host, SSL => 1, Debug => $debug);
-# we now should have access to SSL stuff
-my $cipher = eval { $smtp->get_cipher };
-if (!$cipher) {
- fail("after ssl connect: not an SSL object");
-} elsif ( $smtp->quit ) {
- pass("ssl connect ok, cipher=$cipher");
-} else {
- fail("quit after direct ssl failed: ".$smtp->code);
-}
diff --git a/t/pod.t b/t/pod.t
deleted file mode 100644
index e31ecf3..0000000
--- a/t/pod.t
+++ /dev/null
@@ -1,51 +0,0 @@
-#!perl
-#===============================================================================
-#
-# t/pod.t
-#
-# DESCRIPTION
-# Test script to check POD.
-#
-# COPYRIGHT
-# Copyright (C) 2014 Steve Hay. All rights reserved.
-#
-# LICENCE
-# This script 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 LICENCE
-# file.
-#
-#===============================================================================
-
-use 5.008001;
-
-use strict;
-use warnings;
-
-use Test::More;
-
-#===============================================================================
-# MAIN PROGRAM
-#===============================================================================
-
-MAIN: {
- plan skip_all => 'Author testing only' unless $ENV{AUTHOR_TESTING};
-
- my $ok = eval {
- require Test::Pod;
- Test::Pod->import();
- 1;
- };
-
- if (not $ok) {
- plan skip_all => 'Test::Pod required to test POD';
- }
- elsif ($Test::Pod::VERSION < 1.00) {
- plan skip_all => 'Test::Pod 1.00 or higher required to test POD';
- }
- else {
- all_pod_files_ok();
- }
-}
-
-#===============================================================================
diff --git a/t/pod_coverage.t b/t/pod_coverage.t
deleted file mode 100644
index d09c04e..0000000
--- a/t/pod_coverage.t
+++ /dev/null
@@ -1,85 +0,0 @@
-#!perl
-#===============================================================================
-#
-# t/pod_coverage.t
-#
-# DESCRIPTION
-# Test script to check POD coverage.
-#
-# COPYRIGHT
-# Copyright (C) 2014, 2015, 2020 Steve Hay. All rights reserved.
-#
-# LICENCE
-# This script 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 LICENCE
-# file.
-#
-#===============================================================================
-
-use 5.008001;
-
-use strict;
-use warnings;
-
-use Test::More;
-
-#===============================================================================
-# MAIN PROGRAM
-#===============================================================================
-
-MAIN: {
- plan skip_all => 'Author testing only' unless $ENV{AUTHOR_TESTING};
-
- my $ok = eval {
- require Test::Pod::Coverage;
- Test::Pod::Coverage->import();
- 1;
- };
-
- if (not $ok) {
- plan skip_all => 'Test::Pod::Coverage required to test POD coverage';
- }
- elsif ($Test::Pod::Coverage::VERSION < 0.08) {
- plan skip_all => 'Test::Pod::Coverage 0.08 or higher required to test POD coverage';
- }
- elsif (!eval { require Socket }) {
- plan skip_all => 'no Socket';
- }
- elsif (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
- plan skip_all => 'EBCDIC but no Convert::EBCDIC';
- }
- else {
- plan tests => 12;
- my $params = { coverage_class => qw(Pod::Coverage::CountParents) };
- pod_coverage_ok('Net::Cmd', {
- %$params,
- also_private => [qw(toascii toebcdic set_status)]
- });
- pod_coverage_ok('Net::Config', {
- %$params,
- also_private => [qw(is_external)]
- });
- pod_coverage_ok('Net::Domain', $params);
- pod_coverage_ok('Net::FTP', {
- %$params,
- also_private => [qw(authorise lsl ebcdic byte cmd)]
- });
- pod_coverage_ok('Net::Netrc', $params);
- pod_coverage_ok('Net::NNTP', $params);
- pod_coverage_ok('Net::POP3', $params);
- pod_coverage_ok('Net::SMTP', {
- %$params,
- also_private => [qw(datafh supports)]
- });
- pod_coverage_ok('Net::Time', $params);
- pod_coverage_ok('Net::FTP::A', $params);
- pod_coverage_ok('Net::FTP::dataconn', {
- %$params,
- also_private => [qw(can_read can_write cmd reading)]
- });
- pod_coverage_ok('Net::FTP::I', $params);
- }
-}
-
-#===============================================================================
--
2.34.3

View File

@ -1,3 +1,5 @@
%global base_version 3.13
# Run optional test
%if ! (0%{?rhel})
%bcond_without perl_libnet_enables_optional_test
@ -10,16 +12,18 @@
%bcond_without perl_libnet_enables_ssl
Name: perl-libnet
Version: 3.13
Release: 480%{?dist}
Version: 3.14
Release: 1%{?dist}
Summary: Perl clients for various network protocols
License: GPL+ or Artistic
URL: https://metacpan.org/release/libnet
Source0: https://cpan.metacpan.org/authors/id/S/SH/SHAY/libnet-%{version}.tar.gz
Source0: https://cpan.metacpan.org/authors/id/S/SH/SHAY/libnet-%{base_version}.tar.gz
# Convert Changes to UTF-8
Patch0: libnet-3.09-Normalize-Changes-encoding.patch
# Do not create Net/libnet.cfg, bug #1238689
Patch1: libnet-3.08-Do-not-create-Net-libnet.cfg.patch
# Unbundled from perl 5.35.11
Patch2: libnet-3.13-Upgrade-to-3.14.patch
BuildArch: noarch
BuildRequires: coreutils
BuildRequires: make
@ -69,10 +73,6 @@ BuildRequires: perl(Test::More)
# Core modules must be built without non-core dependencies
BuildRequires: perl(IO::Socket::SSL::Utils)
%endif
# Test::CPAN::Changes not used
# Test::Perl::Critic not used
# Test::Pod 1.00 not used
# Test::Pod::Coverage 0.08 not used
%endif
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl(File::Basename)
@ -103,9 +103,10 @@ consistent programming interface (API) to the client side of various
protocols used in the internet community.
%prep
%setup -q -n libnet-%{version}
%setup -q -n libnet-%{base_version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 </dev/null
@ -125,6 +126,9 @@ make test
%{_mandir}/man3/*
%changelog
* Thu May 12 2022 Jitka Plesnikova <jplesnik@redhat.com> - 3.14-1
- Upgrade to 3.14 as provided in perl-5.35.11
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.13-480
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
@ -224,7 +228,7 @@ make test
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Jan 06 2016 Petr Pisar <ppisar@redhat.com> - 3.08-1
- 8.08 bump
- 3.08 bump
* Mon Jul 20 2015 Petr Pisar <ppisar@redhat.com> - 3.07-1
- 3.07 bump