From 4dadbf4eb332a886023b2451ab3ef08d9af31423 Mon Sep 17 00:00:00 2001
From: Steve Hay <steve.m.hay@googlemail.com>
Date: Thu, 27 Nov 2014 08:44:25 +0000
Subject: Increase minimum requred IO::Socket::SSL version from 1.999 to 2.007

This fixes data connection problems in Net::FTP.  [Steffen Ullrich, CPAN
RT#100529]
---
 Changes               | 4 ++++
 Makefile.PL           | 2 +-
 lib/Net/FTP.pm        | 8 ++++----
 lib/Net/NNTP.pm       | 4 ++--
 lib/Net/POP3.pm       | 4 ++--
 lib/Net/SMTP.pm       | 4 ++--
 lib/Net/libnetFAQ.pod | 2 +-
 7 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Changes b/Changes
index 4575712..ff36608 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,10 @@ Revision history for Perl distribution libnet
 
 3.03 Development
 
+    - Increased minimum requred IO::Socket::SSL version from 1.999 to 2.007 to
+      fix data connection problems in Net::FTP.  [Steffen Ullrich, CPAN
+      RT#100529]
+
     - Fixed a broken port() call in pasv_xfer()/pasv_xfer_unique() in Net::FTP.
       [Mario Preksavec, PR#8]
 
diff --git a/Makefile.PL b/Makefile.PL
index 81e8ed8..bbbdf85 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -107,7 +107,7 @@ MAIN: {
                     prereqs => {
                         runtime => {
                             requires => {
-                                'IO::Socket::SSL' => '1.999'
+                                'IO::Socket::SSL' => '2.007'
                             }
                         }
                     }
diff --git a/lib/Net/FTP.pm b/lib/Net/FTP.pm
index 2d3149e..7141734 100644
--- a/lib/Net/FTP.pm
+++ b/lib/Net/FTP.pm
@@ -33,11 +33,11 @@ BEGIN {
     require IO::Socket::SSL;
     # first version with default CA on most platforms
     no warnings 'numeric';
-    IO::Socket::SSL->VERSION(1.999);
+    IO::Socket::SSL->VERSION(2.007);
   } && 'IO::Socket::SSL';
 
   my $nossl_warn = !$ssl_class &&
-    'To use SSL please install IO::Socket::SSL with version>=1.999';
+    'To use SSL please install IO::Socket::SSL with version>=2.007';
 
   # Code for detecting if we can use IPv6
   my $inet6_class = eval {
@@ -110,7 +110,7 @@ sub new {
     $tlsargs{$_} = $arg{$_} for(grep { m{^SSL_} } keys %arg);
 
   } elsif ($arg{SSL}) {
-    croak("IO::Socket::SSL >= 1.999 needed for SSL support");
+    croak("IO::Socket::SSL >= 2.007 needed for SSL support");
   }
 
   my $ftp = $pkg->SUPER::new(
@@ -290,7 +290,7 @@ sub size {
 
 sub starttls {
   my $ftp = shift;
-  can_ssl() or croak("IO::Socket::SSL >= 1.999 needed for SSL support");
+  can_ssl() or croak("IO::Socket::SSL >= 2.007 needed for SSL support");
   $ftp->is_SSL and croak("called starttls within SSL session");
   $ftp->_AUTH('TLS') == CMD_OK or return;
 
diff --git a/lib/Net/NNTP.pm b/lib/Net/NNTP.pm
index 60f080f..b63d421 100644
--- a/lib/Net/NNTP.pm
+++ b/lib/Net/NNTP.pm
@@ -27,11 +27,11 @@ my $ssl_class = eval {
   require IO::Socket::SSL;
   # first version with default CA on most platforms
   no warnings 'numeric';
-  IO::Socket::SSL->VERSION(1.999);
+  IO::Socket::SSL->VERSION(2.007);
 } && 'IO::Socket::SSL';
 
 my $nossl_warn = !$ssl_class &&
-  'To use SSL please install IO::Socket::SSL with version>=1.999';
+  'To use SSL please install IO::Socket::SSL with version>=2.007';
 
 # Code for detecting if we can use IPv6
 my $inet6_class = eval {
diff --git a/lib/Net/POP3.pm b/lib/Net/POP3.pm
index 6109479..ae102a3 100644
--- a/lib/Net/POP3.pm
+++ b/lib/Net/POP3.pm
@@ -26,11 +26,11 @@ my $ssl_class = eval {
   require IO::Socket::SSL;
   # first version with default CA on most platforms
   no warnings 'numeric';
-  IO::Socket::SSL->VERSION(1.999);
+  IO::Socket::SSL->VERSION(2.007);
 } && 'IO::Socket::SSL';
 
 my $nossl_warn = !$ssl_class &&
-  'To use SSL please install IO::Socket::SSL with version>=1.999';
+  'To use SSL please install IO::Socket::SSL with version>=2.007';
 
 # Code for detecting if we can use IPv6
 my $inet6_class = eval {
diff --git a/lib/Net/SMTP.pm b/lib/Net/SMTP.pm
index 58d74ff..5cc3922 100644
--- a/lib/Net/SMTP.pm
+++ b/lib/Net/SMTP.pm
@@ -27,11 +27,11 @@ my $ssl_class = eval {
   require IO::Socket::SSL;
   # first version with default CA on most platforms
   no warnings 'numeric';
-  IO::Socket::SSL->VERSION(1.999);
+  IO::Socket::SSL->VERSION(2.007);
 } && 'IO::Socket::SSL';
 
 my $nossl_warn = !$ssl_class &&
-  'To use SSL please install IO::Socket::SSL with version>=1.999';
+  'To use SSL please install IO::Socket::SSL with version>=2.007';
 
 # Code for detecting if we can use IPv6
 my $inet6_class = eval {
diff --git a/lib/Net/libnetFAQ.pod b/lib/Net/libnetFAQ.pod
index 260706a..f8ad797 100644
--- a/lib/Net/libnetFAQ.pod
+++ b/lib/Net/libnetFAQ.pod
@@ -54,7 +54,7 @@ which requires Convert::EBCDIC.
 
 Authen::SASL is required for AUTH support.
 
-IO::Socket::SSL version 1.999 or higher is required for SSL support.
+IO::Socket::SSL version 2.007 or higher is required for SSL support.
 
 IO::Socket::IP version 0.20 or IO::Socket::INET6 version 2.62 is
 required for IPv6 support.
-- 
cgit v1.2.3-24-ge0c7