commit 341f6fbf4e20d51d136ef569677e92b5045e9b1c Author: Petr Šabata <contyk@xxxxxxxxxx> Date: Mon Dec 8 17:55:20 2014 +0100 0.272 bump .gitignore | 1 + ...alive-0.271-Fix-a-race-in-t-10_resolver.t.patch | 78 -------------------- ...alive-0.272-Fix-a-race-in-t-10_resolver.t.patch | 66 +++++++++++++++++ perl-POE-Component-Client-Keepalive.spec | 48 +++++++----- sources | 2 +- 5 files changed, 97 insertions(+), 98 deletions(-) --- diff --git a/.gitignore b/.gitignore index 33f2999..346e62c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ POE-Component-Client-Keepalive-0.262.tar.gz /POE-Component-Client-Keepalive-0.268.tar.gz /POE-Component-Client-Keepalive-0.269.tar.gz /POE-Component-Client-Keepalive-0.271.tar.gz +/POE-Component-Client-Keepalive-0.272.tar.gz diff --git a/POE-Component-Client-Keepalive-0.272-Fix-a-race-in-t-10_resolver.t.patch b/POE-Component-Client-Keepalive-0.272-Fix-a-race-in-t-10_resolver.t.patch new file mode 100644 index 0000000..fd64974 --- /dev/null +++ b/POE-Component-Client-Keepalive-0.272-Fix-a-race-in-t-10_resolver.t.patch @@ -0,0 +1,66 @@ +diff --git a/t/10_resolver.t b/t/10_resolver.t +index 5c5e734..ea2d769 100644 +--- a/t/10_resolver.t ++++ b/t/10_resolver.t +@@ -19,6 +19,9 @@ use Socket qw(AF_INET); + use TestServer; + my $server_port = TestServer->spawn(0); + ++my $timeout = 120; ++my $start; ++ + my $test_server_use_count = 0; + + POE::Session->create( +@@ -41,6 +44,7 @@ POE::Session->create( + + sub start_with { + my $heap = $_[HEAP]; ++ $start = time; + + $_[KERNEL]->alias_set ('WITH'); + $heap->{cm} = POE::Component::Client::Keepalive->new( +@@ -53,6 +57,7 @@ sub start_with { + port => $server_port, + event => "got_conn", + context => "first", ++ timeout => $timeout, + ); + + ++$test_server_use_count; +@@ -72,6 +77,7 @@ sub start_without { + port => $server_port, + event => "got_conn", + context => "second", ++ timeout => $timeout, + ); + + ++$test_server_use_count; +@@ -88,14 +94,19 @@ sub got_conn{ + my $connection = delete $response->{connection}; + my $which = $response->{context}; + +- if (defined $connection) { +- pass "$which request honored asynchronously"; +- } +- else { +- fail( +- "$which request $response->{function} error $response->{error_num}: " . +- $response->{error_str} +- ); ++ SKIP: { ++ if ($which eq 'second' and time - $start >= $timeout) { ++ skip "Test run time exceded keepalive timeout $timeout s", 1; ++ } ++ if (defined $connection) { ++ pass "$which request honored asynchronously"; ++ } ++ else { ++ fail( ++ "$which request $response->{function} error $response->{error_num}: " . ++ $response->{error_str} ++ ); ++ } + } + + ok( diff --git a/perl-POE-Component-Client-Keepalive.spec b/perl-POE-Component-Client-Keepalive.spec index d3f94f3..913063b 100644 --- a/perl-POE-Component-Client-Keepalive.spec +++ b/perl-POE-Component-Client-Keepalive.spec @@ -1,43 +1,51 @@ Name: perl-POE-Component-Client-Keepalive -%define real_ver 0.271 +%define real_ver 0.272 # Keep four digits to stay above the unfortunate 0.0901, # so that epoch need not be changed. Version: %{real_ver}0 -Release: 11%{?dist} +Release: 1%{?dist} Summary: Manages and keeps alive client connections -Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/POE-Component-Client-Keepalive Source0: http://search.cpan.org/CPAN/authors/id/R/RC/RCAPUTO/POE-Component-Client-Keepalive-%{real_ver}.tar.gz # Fix a race in t/10_resolver.t, bug #1136851, CPAN RT#98644 -Patch0: POE-Component-Client-Keepalive-0.271-Fix-a-race-in-t-10_resolver.t.patch +Patch0: POE-Component-Client-Keepalive-0.272-Fix-a-race-in-t-10_resolver.t.patch BuildArch: noarch -# core -BuildRequires: perl(constant) +# Build +BuildRequires: perl +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 +BuildRequires: perl(strict) +BuildRequires: perl(warnings) +# Runtime +BuildRequires: perl(bytes) BuildRequires: perl(Carp) -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(IO::Socket::INET) +BuildRequires: perl(constant) +BuildRequires: perl(Errno) BuildRequires: perl(Net::IP::Minimal) >= 0.02 BuildRequires: perl(POE) >= 1.311 BuildRequires: perl(POE::Component::Resolver) >= 0.917 BuildRequires: perl(POE::Component::Server::TCP) -BuildRequires: perl(POE::Component::SSLify) +# Unused BuildRequires: perl(POE::Component::SSLify) BuildRequires: perl(POE::Wheel::ReadWrite) BuildRequires: perl(POE::Wheel::SocketFactory) BuildRequires: perl(Socket) -BuildRequires: perl(Test::More) +# Tests +BuildRequires: perl(IO::Socket::INET) +BuildRequires: perl(lib) +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(Test::More) >= 0.94 +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Net::IP::Minimal) >= 0.02 Requires: perl(POE) >= 1.311 Requires: perl(POE::Component::Resolver) >= 0.917 -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) # Satisfy automaticly generated requires that want this module >= 0.0901 # (So the package has this provide in two versions, oh well.) Provides: perl(POE::Component::Client::Keepalive) = %{version} %{?perl_default_filter} -%global __requires_exclude %{?__requires_exclude:__requires_exclude|}perl\\(Net::IP::Minimal\\) -%global __requires_exclude %__requires_exclude|perl\\(POE\\) -%global __requires_exclude %__requires_exclude|perl\\(POE::Component::Resolver\\) +%global __requires_exclude %{?__requires_exclude:__requires_exclude|^}perl\\(Net::IP::Minimal\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(POE\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(POE::Component::Resolver\\)$ %description POE::Component::Client::Keepalive creates and manages connections for other @@ -57,13 +65,11 @@ for test in t/release-pod-syntax.t \ done %build -perl Makefile.PL INSTALLDIRS=vendor +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 make %{?_smp_mflags} %install -make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' +make pure_install DESTDIR=%{buildroot} %{_fixperms} %{buildroot}/* %check @@ -74,11 +80,15 @@ find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';' make test %files -%doc CHANGES README mylib/ t/ +%license LICENSE +%doc CHANGES README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Mon Dec 08 2014 Petr Šabata <contyk@xxxxxxxxxx> - 0.2720-1 +- 0.272 bump + * Sun Sep 07 2014 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 0.2710-11 - Perl 5.20 rebuild diff --git a/sources b/sources index a9ed068..4fdf652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1f45a7ecf93f26af6ff992eb510fb38 POE-Component-Client-Keepalive-0.271.tar.gz +a4e58f1521ed369a342ae5b843d99184 POE-Component-Client-Keepalive-0.272.tar.gz -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel