Merge remote branch 'origin/master' into f13/master

Conflicts:
	.gitignore
	perl-IO-Socket-SSL.spec
	sources

.gitignore

@@ -1 +1 @@
-IO-Socket-SSL-1.33.tar.gz
+/IO-Socket-SSL-1.37.tar.gz

perl-IO-Socket-SSL.spec

@@ -4,7 +4,7 @@
 #
 
 Name:		perl-IO-Socket-SSL
-Version:	1.33
+Version:	1.37
 Release:	1%{?dist}
 Summary:	Perl library for transparent SSL
 Group:		Development/Libraries
@@ -61,6 +61,33 @@ done
 %{_mandir}/man3/IO::Socket::SSL.3pm*
 
 %changelog
+* Fri Dec 10 2010 Paul Howarth <paul@city-fan.org> - 1.37-1
+- Update to 1.37
+  - 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 they are
+    doing and will work around the problems themselves (CPAN RT#63741)
+
+* Thu Dec  9 2010 Paul Howarth <paul@city-fan.org> - 1.36-1
+- Update to 1.36
+  - update documentation for SSL_verify_callback based on CPAN RT#63743 and
+    CPAN RT#63740
+
+* Mon Dec  6 2010 Paul Howarth <paul@city-fan.org> - 1.35-1
+- Update to 1.35 (addresses CVE-2010-4334)
+  - if verify_mode is not VERIFY_NONE and the ca_file/ca_path cannot be
+    verified as valid, it will no longer fall back to VERIFY_NONE but throw an
+    error (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606058)
+
+* Tue Nov  2 2010 Paul Howarth <paul@city-fan.org> - 1.34-1
+- Update to 1.34
+  - schema http for certificate verification changed to wildcards_in_cn=1
+  - if upgrading socket from inet to ssl fails due to handshake problems, the
+    socket gets downgraded back again but is still open (CPAN RT#61466)
+  - deprecate kill_socket: just use close()
+
+* Sun May 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.33-2
+- Mass rebuild with perl-5.12.0
+
 * Wed Mar 17 2010 Paul Howarth <paul@city-fan.org> - 1.33-1
 - Update to 1.33
   - attempt to make t/memleak_bad_handshake.t more stable

sources

@@ -1 +1 @@
-e288b5cda3de1f4cbf15e2eb709e9d7c  IO-Socket-SSL-1.33.tar.gz
+a75c962ce989865213ca4320766fdb77  IO-Socket-SSL-1.37.tar.gz