[SCM] Debian packaging of libio-socket-ssl-perl branch, master, updated. debian/1.76-2-14-g316b1c5
Salvatore Bonaccorso
carnil at debian.org
Sat Oct 27 18:22:10 UTC 2012
The following commit has been merged in the master branch:
commit 67278d9fc9b6fbbad816e4bbee2e24eedc9d78c3
Author: Salvatore Bonaccorso <carnil at debian.org>
Date: Sat Oct 27 20:21:27 2012 +0200
Drop 0001-Fix-update_peer-subroutine-to-work-with-IPv6.patch patch
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
deleted file mode 100644
index 53bf161..0000000
--- a/debian/patches/0001-Fix-update_peer-subroutine-to-work-with-IPv6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
deleted file mode 100644
index f66e493..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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