[perl-IPC-SharedCache] apply Debian patch for tests, which fix problem of HTML::Template
Marcela Mašláňová
mmaslano at fedoraproject.org
Fri Dec 17 12:46:43 UTC 2010
commit 272fa54c5ae41588d7bb094b65ed9d0b14a126ea
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date: Fri Dec 17 13:46:27 2010 +0100
apply Debian patch for tests, which fix problem of HTML::Template
IPC-SharedCache-1.3-test.patch | 140 ++++++++++++++++++++++++++++++++++++++++
perl-IPC-SharedCache.spec | 9 ++-
2 files changed, 146 insertions(+), 3 deletions(-)
---
diff --git a/IPC-SharedCache-1.3-test.patch b/IPC-SharedCache-1.3-test.patch
new file mode 100644
index 0000000..2f9b7e7
--- /dev/null
+++ b/IPC-SharedCache-1.3-test.patch
@@ -0,0 +1,140 @@
+diff -up IPC-SharedCache-1.3/SharedCache.pm.old IPC-SharedCache-1.3/SharedCache.pm
+--- IPC-SharedCache-1.3/SharedCache.pm.old 2000-03-23 09:00:19.000000000 +0100
++++ IPC-SharedCache-1.3/SharedCache.pm 2010-12-17 13:45:02.309198942 +0100
+@@ -580,11 +580,13 @@ sub STORE {
+ my $share;
+ if (exists $root_record->{'map'}{$key}) {
+ # we've got a key, get the share and cache it
+- $share = IPC::ShareLite->new('-key' => $root_record->{'map'}{$key},
++ $share = eval {
++ IPC::ShareLite->new('-key' => $root_record->{'map'}{$key},
+ '-mode' => $options->{ipc_mode},
+ '-size' => $options->{ipc_segment_size},
+ '-create' => 0,
+ '-destroy' => 0);
++ };
+ confess("IPC::SharedCache: Unable to get shared cache block $root_record->{'map'}{$key} : $!") unless defined $share;
+
+ $root_record->{'size'} -= $root_record->{'length_map'}{$key};
+@@ -596,13 +598,15 @@ sub STORE {
+ for ( my $end = $obj_ipc_key + 10000 ;
+ $obj_ipc_key != $end ;
+ $obj_ipc_key++ ) {
+- $share = IPC::ShareLite->new('-key' => $obj_ipc_key,
++ $share = eval {
++ IPC::ShareLite->new('-key' => $obj_ipc_key,
+ '-mode' => $options->{ipc_mode},
+ '-size' => $options->{ipc_segment_size},
+ '-create' => 1,
+ '-exclusive' => 1,
+ '-destroy' => 0,
+ );
++ };
+ last if defined $share;
+ }
+ croak("IPC::SharedCache : searched through 10,000 consecutive locations for a free shared memory segment, giving up : $!")
+@@ -625,11 +629,13 @@ sub STORE {
+ my $delete_key = shift @{$root_record->{'queue'}};
+ # delete the segment for this object
+ {
+- my $share = IPC::ShareLite->new('-key' => $root_record->{map}{$delete_key},
++ my $share = eval {
++ IPC::ShareLite->new('-key' => $root_record->{map}{$delete_key},
+ '-mode' => $options->{ipc_mode},
+ '-size' => $options->{ipc_segment_size},
+ '-create' => 0,
+ '-destroy' => 1);
++ };
+ confess("IPC::SharedCache: Unable to get shared cache block $root_record->{'map'}{$key} : $!") unless defined $share;
+ # share is now deleted since destroy == 1 and $share goes out of scope
+ }
+@@ -684,11 +690,13 @@ sub DELETE {
+
+ # delete the segment for this object
+ {
+- my $share = IPC::ShareLite->new('-key' => $obj_ipc_key,
++ my $share = eval {
++ IPC::ShareLite->new('-key' => $obj_ipc_key,
+ '-mode' => $options->{ipc_mode},
+ '-size' => $options->{ipc_segment_size},
+ '-create' => 0,
+ '-destroy' => 1);
++ };
+ confess("IPC::SharedCache: Unable to get shared cache block $root_record->{'map'}{$key} : $!") unless defined $share;
+ # share is now deleted since destroy == 1 and $share goes out of scope
+ }
+@@ -830,11 +838,13 @@ sub walk {
+ require "Data/Dumper.pm";
+
+ # make sure the cache actually exists here
+- my $test = IPC::ShareLite->new('-key' => $key,
++ my $test = eval {
++ IPC::ShareLite->new('-key' => $key,
+ '-mode' => 0666,
+ '-size' => $segment_size,
+ '-create' => 0,
+ '-destroy' => 0);
++ };
+ die "Unable to find a cache at key $key : $!" unless defined $test;
+
+ my %self;
+@@ -911,10 +921,12 @@ sub remove {
+
+ # delete the root segment
+ {
+- my $share = IPC::ShareLite->new('-key' => $key,
++ my $share = eval {
++ IPC::ShareLite->new('-key' => $key,
+ '-size' => $segment_size,
+ '-create' => 0,
+ '-destroy' => 1);
++ };
+ confess("IPC::SharedCache: Unable to get shared cache block $key : $!") unless defined $share;
+ # share is now deleted since destroy == 1 and $share goes out of scope
+ }
+@@ -938,11 +950,13 @@ sub _init_root {
+ return if defined $root;
+
+ # try to get a handle on an existing root for this key
+- $root = IPC::ShareLite->new('-key' => $ipc_key,
++ $root = eval {
++ IPC::ShareLite->new('-key' => $ipc_key,
+ '-mode' => $options->{ipc_mode},
+ '-size' => $options->{ipc_segment_size},
+ '-create' => 0,
+ '-destroy' => 0);
++ };
+ if (defined $root) {
+ $ROOT_SHARE_CACHE{$ipc_key} = $root;
+ return;
+@@ -961,12 +975,14 @@ sub _init_root {
+ # if $options->{debug};
+
+ # try to create it if that didn't work (and do initialization)
+- $root = IPC::ShareLite->new('-key' => $options->{ipc_key},
++ $root = eval {
++ IPC::ShareLite->new('-key' => $options->{ipc_key},
+ '-mode' => $options->{ipc_mode},
+ '-size' => $options->{ipc_segment_size},
+ '-create' => 1,
+ '-exclusive' => 1,
+ '-destroy' => 0);
++ };
+ confess("IPC::SharedCache object initialization : Unable to initialize root ipc shared memory segment : $!")
+ unless defined($root);
+
+@@ -1032,11 +1048,13 @@ sub _get_share_object {
+ my $options = $self->{options};
+
+ # we've got a key, get the share and cache it
+- my $share = IPC::ShareLite->new('-key' => $obj_ipc_key,
++ my $share = eval {
++ IPC::ShareLite->new('-key' => $obj_ipc_key,
+ '-mode' => $options->{ipc_mode},
+ '-size' => $options->{ipc_segment_size},
+ '-create' => 0,
+ '-destroy' => 0);
++ };
+ confess("IPC::SharedCache: Unable to get shared cache block $obj_ipc_key : $!") unless defined $share;
+
+ # get the cache block
diff --git a/perl-IPC-SharedCache.spec b/perl-IPC-SharedCache.spec
index 76744b1..feea517 100644
--- a/perl-IPC-SharedCache.spec
+++ b/perl-IPC-SharedCache.spec
@@ -1,13 +1,13 @@
Name: perl-IPC-SharedCache
Version: 1.3
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Perl module to manage a cache in SysV IPC shared memory
Group: Development/Libraries
License: GPLv2+
URL: http://search.cpan.org/dist/IPC-SharedCache/
Source0: http://www.cpan.org/authors/id/S/SA/SAMTREGAR/IPC-SharedCache-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: IPC-SharedCache-1.3-test.patch
BuildArch: noarch
BuildRequires: perl(IPC::ShareLite) >= 0.06
@@ -28,7 +28,7 @@ explicitly deleted.
%prep
%setup -q -n IPC-SharedCache-%{version}
-
+%patch0 -p1
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Dec 17 2010 Marcela Mašláňová <mmaslano at redhat.com> - 1.3-14
+- apply Debian patch for tests, which fix problem of HTML::Template
+
* Sun May 02 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.3-13
- Mass rebuild with perl-5.12.0
More information about the perl-devel
mailing list