Fix PAUSE indexing problem again

Sigh. Net::SMTP::SSL is already used by Net-SMTP-SSL.

4 files changed, 13 insertions, 12 deletions

diff --git a/Changes b/Changes
index 053bbff..2c27a70 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 libnet 1.30  -- TODO
 
-  * TODO
+  * Sigh. Fix PAUSE indexing problem again. Net::SMTP::SSL is already used by
+    Net-SMTP-SSL.
 
 libnet 1.29  -- Wed Oct 08 2014
 
diff --git a/lib/Net/FTP.pm b/lib/Net/FTP.pm
index e8b2d95..fe88539 100644
--- a/lib/Net/FTP.pm
+++ b/lib/Net/FTP.pm
@@ -24,7 +24,7 @@ use Net::Config;
 use Socket 1.3;
 use Time::Local;
 
-our $VERSION = '2.80';
+our $VERSION = '2.81';
 
 our $IOCLASS;
 BEGIN {
@@ -101,7 +101,7 @@ sub new {
       SSL_verifycn_scheme => 'ftp',
       SSL_verifycn_name => $hostname,
       # reuse SSL session of control connection in data connections
-      SSL_session_cache => Net::FTP::SSL_SingleSessionCache->new,
+      SSL_session_cache => Net::FTP::_SSL_SingleSessionCache->new,
     );
     # user defined SSL arg
     $tlsargs{$_} = $arg{$_} for(grep { m{^SSL_} } keys %arg);
@@ -1377,7 +1377,7 @@ sub _REIN { shift->unsupported(@_) }
 {
   # Session Cache with single entry
   # used to make sure that we reuse same session for control and data channels
-  package Net::FTP::SSL_SingleSessionCache;
+  package Net::FTP::_SSL_SingleSessionCache;
   sub new { my $x; return bless \$x,shift }
   sub add_session {
     my ($cache,$key,$session) = @_;
diff --git a/lib/Net/POP3.pm b/lib/Net/POP3.pm
index dff133f..961cb21 100644
--- a/lib/Net/POP3.pm
+++ b/lib/Net/POP3.pm
@@ -19,7 +19,7 @@ use IO::Socket;
 use Net::Cmd;
 use Net::Config;
 
-our $VERSION = "2.33";
+our $VERSION = "2.34";
 
 # Code for detecting if we can use SSL
 my $ssl_class = eval {
@@ -85,7 +85,7 @@ sub new {
 
   ${*$obj}{'net_pop3_arg'} = \%arg;
   if ($arg{SSL}) {
-    Net::POP3::SSL->start_SSL($obj,
+    Net::POP3::_SSL->start_SSL($obj,
       SSL_verifycn_name => $host,%arg
     ) or return;
   }
@@ -136,7 +136,7 @@ sub starttls {
   my $self = shift;
   $ssl_class or die $nossl_warn;
   $self->_STLS or return;
-  Net::POP3::SSL->start_SSL($self,
+  Net::POP3::_SSL->start_SSL($self,
     %{ ${*$self}{'net_pop3_arg'} }, # (ssl) args given in new
     @_   # more (ssl) args
   ) or return;
@@ -570,7 +570,7 @@ sub banner {
 }
 
 {
-  package Net::POP3::SSL;
+  package Net::POP3::_SSL;
   our @ISA = ( $ssl_class ? ($ssl_class):(), 'Net::POP3' );
   sub starttls { die "POP3 connection is already in SSL mode" }
   sub start_SSL {
diff --git a/lib/Net/SMTP.pm b/lib/Net/SMTP.pm
index b8c6323..589548e 100644
--- a/lib/Net/SMTP.pm
+++ b/lib/Net/SMTP.pm
@@ -20,7 +20,7 @@ use Net::Cmd;
 use Net::Config;
 use Socket 1.3;
 
-our $VERSION = "2.36";
+our $VERSION = "2.37";
 
 # Code for detecting if we can use SSL
 my $ssl_class = eval {
@@ -87,7 +87,7 @@ sub new {
 
   ${*$obj}{'net_smtp_arg'} = \%arg;
   if ($arg{SSL}) {
-    Net::SMTP::SSL->start_SSL($obj,SSL_verifycn_name => $host,%arg)
+    Net::SMTP::_SSL->start_SSL($obj,SSL_verifycn_name => $host,%arg)
       or return;
   }
 
@@ -254,7 +254,7 @@ sub starttls {
   my $self = shift;
   $ssl_class or die $nossl_warn;
   $self->_STARTTLS or return;
-  Net::SMTP::SSL->start_SSL($self,
+  Net::SMTP::_SSL->start_SSL($self,
     %{ ${*$self}{'net_smtp_arg'} }, # (ssl) args given in new
     @_   # more (ssl) args
   ) or return;
@@ -603,7 +603,7 @@ sub _STARTTLS { shift->command("STARTTLS")->response() == CMD_OK }
 
 
 {
-  package Net::SMTP::SSL;
+  package Net::SMTP::_SSL;
   our @ISA = ( $ssl_class ? ($ssl_class):(), 'Net::SMTP' );
   sub starttls { die "SMTP connection is already in SSL mode" }
   sub start_SSL {