diff --git a/.gitignore b/.gitignore index adbdda3..0825320 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /Net-HTTP-6.03.tar.gz /Net-HTTP-6.04.tar.gz /Net-HTTP-6.05.tar.gz +/Net-HTTP-6.06.tar.gz diff --git a/Net-HTTP-6.05-IO-Socket-SSL-doesn-t-play-well-with-select.patch b/Net-HTTP-6.05-IO-Socket-SSL-doesn-t-play-well-with-select.patch deleted file mode 100644 index d70d44a..0000000 --- a/Net-HTTP-6.05-IO-Socket-SSL-doesn-t-play-well-with-select.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 744fb936829d27c7bf0d95167aa5d89c9afd5dc9 Mon Sep 17 00:00:00 2001 -From: Jesse Luehrs -Date: Wed, 2 Jan 2013 21:38:25 -0600 -Subject: [PATCH] IO::Socket::SSL doesn't play well with select() - -This should fix RT#81237, although I'm not sure if it re-breaks RT#72676 (I'm not sure what to do to test it). ---- - lib/Net/HTTP/Methods.pm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/Net/HTTP/Methods.pm b/lib/Net/HTTP/Methods.pm -index 77e3038..378dad4 100644 ---- a/lib/Net/HTTP/Methods.pm -+++ b/lib/Net/HTTP/Methods.pm -@@ -283,6 +283,7 @@ sub my_readline { - sub can_read { - my $self = shift; - return 1 unless defined(fileno($self)); -+ return 1 if $self->isa('IO::Socket::SSL') && $self->pending; - - # With no timeout, wait forever. An explict timeout of 0 can be - # used to just check if the socket is readable without waiting. --- -1.8.1.4 - diff --git a/perl-Net-HTTP.spec b/perl-Net-HTTP.spec index c0c1bfa..ffb862c 100644 --- a/perl-Net-HTTP.spec +++ b/perl-Net-HTTP.spec @@ -1,13 +1,11 @@ Name: perl-Net-HTTP -Version: 6.05 -Release: 3%{?dist} +Version: 6.06 +Release: 1%{?dist} Summary: Low-level HTTP connection (client) License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-HTTP/ Source0: http://www.cpan.org/authors/id/G/GA/GAAS/Net-HTTP-%{version}.tar.gz -# Do not block with IO::Socket::SSL, rhbz#768394, CPAN RT#81237 -Patch0: Net-HTTP-6.05-IO-Socket-SSL-doesn-t-play-well-with-select.patch BuildArch: noarch BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) @@ -43,7 +41,6 @@ and HTTP/1.1. %prep %setup -q -n Net-HTTP-%{version} -%patch0 -p1 %build perl Makefile.PL INSTALLDIRS=vendor @@ -63,6 +60,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Mar 11 2013 Petr Pisar - 6.06-1 +- 6.06 bump + * Fri Mar 08 2013 Petr Pisar - 6.05-3 - Handle IO::Socket::SSL as non-blocking (bug #768394) diff --git a/sources b/sources index 6692136..f73234f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a704804045e31d6fe589214594aaf21 Net-HTTP-6.05.tar.gz +6e74d76205f168775de68347266793a7 Net-HTTP-6.06.tar.gz