[78802] trunk/dports/perl/p5-io-socket-ssl

l2g at macports.org l2g at macports.org
Sun May 22 18:02:50 PDT 2011


Revision: 78802
          http://trac.macports.org/changeset/78802
Author:   l2g at macports.org
Date:     2011-05-22 18:02:48 -0700 (Sun, 22 May 2011)
Log Message:
-----------
p5-io-socket-ssl: new version 1.43; includes fix for broken test from 1.43_1
(that's a CPAN version number, not a MacPorts revision number)

Modified Paths:
--------------
    trunk/dports/perl/p5-io-socket-ssl/Portfile

Added Paths:
-----------
    trunk/dports/perl/p5-io-socket-ssl/files/
    trunk/dports/perl/p5-io-socket-ssl/files/patch-t-nonblock.t.diff

Modified: trunk/dports/perl/p5-io-socket-ssl/Portfile
===================================================================
--- trunk/dports/perl/p5-io-socket-ssl/Portfile	2011-05-23 00:00:42 UTC (rev 78801)
+++ trunk/dports/perl/p5-io-socket-ssl/Portfile	2011-05-23 01:02:48 UTC (rev 78802)
@@ -4,7 +4,8 @@
 PortSystem          1.0
 PortGroup           perl5 1.0
 
-perl5.setup         IO-Socket-SSL 1.42
+# See patchfiles and livecheck.version at bottom when upgrading. -L2G
+perl5.setup         IO-Socket-SSL 1.43
 platforms           darwin
 maintainers         l2g openmaintainer
 license             Artistic GPL
@@ -16,10 +17,18 @@
                     oriented interface to SSL sockets. The class is a \
                     descendent of IO::Socket::INET.
 
-checksums           sha1    0427bec4f2ff541435dc47f71638777b32940d4b \
-                    rmd160  6200cbad0ca92d08aeb9668783b419eab97cb2b1
+checksums           sha1    44c57e7164b897592295dba633dfe4f93bfc7685 \
+                    rmd160  ebbbcf41faf160d4f7fbb4c7c45de425fac5c33b
 
 depends_lib-append  port:p5-net-ssleay port:p5-net-libidn
 
 # Only required for full testing:
 #depends_build-append port:p5-io-socket-inet6
+
+# This patch was backported from 1.43_1 (CPAN's version number, not
+# MacPorts'). Once 1.44 or later is released, it will probably be obsolete.
+patchfiles          patch-t-nonblock.t.diff
+
+# This is just to quell livecheck until something later than 1.43_1 is
+# released. At that point, it should be removed.
+livecheck.version   1.43_1

Added: trunk/dports/perl/p5-io-socket-ssl/files/patch-t-nonblock.t.diff
===================================================================
--- trunk/dports/perl/p5-io-socket-ssl/files/patch-t-nonblock.t.diff	                        (rev 0)
+++ trunk/dports/perl/p5-io-socket-ssl/files/patch-t-nonblock.t.diff	2011-05-23 01:02:48 UTC (rev 78802)
@@ -0,0 +1,57 @@
+--- ../IO-Socket-SSL-1.43/t/nonblock.t	2011-05-11 00:56:38.000000000 -0700
++++ t/nonblock.t	2011-05-12 09:09:54.000000000 -0700
+@@ -91,12 +91,22 @@
+ 
+ 	# nonblocking connect of tcp socket
+ 	while (1) {
+-	    $to_server->connect( $server_addr ) && last;
+-	    if ( $! == EINPROGRESS ) {
++	    connect($to_server,$server_addr ) && last;
++	    if ( $!{EINPROGRESS} ) {
+ 		diag( 'connect in progress' );
+-		IO::Select->new( $to_server )->can_read(30) && next;
++		IO::Select->new( $to_server )->can_write(30) && next;
+ 		print "not ";
+ 		last;
++	    } elsif ( $!{EALREADY} ) {	
++		diag( 'connect not yet completed'); 
++		# just wait
++		select(undef,undef,undef,0.1);
++		next;
++	    } elsif ( $!{EISCONN} ) {
++		diag('claims that socket is already connected');
++		# found on Mac OS X, dunno why it does not tell me that
++		# the connect succeeded before
++		last;
+ 	    }
+ 	    diag( 'connect failed: '.$! );
+ 	    print "not ";
+@@ -111,7 +121,27 @@
+ 	$to_server->blocking(0);
+ 
+ 	# send some plain text on non-ssl socket
+-	syswrite( $to_server,'plaintext' ) || print "not ";
++	my $pmsg = 'plaintext';
++	while ( $pmsg ne '' ) {
++	    my $w = syswrite( $to_server,$pmsg );
++	    if ( ! defined $w ) {
++	    	if ( ! $!{EAGAIN} ) {
++		    diag("syswrite failed with $!");
++		    print "not ";
++		    last;
++		}
++		IO::Select->new($to_server)->can_write(30) or do {
++		    diag("failed to get write ready");
++		    print "not ";
++		    last;
++		};
++	    } elsif ( $w>0 ) {
++	    	diag("wrote $w bytes");
++		substr($pmsg,0,$w,'');
++	    } else {
++		die "syswrite returned 0";
++	    }
++	}
+ 	ok( "write plain text" );
+ 
+ 	# let server catch up, so that it awaits my connection
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110522/d78526f2/attachment.html>


More information about the macports-changes mailing list