[SCM] Debian packaging of libio-socket-ssl-perl branch, master, updated. debian/1.76-2-12-g5b7e67d

Salvatore Bonaccorso carnil at debian.org
Sat Oct 27 18:20:16 UTC 2012


The following commit has been merged in the master branch:
commit fcb310458376585deeb712817df16604053150a7
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Fri Oct 5 17:26:14 2012 +0200

    Add 0001-Fix-update_peer-subroutine-to-work-with-IPv6.patch patch
    
    Fix _update_peer subroutine to work with IPv6.

diff --git a/debian/patches/0001-Fix-update_peer-subroutine-to-work-with-IPv6.patch b/debian/patches/0001-Fix-update_peer-subroutine-to-work-with-IPv6.patch
new file mode 100644
index 0000000..53bf161
--- /dev/null
+++ b/debian/patches/0001-Fix-update_peer-subroutine-to-work-with-IPv6.patch
@@ -0,0 +1,48 @@
+Description: Fix _update_peer subroutine to work with IPv6
+Origin: vendor
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=79916
+Forwarded: not-needed
+Author: Salvatore Bonaccorso <carnil at debian.org>
+Last-Update: 2012-10-05
+
+---
+ SSL.pm |   18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+--- a/SSL.pm
++++ b/SSL.pm
+@@ -69,11 +69,11 @@
+ 	my $ip6 = eval {
+ 	    require Socket;
+ 	    Socket->VERSION(1.95);
+-	    Socket->import( 'inet_pton' );
++	    Socket->import( qw/inet_pton inet_ntop/ );
+ 	    1;
+ 	} || eval {
+ 	    require Socket6;
+-	    Socket6->import( 'inet_pton' );
++	    Socket6->import( qw/inet_pton inet_ntop/ );
+ 	    1;
+ 	};
+ 
+@@ -525,9 +525,17 @@
+ 	my $self = shift;
+ 	my $arg_hash = ${*$self}{'_SSL_arguments'};
+ 	eval {
+-		my ($port,$addr) = sockaddr_in( getpeername( $self ));
+-		$arg_hash->{PeerAddr} = inet_ntoa( $addr );
+-		$arg_hash->{PeerPort} = $port;
++                my $sockaddr = getpeername( $self );
++                my $af = sockaddr_family($sockaddr);
++                if( $af == AF_INET6 ) {
++                    my ($port, $addr, $scope, $flow ) = unpack_sockaddr_in6( $sockaddr );
++                    $arg_hash->{PeerAddr} = inet_ntop( $af, $addr );
++                    $arg_hash->{PeerPort} = $port;
++                } else {
++                    my ($port,$addr) = sockaddr_in( $sockaddr);
++                    $arg_hash->{PeerAddr} = inet_ntoa( $addr );
++                    $arg_hash->{PeerPort} = $port;
++                }
+ 	}
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f66e493
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-update_peer-subroutine-to-work-with-IPv6.patch

-- 
Debian packaging of libio-socket-ssl-perl



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