r65666 - in /trunk/libio-socket-ssl-perl: Changes META.yml SSL.pm debian/changelog

[carnil at users.alioth.debian.org]

Author: carnil
Date: Thu Dec  9 14:43:36 2010
New Revision: 65666

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=65666
Log:
New upstream release (Closes: #606243, #606248, #606249).

Modified:
    trunk/libio-socket-ssl-perl/Changes
    trunk/libio-socket-ssl-perl/META.yml
    trunk/libio-socket-ssl-perl/SSL.pm
    trunk/libio-socket-ssl-perl/debian/changelog

Modified: trunk/libio-socket-ssl-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/Changes?rev=65666&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/Changes (original)
+++ trunk/libio-socket-ssl-perl/Changes Thu Dec  9 14:43:36 2010
@@ -1,4 +1,9 @@
 
+v1.37 2010.12.09
+- don't complain about invalid certificate locations if user explicitly 
+  set SSL_ca_path and SSL_ca_file to undef. Assume that user knows what
+  he is doing and will work around the problems by itself.
+  http://rt.cpan.org/Ticket/Display.html?id=63741
 v1.36 2010.12.08
 - update documentation for SSL_verify_callback based on 
   https://rt.cpan.org/Ticket/Display.html?id=63743

Modified: trunk/libio-socket-ssl-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/META.yml?rev=65666&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/META.yml (original)
+++ trunk/libio-socket-ssl-perl/META.yml Thu Dec  9 14:43:36 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               IO-Socket-SSL
-version:            1.36
+version:            1.37
 abstract:           Nearly transparent SSL encapsulation for IO::Socket::INET.
 author:
     - Steffen Ullrich & Peter Behroozi & Marko Asplund

Modified: trunk/libio-socket-ssl-perl/SSL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/SSL.pm?rev=65666&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/SSL.pm (original)
+++ trunk/libio-socket-ssl-perl/SSL.pm Thu Dec  9 14:43:36 2010
@@ -78,7 +78,7 @@
 	}) {
 		@ISA = qw(IO::Socket::INET);
 	}
-	$VERSION = '1.36';
+	$VERSION = '1.37';
 	$GLOBAL_CONTEXT_ARGS = {};
 
 	#Make $DEBUG another name for $Net::SSLeay::trace
@@ -1364,6 +1364,7 @@
 
 	my $verify_mode = $arg_hash->{SSL_verify_mode};
 	if ( $verify_mode != Net::SSLeay::VERIFY_NONE() and
+	    ( defined $arg_hash->{SSL_ca_file} || defined $arg_hash->{SSL_ca_path}) and
 		! Net::SSLeay::CTX_load_verify_locations(
 			$ctx, $arg_hash->{SSL_ca_file} || '',$arg_hash->{SSL_ca_path} || '') ) {
 		return IO::Socket::SSL->error("Invalid certificate authority locations");
@@ -1707,6 +1708,7 @@
 certificate authority, then you should use this option to locate the file
 containing the certificateZ<>(s) of the reputable certificate authorities if it is
 not already in the file F<certs/my-ca.pem>.
+If you definitly want no SSL_ca_file used you should set it to undef.
 
 =item SSL_ca_path
 
@@ -1715,6 +1717,7 @@
 as well as an index of the certificates.  If you want to use that directory for
 validation purposes, and that directory is not F<ca/>, then use this option to
 point IO::Socket::SSL to the right place to look.
+If you definitly want no SSL_ca_path used you should set it to undef.
 
 =item SSL_verify_mode
 

Modified: trunk/libio-socket-ssl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/debian/changelog?rev=65666&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/debian/changelog (original)
+++ trunk/libio-socket-ssl-perl/debian/changelog Thu Dec  9 14:43:36 2010
@@ -1,12 +1,6 @@
-libio-socket-ssl-perl (1.36-1) UNRELEASED; urgency=low
-
-  # TODO: Waiting first for the t-p-u upload, before doing this
-  # upload to unstable
-  # Do *not* update to 1.37, maybe better 1.37 to experimental then
-  # after 1.36 upload to unstable. 1.37 requested to be tested by
-  # Steffen
-
-  * New upstream release (Closes: #606248, #606249).
+libio-socket-ssl-perl (1.37-1) UNRELEASED; urgency=low
+
+  * New upstream release (Closes: #606243, #606248, #606249).
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Wed, 08 Dec 2010 22:35:06 +0100