This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository liblwpx-paranoidagent-perl.
commit b9e004fcecddf6383a1a1485db7e710868a06cb5 Author: gregor herrmann <gre...@debian.org> Date: Thu Sep 29 21:19:26 2016 +0200 Drop patches which have been applied upstream. --- debian/patches/0001-Fix-HTTPS.patch | 60 ---------------------- .../patches/0003-Fix-SNI-for-IO-Socket-SSL.patch | 21 -------- debian/patches/series | 2 - 3 files changed, 83 deletions(-) diff --git a/debian/patches/0001-Fix-HTTPS.patch b/debian/patches/0001-Fix-HTTPS.patch deleted file mode 100644 index 83c6f18..0000000 --- a/debian/patches/0001-Fix-HTTPS.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Hilko Bengen <ben...@debian.org> -Date: Tue, 10 Jun 2014 22:59:58 +0200 -Subject: Fix HTTPS - -- Revert upstream's decision to force Net::SSL over IO::Socket::SSL. -- Pass hostname for verification. (This change has been accepted in - upstream git) -- Add patch from upstream git so EAGAIN is properly handled ---- - lib/LWPx/ParanoidAgent.pm | 4 ---- - lib/LWPx/Protocol/http_paranoid.pm | 6 +++++- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/LWPx/ParanoidAgent.pm b/lib/LWPx/ParanoidAgent.pm -index 2e0feef..1daebd7 100644 ---- a/lib/LWPx/ParanoidAgent.pm -+++ b/lib/LWPx/ParanoidAgent.pm -@@ -12,10 +12,6 @@ use HTTP::Status (); - use strict; - use Net::DNS; - use LWP::Debug (); --require Net::SSL; -- --# fixes https://github.com/csirtgadgets/LWPx-ParanoidAgent/issues/4 --$Net::HTTPS::SSL_SOCKET_CLASS = 'Net::SSL'; - - sub new { - my $class = shift; -diff --git a/lib/LWPx/Protocol/http_paranoid.pm b/lib/LWPx/Protocol/http_paranoid.pm -index bb98526..13d8504 100644 ---- a/lib/LWPx/Protocol/http_paranoid.pm -+++ b/lib/LWPx/Protocol/http_paranoid.pm -@@ -10,6 +10,8 @@ require HTTP::Response; - require HTTP::Status; - require Net::HTTP; - -+use Errno qw(EAGAIN); -+ - use vars qw(@ISA $TOO_LATE $TIME_REMAIN); - - require LWP::Protocol; -@@ -65,6 +67,7 @@ sub _new_socket - (time() - $request->{_timebegin}) : - $timeout; - $sock = $self->socket_class->new(PeerAddr => $addr, -+ PeerHost => $host, - PeerPort => $port, - Proto => 'tcp', - Timeout => $conn_timeout, -@@ -360,8 +363,9 @@ sub request - { - _set_time_remain(); - $n = $socket->read_entity_body($buf, $size); -- die "Can't read entity body: $!" unless defined $n; - redo READ if $n == -1; -+ redo READ if not defined $n and $! == EAGAIN; -+ die "Can't read entity body: $!" unless defined $n; - } - $complete++ if !$n; - return \$buf; diff --git a/debian/patches/0003-Fix-SNI-for-IO-Socket-SSL.patch b/debian/patches/0003-Fix-SNI-for-IO-Socket-SSL.patch deleted file mode 100644 index b1daadd..0000000 --- a/debian/patches/0003-Fix-SNI-for-IO-Socket-SSL.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Hilko Bengen <ben...@debian.org> -Date: Tue, 18 Nov 2014 22:20:32 +0100 -Subject: Fix SNI for IO::Socket::SSL - -Source: <http://ikiwiki.info/plugins/openid/troubleshooting/> ---- - lib/LWPx/Protocol/http_paranoid.pm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/LWPx/Protocol/http_paranoid.pm b/lib/LWPx/Protocol/http_paranoid.pm -index 13d8504..23a23c5 100644 ---- a/lib/LWPx/Protocol/http_paranoid.pm -+++ b/lib/LWPx/Protocol/http_paranoid.pm -@@ -68,6 +68,7 @@ sub _new_socket - $timeout; - $sock = $self->socket_class->new(PeerAddr => $addr, - PeerHost => $host, -+ SSL_hostname => $host, - PeerPort => $port, - Proto => 'tcp', - Timeout => $conn_timeout, diff --git a/debian/patches/series b/debian/patches/series index e951f59..2d03ece 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -0001-Fix-HTTPS.patch 0002-Use-ca-certificates.patch -0003-Fix-SNI-for-IO-Socket-SSL.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/liblwpx-paranoidagent-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits