r74051 - in /trunk/libio-socket-ssl-perl: Changes META.yml Makefile.PL SSL.pm debian/changelog debian/control example/async_https_server.pl t/verify_hostname.t

carnil at users.alioth.debian.org carnil at users.alioth.debian.org
Fri May 6 06:43:49 UTC 2011


Author: carnil
Date: Fri May  6 06:42:49 2011
New Revision: 74051

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74051
Log:
* New upstream release
* debian/control: Add liburi-perl (>= 1.50) as an alternative
  Recommends.
* Bump Standards-Version to 3.9.2.

Modified:
    trunk/libio-socket-ssl-perl/Changes
    trunk/libio-socket-ssl-perl/META.yml
    trunk/libio-socket-ssl-perl/Makefile.PL
    trunk/libio-socket-ssl-perl/SSL.pm
    trunk/libio-socket-ssl-perl/debian/changelog
    trunk/libio-socket-ssl-perl/debian/control
    trunk/libio-socket-ssl-perl/example/async_https_server.pl
    trunk/libio-socket-ssl-perl/t/verify_hostname.t

Modified: trunk/libio-socket-ssl-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/Changes?rev=74051&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/Changes (original)
+++ trunk/libio-socket-ssl-perl/Changes Fri May  6 06:42:49 2011
@@ -1,4 +1,10 @@
 
+v1.40 2011.05.02
+- integrated patch from GAAS to get IDN support from URI.
+  https://rt.cpan.org/Ticket/Display.html?id=67676
+v1.39_1 2011.05.02
+- fix in exampel/async_https_server.
+  Thanks to DetlefPilzecker[AT]web[DOT]de for reporting
 v1.39 2011.03.03
 - fixed documentation of http verification: wildcards in cn is allowed
 v1.38_1 2011.01.24

Modified: trunk/libio-socket-ssl-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/META.yml?rev=74051&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/META.yml (original)
+++ trunk/libio-socket-ssl-perl/META.yml Fri May  6 06:42:49 2011
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               IO-Socket-SSL
-version:            1.39
+version:            1.40
 abstract:           Nearly transparent SSL encapsulation for IO::Socket::INET.
 author:
     - Steffen Ullrich & Peter Behroozi & Marko Asplund
@@ -17,7 +17,7 @@
     directory:
         - t
         - inc
-generated_by:       ExtUtils::MakeMaker version 6.54
+generated_by:       ExtUtils::MakeMaker version 6.55_02
 meta-spec:
     url:      http://module-build.sourceforge.net/META-spec-v1.4.html
     version:  1.4

Modified: trunk/libio-socket-ssl-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/Makefile.PL?rev=74051&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/Makefile.PL (original)
+++ trunk/libio-socket-ssl-perl/Makefile.PL Fri May  6 06:42:49 2011
@@ -57,14 +57,14 @@
 }
 
 # check if we have something which handles IDN
-if ( ! eval { require Net::IDN::Encode } and ! eval { require Net::LibIDN }) {
+if ( ! eval { require Net::IDN::Encode } and ! eval { require Net::LibIDN } and ! eval { require URI; URI->VERSION(1.50) }) {
 	warn <<'EOM';
 
 WARNING
 No library for handling international domain names found.
 It will work but croak if you try to verify an international name against
 a certificate.
-It's recommended to install either Net::IDN::Encode or Net::LibIDN
+It's recommended to install either Net::IDN::Encode, Net::LibIDN or URI version>=1.50
 
 EOM
 }

Modified: trunk/libio-socket-ssl-perl/SSL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/SSL.pm?rev=74051&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/SSL.pm (original)
+++ trunk/libio-socket-ssl-perl/SSL.pm Fri May  6 06:42:49 2011
@@ -78,7 +78,7 @@
 	}) {
 		@ISA = qw(IO::Socket::INET);
 	}
-	$VERSION = '1.39';
+	$VERSION = '1.40';
 	$GLOBAL_CONTEXT_ARGS = {};
 
 	#Make $DEBUG another name for $Net::SSLeay::trace
@@ -121,12 +121,14 @@
 		*{idn_to_ascii} = \&Net::IDN::Encode::domain_to_ascii;
 	} elsif ( eval { require Net::LibIDN }) {
 		*{idn_to_ascii} = \&Net::LibIDN::idn_to_ascii;
+	} elsif ( eval { require URI; URI->VERSION(1.50) }) {
+	        *{idn_to_ascii} = sub { URI->new("http://" . shift)->host }
 	} else {
 		# default: croak if we really got an unencoded international domain
 		*{idn_to_ascii} = sub {
 			my $domain = shift;
 			return $domain if $domain =~m{^[a-zA-Z0-9-_\.]+$};
-			croak "cannot handle international domains, please install Net::LibIDN or Net::IDN::Encode"
+			croak "cannot handle international domains, please install Net::LibIDN, Net::IDN::Encode or URI"
 		}
 	}
 }

Modified: trunk/libio-socket-ssl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/debian/changelog?rev=74051&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/debian/changelog (original)
+++ trunk/libio-socket-ssl-perl/debian/changelog Fri May  6 06:42:49 2011
@@ -1,3 +1,12 @@
+libio-socket-ssl-perl (1.40-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control: Add liburi-perl (>= 1.50) as an alternative
+    Recommends.
+  * Bump Standards-Version to 3.9.2.
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Fri, 06 May 2011 08:42:25 +0200
+
 libio-socket-ssl-perl (1.39-1) unstable; urgency=low
 
   [ Angel Abad ]

Modified: trunk/libio-socket-ssl-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/debian/control?rev=74051&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/debian/control (original)
+++ trunk/libio-socket-ssl-perl/debian/control Fri May  6 06:42:49 2011
@@ -14,7 +14,7 @@
  Antonio Radici <antonio at dyne.org>,
  Salvatore Bonaccorso <carnil at debian.org>,
  Angel Abad <angelabad at gmail.com>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://search.cpan.org/dist/IO-Socket-SSL/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libio-socket-ssl-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libio-socket-ssl-perl/
@@ -24,7 +24,7 @@
 Depends: ${misc:Depends}, ${perl:Depends},
  libnet-ssleay-perl,
  netbase
-Recommends: libnet-libidn-perl
+Recommends: libnet-libidn-perl | liburi-perl (>= 1.50)
 Suggests: libio-socket-inet6-perl
 Description: Perl module implementing object oriented interface to SSL sockets
  This module is a true drop-in replacement for IO::Socket::INET that

Modified: trunk/libio-socket-ssl-perl/example/async_https_server.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/example/async_https_server.pl?rev=74051&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/example/async_https_server.pl (original)
+++ trunk/libio-socket-ssl-perl/example/async_https_server.pl Fri May  6 06:42:49 2011
@@ -21,6 +21,7 @@
 	LocalAddr => '0.0.0.0:9000',
 	Listen => 10,
 	Reuse => 1,
+	Blocking => 0,
 ) || die $!;
 
 event_new( $server, EV_READ|EV_PERSIST, \&_s_accept )->add();
@@ -134,7 +135,7 @@
 		DEBUG( $SSL_ERROR );
 		if ( $SSL_ERROR == SSL_WANT_READ ) {
 			# retry write once we can read
-			event_new( $fdc, EV_READ, \&_client_write )->add;
+			event_new( $fdc, EV_READ, \&_client_write_response )->add;
 		} else {
 			$event->add; # retry again
 		}

Modified: trunk/libio-socket-ssl-perl/t/verify_hostname.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-socket-ssl-perl/t/verify_hostname.t?rev=74051&op=diff
==============================================================================
--- trunk/libio-socket-ssl-perl/t/verify_hostname.t (original)
+++ trunk/libio-socket-ssl-perl/t/verify_hostname.t Fri May  6 06:42:49 2011
@@ -22,7 +22,7 @@
 
 # if we have an IDN library max the IDN tests too
 my $can_idn  = eval { require Encode } &&
-	( eval { require Net::LibIDN } || eval { require Net::IDN::Encode } );
+	( eval { require Net::LibIDN } || eval { require Net::IDN::Encode } || eval { require URI; URI->VERSION(1.50) } );
 
 $|=1;
 my $max = 40;




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