|
 |
fb6d68 |
From 23d7f6ae0009ab5f2aa9887d1204a98de7fd2326 Mon Sep 17 00:00:00 2001
|
|
|
fb6d68 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
fb6d68 |
Date: Wed, 21 Mar 2018 14:50:08 +0100
|
|
|
fb6d68 |
Subject: [PATCH 3/4] Fix PAUSE indexing problem
|
|
|
fb6d68 |
MIME-Version: 1.0
|
|
|
fb6d68 |
Content-Type: text/plain; charset=UTF-8
|
|
|
fb6d68 |
Content-Transfer-Encoding: 8bit
|
|
|
fb6d68 |
|
|
|
fb6d68 |
Ported to Net::SMTP as found in Perl 5.16.3 from libnet upstream
|
|
|
fb6d68 |
commits:
|
|
|
fb6d68 |
|
|
|
fb6d68 |
commit 4b426b971e4acf37fdbd08ffa88da4e6979fa133
|
|
|
fb6d68 |
Author: Steve Hay <steve.m.hay@googlemail.com>
|
|
|
fb6d68 |
Date: Wed Oct 8 08:57:53 2014 +0100
|
|
|
fb6d68 |
|
|
|
fb6d68 |
Fix PAUSE indexing problem
|
|
|
fb6d68 |
|
|
|
fb6d68 |
Net::POP3::_SSLified and Net::SMTP::_SSLified are already used by
|
|
|
fb6d68 |
Net-SSLGlue.
|
|
|
fb6d68 |
|
|
|
fb6d68 |
commit 40a3dfc5c40a7fbe0a777a4af50978354e4903f4
|
|
|
fb6d68 |
Author: Steve Hay <steve.m.hay@googlemail.com>
|
|
|
fb6d68 |
Date: Wed Oct 8 09:11:31 2014 +0100
|
|
|
fb6d68 |
|
|
|
fb6d68 |
Fix PAUSE indexing problem again
|
|
|
fb6d68 |
|
|
|
fb6d68 |
Sigh. Net::SMTP::SSL is already used by Net-SMTP-SSL.
|
|
|
fb6d68 |
|
|
|
fb6d68 |
This is to avoid clashes in name space when somebody uses Net-SSLGlue.
|
|
|
fb6d68 |
|
|
|
fb6d68 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
fb6d68 |
---
|
|
|
fb6d68 |
cpan/libnet/Net/SMTP.pm | 6 +++---
|
|
|
fb6d68 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
fb6d68 |
|
|
|
fb6d68 |
diff --git a/cpan/libnet/Net/SMTP.pm b/cpan/libnet/Net/SMTP.pm
|
|
|
fb6d68 |
index 7dbf3df..6475c86 100644
|
|
|
fb6d68 |
--- a/cpan/libnet/Net/SMTP.pm
|
|
|
fb6d68 |
+++ b/cpan/libnet/Net/SMTP.pm
|
|
|
fb6d68 |
@@ -72,7 +72,7 @@ sub new {
|
|
|
fb6d68 |
|
|
|
fb6d68 |
${*$obj}{'net_smtp_arg'} = \%arg;
|
|
|
fb6d68 |
if ($arg{SSL}) {
|
|
|
fb6d68 |
- Net::SMTP::_SSLified->start_SSL($obj,SSL_verifycn_name => $host,%arg)
|
|
|
fb6d68 |
+ Net::SMTP::_SSL->start_SSL($obj,SSL_verifycn_name => $host,%arg)
|
|
|
fb6d68 |
or return;
|
|
|
fb6d68 |
}
|
|
|
fb6d68 |
|
|
|
fb6d68 |
@@ -217,7 +217,7 @@ sub starttls {
|
|
|
fb6d68 |
my $self = shift;
|
|
|
fb6d68 |
$ssl_class or die $nossl_warn;
|
|
|
fb6d68 |
$self->_STARTTLS or return;
|
|
|
fb6d68 |
- Net::SMTP::_SSLified->start_SSL($self,
|
|
|
fb6d68 |
+ Net::SMTP::_SSL->start_SSL($self,
|
|
|
fb6d68 |
%{ ${*$self}{'net_smtp_arg'} }, # (ssl) args given in new
|
|
|
fb6d68 |
@_ # more (ssl) args
|
|
|
fb6d68 |
) or return;
|
|
|
fb6d68 |
@@ -567,7 +567,7 @@ sub _STARTTLS { shift->command("STARTTLS", @_)->response() == CMD_OK }
|
|
|
fb6d68 |
|
|
|
fb6d68 |
|
|
|
fb6d68 |
{
|
|
|
fb6d68 |
- package Net::SMTP::_SSLified;
|
|
|
fb6d68 |
+ package Net::SMTP::_SSL;
|
|
|
fb6d68 |
our @ISA = ( $ssl_class ? ($ssl_class):(), 'Net::SMTP' );
|
|
|
fb6d68 |
sub starttls { die "SMTP connection is already in SSL mode" }
|
|
|
fb6d68 |
sub start_SSL {
|
|
|
fb6d68 |
--
|
|
|
fb6d68 |
2.14.3
|
|
|
fb6d68 |
|