[libio-socket-ssl-perl] 01/01: Imported Upstream version 1.954

Salvatore Bonaccorso carnil at debian.org
Sun Sep 15 14:50:00 UTC 2013


This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to annotated tag upstream/1.954
in repository libio-socket-ssl-perl.

commit 509841ec9ee7bac4496ec3f1888d04c9798d86d5
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Sun Sep 15 16:44:12 2013 +0200

    Imported Upstream version 1.954
---
 Changes              |    5 ++++-
 MANIFEST             |    3 ++-
 META.json            |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 META.yml             |   48 ++++++++++++++++++++++----------------------
 Makefile.PL          |   20 ++++++++++---------
 README               |   12 +----------
 lib/IO/Socket/SSL.pm |    6 +++---
 7 files changed, 99 insertions(+), 49 deletions(-)

diff --git a/Changes b/Changes
index b2035c6..4eae5a9 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+1.954 2013/9/15
+- accept older versions of ExtUtils::MakeMaker and add meta information
+  like link to repository only for newer versions.
 1.953 2013/7/22
 - fixes to IO::Socket::SSL::Utils, thanks to rurban[AT]x-ray[DOT]at,
   RT#87052
@@ -298,7 +301,7 @@ v1.35 2010.12.06
   pointing out the problem, see also 
   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606058
 v1.34 2010.11.01
-- schema http for certificate verification changed to 
+- scheme http for certificate verification changed to 
   wildcards_in_cn=1, because according to rfc2818 this is valid and
   also seen in the wild
 - if upgrading socket from inet to ssl fails due to handshake problems
diff --git a/MANIFEST b/MANIFEST
index 520a273..fe28372 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -51,4 +51,5 @@ t/verify_hostname.t
 t/sni.t
 t/mitm.t
 util/export_certs.pl
-META.yml                                 Module meta-data (added by MakeMaker)
+META.yml                                 Module YAML meta-data (added by MakeMaker)
+META.json                                Module JSON meta-data (added by MakeMaker)
diff --git a/META.json b/META.json
new file mode 100644
index 0000000..2e08a29
--- /dev/null
+++ b/META.json
@@ -0,0 +1,54 @@
+{
+   "abstract" : "Nearly transparent SSL encapsulation for IO::Socket::INET.",
+   "author" : [
+      "Steffen Ullrich <sullr.org>, Peter Behroozi, Marko Asplund"
+   ],
+   "dynamic_config" : 1,
+   "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921",
+   "license" : [
+      "perl_5"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "IO-Socket-SSL",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "runtime" : {
+         "requires" : {
+            "Net::SSLeay" : "1.46",
+            "Scalar::Util" : "0"
+         }
+      }
+   },
+   "release_status" : "stable",
+   "resources" : {
+      "bugtracker" : {
+         "web" : "https://rt.cpan.org/Dist/Display.html?Queue=IO-Socket-SSL"
+      },
+      "homepage" : "https://github.com/noxxi/p5-io-socket-ssl",
+      "license" : [
+         "http://dev.perl.org/licenses/"
+      ],
+      "repository" : {
+         "url" : "https://github.com/noxxi/p5-io-socket-ssl"
+      }
+   },
+   "version" : "1.954"
+}
diff --git a/META.yml b/META.yml
index e456f88..61fce54 100644
--- a/META.yml
+++ b/META.yml
@@ -1,28 +1,28 @@
---- #YAML:1.0
-name:               IO-Socket-SSL
-version:            1.953
-abstract:           Nearly transparent SSL encapsulation for IO::Socket::INET.
+---
+abstract: 'Nearly transparent SSL encapsulation for IO::Socket::INET.'
 author:
-    - Steffen Ullrich <sullr.org>, Peter Behroozi, Marko Asplund
-license:            perl
-distribution_type:  module
-configure_requires:
-    ExtUtils::MakeMaker:  0
+  - 'Steffen Ullrich <sullr.org>, Peter Behroozi, Marko Asplund'
 build_requires:
-    ExtUtils::MakeMaker:  0
+  ExtUtils::MakeMaker: 0
+configure_requires:
+  ExtUtils::MakeMaker: 0
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921'
+license: perl
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4
+name: IO-Socket-SSL
+no_index:
+  directory:
+    - t
+    - inc
 requires:
-    Net::SSLeay:   1.46
-    Scalar::Util:  0
+  Net::SSLeay: 1.46
+  Scalar::Util: 0
 resources:
-    bugtracker:  https://rt.cpan.org/Dist/Display.html?Queue=IO-Socket-SSL
-    homepage:    https://github.com/noxxi/p5-io-socket-ssl
-    license:     http://dev.perl.org/licenses/
-    repository:  https://github.com/noxxi/p5-io-socket-ssl
-no_index:
-    directory:
-        - t
-        - inc
-generated_by:       ExtUtils::MakeMaker version 6.57_05
-meta-spec:
-    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
-    version:  1.4
+  bugtracker: https://rt.cpan.org/Dist/Display.html?Queue=IO-Socket-SSL
+  homepage: https://github.com/noxxi/p5-io-socket-ssl
+  license: http://dev.perl.org/licenses/
+  repository: https://github.com/noxxi/p5-io-socket-ssl
+version: 1.954
diff --git a/Makefile.PL b/Makefile.PL
index 60678f3..af45abb 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,7 +1,7 @@
 # vim: set sts=4 sw=4 ts=8 ai:
 
 use 5.008; 
-use ExtUtils::MakeMaker 6.46;
+use ExtUtils::MakeMaker;
 
 
 # Test to make sure that Net::SSLeay can be properly seeded!
@@ -85,18 +85,20 @@ WriteMakefile(
     'AUTHOR' => "Steffen Ullrich <sullr at cpan.org>, Peter Behroozi, Marko Asplund",
     'LICENSE' => 'perl',
     'DISTNAME' => 'IO-Socket-SSL',
-    'META_MERGE' => {
-	resources => {
-	    license     => 'http://dev.perl.org/licenses/',
-	    repository  => 'https://github.com/noxxi/p5-io-socket-ssl',
-	    homepage    => 'https://github.com/noxxi/p5-io-socket-ssl',
-	    bugtracker  => 'https://rt.cpan.org/Dist/Display.html?Queue=IO-Socket-SSL',
-	},
-    },
     'VERSION_FROM' => 'lib/IO/Socket/SSL.pm',
     'PREREQ_PM' => {
 	'Net::SSLeay' => 1.46,
 	'Scalar::Util' => 0,
     },
     'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz', },
+    $ExtUtils::MakeMaker::VERSION >= 6.46 ? (
+	'META_MERGE' => {
+	    resources => {
+		license     => 'http://dev.perl.org/licenses/',
+		repository  => 'https://github.com/noxxi/p5-io-socket-ssl',
+		homepage    => 'https://github.com/noxxi/p5-io-socket-ssl',
+		bugtracker  => 'https://rt.cpan.org/Dist/Display.html?Queue=IO-Socket-SSL',
+	    },
+	},
+    ):(),
 );
diff --git a/README b/README
index 63a48cb..044ae26 100644
--- a/README
+++ b/README
@@ -4,17 +4,7 @@ interface to SSL sockets. The class is a descendent of
 IO::Socket::INET.
 
 In order to use IO::Socket::SSL you need to have Net::SSLeay
-v1.21 or newer installed but at least version 1.30 is recommended
-to support features like session caching.
-
-To support the checks for common name and subject alternative
-names (verify_hostname_of_cert) you need at least Net::SSLeay
-version 1.33. Unfortunatly this version was not yet released
-at the time IO::Socket::SSL version 1.14 was released, so you
-might try the release Net::SSLeay 1.33_01 or better use the most
-current version from SVN at svn://svn.debian.org/net-ssleay/
-because 1.33_01 still contained critical bugs (see 
-http://svn.debian.org/wsvn/net-ssleay/?rev=222&sc=1)
+v1.46 or newer installed.
 
 For those who do not have a built-in random number generator
 (including most users of Solaris), you should install one
diff --git a/lib/IO/Socket/SSL.pm b/lib/IO/Socket/SSL.pm
index fa9fb74..69011c3 100644
--- a/lib/IO/Socket/SSL.pm
+++ b/lib/IO/Socket/SSL.pm
@@ -14,13 +14,13 @@
 package IO::Socket::SSL;
 
 use IO::Socket;
-use Net::SSLeay 1.21;
+use Net::SSLeay 1.46;
 use Exporter ();
 use Errno qw( EAGAIN ETIMEDOUT );
 use Carp;
 use strict;
 
-our $VERSION = '1.953';
+our $VERSION = '1.954';
 
 use constant SSL_VERIFY_NONE => Net::SSLeay::VERIFY_NONE();
 use constant SSL_VERIFY_PEER => Net::SSLeay::VERIFY_PEER();
@@ -1938,7 +1938,7 @@ IO::Socket::SSL -- SSL sockets with IO::Socket interface
 
 	# easy hostname verification 
 	SSL_verifycn_name => 'foo.bar', # defaults to PeerHost
-	SSL_verifycn_schema => 'http',
+	SSL_verifycn_scheme => 'http',
 
 	# SNI support
 	SSL_hostname => 'foo.bar', # defaults to PeerHost

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libio-socket-ssl-perl.git



More information about the Pkg-perl-cvs-commits mailing list