2:30 p.m.
commit d408e62f10caf1ea146dc2f4b1fa38aea16b262e
Author: Paul Howarth <paul(a)city-fan.org>
Date: Tue Sep 6 20:08:09 2011 +0100
Update to 0.25
- New upstream release 0.25
- Invalid package names (for instance, Foo:Bar) are not allowed
- Invalid stash entry names (anything containing ::) are not allowed
- Update patches to apply cleanly
Package-Stash-XS-0.21-no-Test::LeakTrace.patch | 26 ----
Package-Stash-XS-0.24-no-Test::LeakTrace.patch | 26 ++++
...h => Package-Stash-XS-0.24-old-Test::More.patch | 122 +++++++++++---------
perl-Package-Stash-XS.spec | 12 ++-
sources | 2 +-
5 files changed, 106 insertions(+), 82 deletions(-)
---
diff --git a/Package-Stash-XS-0.24-no-Test::LeakTrace.patch
b/Package-Stash-XS-0.24-no-Test::LeakTrace.patch
new file mode 100644
index 0000000..ae28a20
--- /dev/null
+++ b/Package-Stash-XS-0.24-no-Test::LeakTrace.patch
@@ -0,0 +1,26 @@
+diff -up Package-Stash-XS-0.24/t/author-leaks-debug.t.orig
Package-Stash-XS-0.24/t/author-leaks-debug.t
+--- Package-Stash-XS-0.24/t/author-leaks-debug.t.orig 2011-09-06 09:37:11.754912596
+0100
++++ Package-Stash-XS-0.24/t/author-leaks-debug.t 2011-09-06 09:37:11.762912576 +0100
+@@ -12,7 +12,8 @@ use warnings;
+ use lib 't/lib';
+ use Test::More;
+ use Test::Fatal;
+-use Test::LeakTrace;
++eval "use Test::LeakTrace";
++plan skip_all => "Test::LeakTrace required for this test" if $@;
+
+ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
+
+diff -up Package-Stash-XS-0.24/t/author-leaks.t.orig
Package-Stash-XS-0.24/t/author-leaks.t
+--- Package-Stash-XS-0.24/t/author-leaks.t.orig 2011-09-06 09:37:11.754912596 +0100
++++ Package-Stash-XS-0.24/t/author-leaks.t 2011-09-06 09:37:11.762912576 +0100
+@@ -12,7 +12,8 @@ use warnings;
+ use lib 't/lib';
+ use Test::More;
+ use Test::Fatal;
+-use Test::LeakTrace;
++eval "use Test::LeakTrace";
++plan skip_all => "Test::LeakTrace required for this test" if $@;
+
+ use Package::Stash;
+ use Symbol;
diff --git a/Package-Stash-XS-0.23-old-Test::More.patch
b/Package-Stash-XS-0.24-old-Test::More.patch
similarity index 53%
rename from Package-Stash-XS-0.23-old-Test::More.patch
rename to Package-Stash-XS-0.24-old-Test::More.patch
index 05dd63d..9c1bd91 100644
--- a/Package-Stash-XS-0.23-old-Test::More.patch
+++ b/Package-Stash-XS-0.24-old-Test::More.patch
@@ -1,6 +1,6 @@
-diff -up Package-Stash-XS-0.23/t/addsub.t.orig Package-Stash-XS-0.23/t/addsub.t
---- Package-Stash-XS-0.23/t/addsub.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/addsub.t 2011-08-09 09:21:01.223844899 +0100
+diff -up Package-Stash-XS-0.24/t/addsub.t.orig Package-Stash-XS-0.24/t/addsub.t
+--- Package-Stash-XS-0.24/t/addsub.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/addsub.t 2011-09-06 09:33:49.962448819 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -16,19 +16,19 @@ diff -up Package-Stash-XS-0.23/t/addsub.t.orig
Package-Stash-XS-0.23/t/addsub.t
'... got the right %DB::sub value for dunk with specified args';
-
-done_testing;
-diff -up Package-Stash-XS-0.23/t/author-20-leaks.t.orig
Package-Stash-XS-0.23/t/author-20-leaks.t
---- Package-Stash-XS-0.23/t/author-20-leaks.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/author-20-leaks.t 2011-08-09 09:21:01.309844685 +0100
-@@ -17,6 +17,8 @@ use Test::LeakTrace;
+diff -up Package-Stash-XS-0.24/t/author-leaks-debug.t.orig
Package-Stash-XS-0.24/t/author-leaks-debug.t
+--- Package-Stash-XS-0.24/t/author-leaks-debug.t.orig 2011-09-06 04:20:20.000000000
+0100
++++ Package-Stash-XS-0.24/t/author-leaks-debug.t 2011-09-06 09:33:49.978448777 +0100
+@@ -19,6 +19,8 @@ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
use Package::Stash;
use Symbol;
-+plan tests => 25;
++plan tests => 29;
+
{
package Bar;
}
-@@ -144,7 +146,10 @@ use Symbol;
+@@ -154,7 +156,10 @@ use Symbol;
ok($foo->has_symbol('@ISA'));
is(ref($foo->get_symbol('@ISA')), 'ARRAY');
is_deeply($foo->get_symbol('@ISA'), ['Exporter']);
@@ -39,25 +39,25 @@ diff -up Package-Stash-XS-0.23/t/author-20-leaks.t.orig
Package-Stash-XS-0.23/t/
}
{
-@@ -198,5 +203,3 @@ use Symbol;
+@@ -208,5 +213,3 @@ use Symbol;
eval { $foo->get_or_add_symbol('&blorg') };
} "doesn't leak on errors";
}
-
-done_testing;
-diff -up Package-Stash-XS-0.23/t/author-21-leaks-debug.t.orig
Package-Stash-XS-0.23/t/author-21-leaks-debug.t
---- Package-Stash-XS-0.23/t/author-21-leaks-debug.t.orig 2011-08-08 16:43:44.000000000
+0100
-+++ Package-Stash-XS-0.23/t/author-21-leaks-debug.t 2011-08-09 09:21:01.310844682 +0100
-@@ -19,6 +19,8 @@ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
+diff -up Package-Stash-XS-0.24/t/author-leaks.t.orig
Package-Stash-XS-0.24/t/author-leaks.t
+--- Package-Stash-XS-0.24/t/author-leaks.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/author-leaks.t 2011-09-06 09:33:49.978448777 +0100
+@@ -17,6 +17,8 @@ use Test::LeakTrace;
use Package::Stash;
use Symbol;
-+plan tests => 25;
++plan tests => 29;
+
{
package Bar;
}
-@@ -146,7 +148,10 @@ use Symbol;
+@@ -152,7 +154,10 @@ use Symbol;
ok($foo->has_symbol('@ISA'));
is(ref($foo->get_symbol('@ISA')), 'ARRAY');
is_deeply($foo->get_symbol('@ISA'), ['Exporter']);
@@ -68,33 +68,33 @@ diff -up Package-Stash-XS-0.23/t/author-21-leaks-debug.t.orig
Package-Stash-XS-0
}
{
-@@ -200,5 +205,3 @@ use Symbol;
+@@ -206,5 +211,3 @@ use Symbol;
eval { $foo->get_or_add_symbol('&blorg') };
} "doesn't leak on errors";
}
-
-done_testing;
-diff -up Package-Stash-XS-0.23/t/basic.t.orig Package-Stash-XS-0.23/t/basic.t
---- Package-Stash-XS-0.23/t/basic.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/basic.t 2011-08-09 09:21:01.085845240 +0100
+diff -up Package-Stash-XS-0.24/t/basic.t.orig Package-Stash-XS-0.24/t/basic.t
+--- Package-Stash-XS-0.24/t/basic.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/basic.t 2011-09-06 09:33:49.978448778 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
use lib 't/lib';
-use Test::More;
-+use Test::More tests => 122;
++use Test::More tests => 129;
use Test::Fatal;
use Package::Stash;
-@@ -416,5 +416,3 @@ like(exception {
- "list_all_symbols CODE",
- );
- }
+@@ -436,5 +436,3 @@ like(
+ qr/^Package::Stash->new must be passed the name of the package to access/,
+ "module name must be a string"
+ );
-
-done_testing;
-diff -up Package-Stash-XS-0.23/t/compile-time.t.orig
Package-Stash-XS-0.23/t/compile-time.t
---- Package-Stash-XS-0.23/t/compile-time.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/compile-time.t 2011-08-09 09:22:00.372698489 +0100
+diff -up Package-Stash-XS-0.24/t/compile-time.t.orig
Package-Stash-XS-0.24/t/compile-time.t
+--- Package-Stash-XS-0.24/t/compile-time.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/compile-time.t 2011-09-06 09:33:49.978448778 +0100
@@ -2,8 +2,6 @@
use strict;
use warnings;
@@ -105,9 +105,9 @@ diff -up Package-Stash-XS-0.23/t/compile-time.t.orig
Package-Stash-XS-0.23/t/com
use_ok('CompileTime');
-
-done_testing;
-diff -up Package-Stash-XS-0.23/t/edge-cases.t.orig Package-Stash-XS-0.23/t/edge-cases.t
---- Package-Stash-XS-0.23/t/edge-cases.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/edge-cases.t 2011-08-09 09:21:27.243780482 +0100
+diff -up Package-Stash-XS-0.24/t/edge-cases.t.orig Package-Stash-XS-0.24/t/edge-cases.t
+--- Package-Stash-XS-0.24/t/edge-cases.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/edge-cases.t 2011-09-06 09:33:49.978448778 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -123,9 +123,9 @@ diff -up Package-Stash-XS-0.23/t/edge-cases.t.orig
Package-Stash-XS-0.23/t/edge-
is(ref($stash->get_or_add_symbol('$glob')), 'SCALAR', "got an
empty scalar");
-
-done_testing;
-diff -up Package-Stash-XS-0.23/t/extension.t.orig Package-Stash-XS-0.23/t/extension.t
---- Package-Stash-XS-0.23/t/extension.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/extension.t 2011-08-09 09:21:01.122845149 +0100
+diff -up Package-Stash-XS-0.24/t/extension.t.orig Package-Stash-XS-0.24/t/extension.t
+--- Package-Stash-XS-0.24/t/extension.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/extension.t 2011-09-06 09:33:49.979448775 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -141,9 +141,9 @@ diff -up Package-Stash-XS-0.23/t/extension.t.orig
Package-Stash-XS-0.23/t/extens
ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
-
-done_testing;
-diff -up Package-Stash-XS-0.23/t/get.t.orig Package-Stash-XS-0.23/t/get.t
---- Package-Stash-XS-0.23/t/get.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/get.t 2011-08-09 09:21:01.167845036 +0100
+diff -up Package-Stash-XS-0.24/t/get.t.orig Package-Stash-XS-0.24/t/get.t
+--- Package-Stash-XS-0.24/t/get.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/get.t 2011-09-06 09:33:49.979448775 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -159,9 +159,9 @@ diff -up Package-Stash-XS-0.23/t/get.t.orig
Package-Stash-XS-0.23/t/get.t
}
-
-done_testing;
-diff -up Package-Stash-XS-0.23/t/io.t.orig Package-Stash-XS-0.23/t/io.t
---- Package-Stash-XS-0.23/t/io.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/io.t 2011-08-09 09:21:01.151845076 +0100
+diff -up Package-Stash-XS-0.24/t/io.t.orig Package-Stash-XS-0.24/t/io.t
+--- Package-Stash-XS-0.24/t/io.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/io.t 2011-09-06 09:33:49.980448772 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -177,9 +177,9 @@ diff -up Package-Stash-XS-0.23/t/io.t.orig
Package-Stash-XS-0.23/t/io.t
}
-
-done_testing;
-diff -up Package-Stash-XS-0.23/t/isa.t.orig Package-Stash-XS-0.23/t/isa.t
---- Package-Stash-XS-0.23/t/isa.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/isa.t 2011-08-09 09:21:01.199844957 +0100
+diff -up Package-Stash-XS-0.24/t/isa.t.orig Package-Stash-XS-0.24/t/isa.t
+--- Package-Stash-XS-0.24/t/isa.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/isa.t 2011-09-06 09:33:49.980448772 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -199,9 +199,27 @@ diff -up Package-Stash-XS-0.23/t/isa.t.orig
Package-Stash-XS-0.23/t/isa.t
-
-done_testing;
+}
-diff -up Package-Stash-XS-0.23/t/scalar-values.t.orig
Package-Stash-XS-0.23/t/scalar-values.t
---- Package-Stash-XS-0.23/t/scalar-values.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/scalar-values.t 2011-08-09 09:22:00.396698428 +0100
+diff -up Package-Stash-XS-0.24/t/paamayim_nekdotayim.t.orig
Package-Stash-XS-0.24/t/paamayim_nekdotayim.t
+--- Package-Stash-XS-0.24/t/paamayim_nekdotayim.t.orig 2011-09-06 04:20:20.000000000
+0100
++++ Package-Stash-XS-0.24/t/paamayim_nekdotayim.t 2011-09-06 09:34:21.422365021 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 3;
+ use Test::Fatal;
+
+ use Package::Stash;
+@@ -24,5 +24,3 @@ like(
+ qr/^Variable names may not contain ::/,
+ "can't add symbol with ::"
+ );
+-
+-done_testing;
+diff -up Package-Stash-XS-0.24/t/scalar-values.t.orig
Package-Stash-XS-0.24/t/scalar-values.t
+--- Package-Stash-XS-0.24/t/scalar-values.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/scalar-values.t 2011-09-06 09:33:49.980448772 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -217,9 +235,9 @@ diff -up Package-Stash-XS-0.23/t/scalar-values.t.orig
Package-Stash-XS-0.23/t/sc
"can add vstring values");
-
-done_testing;
-diff -up Package-Stash-XS-0.23/t/stash-deletion.t.orig
Package-Stash-XS-0.23/t/stash-deletion.t
---- Package-Stash-XS-0.23/t/stash-deletion.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/stash-deletion.t 2011-08-09 09:22:00.396698428 +0100
+diff -up Package-Stash-XS-0.24/t/stash-deletion.t.orig
Package-Stash-XS-0.24/t/stash-deletion.t
+--- Package-Stash-XS-0.24/t/stash-deletion.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/stash-deletion.t 2011-09-06 09:33:49.981448769 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -235,9 +253,9 @@ diff -up Package-Stash-XS-0.23/t/stash-deletion.t.orig
Package-Stash-XS-0.23/t/s
}
-
-done_testing;
-diff -up Package-Stash-XS-0.23/t/synopsis.t.orig Package-Stash-XS-0.23/t/synopsis.t
---- Package-Stash-XS-0.23/t/synopsis.t.orig 2011-08-08 16:43:44.000000000 +0100
-+++ Package-Stash-XS-0.23/t/synopsis.t 2011-08-09 09:21:01.274844771 +0100
+diff -up Package-Stash-XS-0.24/t/synopsis.t.orig Package-Stash-XS-0.24/t/synopsis.t
+--- Package-Stash-XS-0.24/t/synopsis.t.orig 2011-09-06 04:20:20.000000000 +0100
++++ Package-Stash-XS-0.24/t/synopsis.t 2011-09-06 09:33:49.981448769 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
diff --git a/perl-Package-Stash-XS.spec b/perl-Package-Stash-XS.spec
index 79cd05c..b7a3198 100644
--- a/perl-Package-Stash-XS.spec
+++ b/perl-Package-Stash-XS.spec
@@ -1,5 +1,5 @@
Name: perl-Package-Stash-XS
-Version: 0.23
+Version: 0.25
Release: 1%{?dist}
Summary: Faster and more correct implementation of the Package::Stash API
Group: Development/Libraries
@@ -7,8 +7,8 @@ License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Package-Stash-XS/
Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-%{versio...
Patch0: Package-Stash-XS-0.23-old-eumm.patch
-Patch1: Package-Stash-XS-0.23-old-Test::More.patch
-Patch2: Package-Stash-XS-0.21-no-Test::LeakTrace.patch
+Patch1: Package-Stash-XS-0.24-old-Test::More.patch
+Patch2: Package-Stash-XS-0.24-no-Test::LeakTrace.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildRequires: perl >= 3:5.8.1
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -77,6 +77,12 @@ rm -rf %{buildroot}
%{_mandir}/man3/Package::Stash::XS.3pm*
%changelog
+* Tue Sep 6 2011 Paul Howarth <paul(a)city-fan.org> - 0.25-1
+- Update to 0.25
+ - Invalid package names (for instance, Foo:Bar) are not allowed
+ - Invalid stash entry names (anything containing ::) are not allowed
+- Update patches to apply cleanly
+
* Tue Aug 9 2011 Paul Howarth <paul(a)city-fan.org> - 0.23-1
- Update to 0.23
- Fix the test for scalar values, again
diff --git a/sources b/sources
index 142aa82..803a1a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e238e932a2d579260b49c0f633165559 Package-Stash-XS-0.23.tar.gz
+52ece18842c46da8fb7a4a14dea910ab Package-Stash-XS-0.25.tar.gz