From 1a294d28ce820abeef16899d3dbb70a3cec87b74 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Tue, 6 Sep 2011 20:29:32 +0100
Subject: [PATCH] Update to 0.32

- New upstream release 0.32
  - Bring the behavior of has_symbol for nonexistant scalars into line with the
    XS version
  - Invalid package names (for instance, Foo:Bar) are not allowed
  - Invalid stash entry names (anything containing ::) are not allowed
- Update patches to apply cleanly
- Bump perl(Package::Stash::XS) version requirement to 0.24
---
 .gitignore                                    |   1 +
 Package-Stash-0.25-no-Test::LeakTrace.patch   |  26 ---
 ...=> Package-Stash-0.32-EU::MM-version.patch |   4 +-
 Package-Stash-0.32-no-Test::LeakTrace.patch   |  26 +++
 ...=> Package-Stash-0.32-old-Test::More.patch | 194 ++++++++++--------
 perl-Package-Stash.spec                       |  21 +-
 sources                                       |   2 +-
 7 files changed, 151 insertions(+), 123 deletions(-)
 delete mode 100644 Package-Stash-0.25-no-Test::LeakTrace.patch
 rename Package-Stash-0.30-EU::MM-version.patch => Package-Stash-0.32-EU::MM-version.patch (89%)
 create mode 100644 Package-Stash-0.32-no-Test::LeakTrace.patch
 rename Package-Stash-0.31-old-Test::More.patch => Package-Stash-0.32-old-Test::More.patch (55%)

diff --git a/.gitignore b/.gitignore
index 83dcea3..abd633f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /Package-Stash-[0-9.]*\.tar\.gz
+/Package-Stash-0.32.tar.gz
diff --git a/Package-Stash-0.25-no-Test::LeakTrace.patch b/Package-Stash-0.25-no-Test::LeakTrace.patch
deleted file mode 100644
index caa832f..0000000
--- a/Package-Stash-0.25-no-Test::LeakTrace.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up Package-Stash-0.23/t/author-20-leaks.t.orig Package-Stash-0.23/t/author-20-leaks.t
---- Package-Stash-0.23/t/author-20-leaks.t.orig	2011-01-12 09:57:19.000000000 +0000
-+++ Package-Stash-0.23/t/author-20-leaks.t	2011-01-12 09:58:40.139310210 +0000
-@@ -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 $@;
- 
- plan tests => 25;
- 
-diff -up Package-Stash-0.23/t/author-21-leaks-debug.t.orig Package-Stash-0.23/t/author-21-leaks-debug.t
---- Package-Stash-0.23/t/author-21-leaks-debug.t.orig	2011-01-12 09:57:19.000000000 +0000
-+++ Package-Stash-0.23/t/author-21-leaks-debug.t	2011-01-12 09:58:51.082622361 +0000
-@@ -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 $@;
- 
- plan tests => 25;
- 
diff --git a/Package-Stash-0.30-EU::MM-version.patch b/Package-Stash-0.32-EU::MM-version.patch
similarity index 89%
rename from Package-Stash-0.30-EU::MM-version.patch
rename to Package-Stash-0.32-EU::MM-version.patch
index b34d440..23093c7 100644
--- a/Package-Stash-0.30-EU::MM-version.patch
+++ b/Package-Stash-0.32-EU::MM-version.patch
@@ -18,13 +18,13 @@
    },
    'DISTNAME' => 'Package-Stash',
    'EXE_FILES' => [
-@@ -51,6 +51,9 @@
+@@ -52,6 +52,9 @@
  delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
    unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
  
 +delete $WriteMakefileArgs{LICENSE}
 +  unless eval { ExtUtils::MakeMaker->VERSION(6.30) };
 +
- $WriteMakefileArgs{PREREQ_PM}{'Package::Stash::XS'} = 0.22
+ $WriteMakefileArgs{PREREQ_PM}{'Package::Stash::XS'} = 0.24
    if can_cc();
  
diff --git a/Package-Stash-0.32-no-Test::LeakTrace.patch b/Package-Stash-0.32-no-Test::LeakTrace.patch
new file mode 100644
index 0000000..a1a32b3
--- /dev/null
+++ b/Package-Stash-0.32-no-Test::LeakTrace.patch
@@ -0,0 +1,26 @@
+diff -up Package-Stash-0.32/t/author-leaks-debug.t.orig Package-Stash-0.32/t/author-leaks-debug.t
+--- Package-Stash-0.32/t/author-leaks-debug.t.orig	2011-09-06 12:43:32.000000000 +0100
++++ Package-Stash-0.32/t/author-leaks-debug.t	2011-09-06 12:45:29.866712947 +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 $@;
+ 
+ plan tests => 29;
+ 
+diff -up Package-Stash-0.32/t/author-leaks.t.orig Package-Stash-0.32/t/author-leaks.t
+--- Package-Stash-0.32/t/author-leaks.t.orig	2011-09-06 12:43:32.000000000 +0100
++++ Package-Stash-0.32/t/author-leaks.t	2011-09-06 12:45:58.177640368 +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 $@;
+ 
+ plan tests => 29;
+ 
diff --git a/Package-Stash-0.31-old-Test::More.patch b/Package-Stash-0.32-old-Test::More.patch
similarity index 55%
rename from Package-Stash-0.31-old-Test::More.patch
rename to Package-Stash-0.32-old-Test::More.patch
index bce494a..e33d974 100644
--- a/Package-Stash-0.31-old-Test::More.patch
+++ b/Package-Stash-0.32-old-Test::More.patch
@@ -1,6 +1,6 @@
-diff -up Package-Stash-0.31/t/addsub.t.orig Package-Stash-0.31/t/addsub.t
---- Package-Stash-0.31/t/addsub.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/addsub.t	2011-08-09 09:41:59.191745893 +0100
+diff -up Package-Stash-0.32/t/addsub.t.orig Package-Stash-0.32/t/addsub.t
+--- Package-Stash-0.32/t/addsub.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/addsub.t	2011-09-06 12:32:22.277728975 +0100
 @@ -2,7 +2,7 @@
  use strict;
  use warnings;
@@ -16,48 +16,19 @@ diff -up Package-Stash-0.31/t/addsub.t.orig Package-Stash-0.31/t/addsub.t
      '... got the right %DB::sub value for dunk with specified args';
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/author-20-leaks.t.orig Package-Stash-0.31/t/author-20-leaks.t
---- Package-Stash-0.31/t/author-20-leaks.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/author-20-leaks.t	2011-08-09 09:41:59.214745838 +0100
+diff -up Package-Stash-0.32/t/author-leaks-debug.t.orig Package-Stash-0.32/t/author-leaks-debug.t
+--- Package-Stash-0.32/t/author-leaks-debug.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/author-leaks-debug.t	2011-09-06 12:32:22.341728808 +0100
 @@ -14,6 +14,8 @@ use Test::More;
  use Test::Fatal;
  use Test::LeakTrace;
  
-+plan tests => 25;
-+
- use Package::Stash;
- use Symbol;
- 
-@@ -144,7 +146,10 @@ use Symbol;
-     ok($foo->has_symbol('@ISA'));
-     is(ref($foo->get_symbol('@ISA')), 'ARRAY');
-     is_deeply($foo->get_symbol('@ISA'), ['Exporter']);
-+    SKIP: {
-+    skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
-     isa_ok('Foo', 'Exporter');
-+    }
- }
- 
- {
-@@ -198,5 +203,3 @@ use Symbol;
-         eval { $foo->get_or_add_symbol('&blorg') };
-     } "doesn't leak on errors";
- }
--
--done_testing;
-diff -up Package-Stash-0.31/t/author-21-leaks-debug.t.orig Package-Stash-0.31/t/author-21-leaks-debug.t
---- Package-Stash-0.31/t/author-21-leaks-debug.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/author-21-leaks-debug.t	2011-08-09 09:41:59.215745836 +0100
-@@ -14,6 +14,8 @@ use Test::More;
- use Test::Fatal;
- use Test::LeakTrace;
- 
-+plan tests => 25;
++plan tests => 29;
 +
  BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
  
  use Package::Stash;
-@@ -146,7 +148,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']);
@@ -68,33 +39,62 @@ diff -up Package-Stash-0.31/t/author-21-leaks-debug.t.orig Package-Stash-0.31/t/
  }
  
  {
-@@ -200,5 +205,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-0.31/t/basic.t.orig Package-Stash-0.31/t/basic.t
---- Package-Stash-0.31/t/basic.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/basic.t	2011-08-09 09:41:59.215745836 +0100
+diff -up Package-Stash-0.32/t/author-leaks.t.orig Package-Stash-0.32/t/author-leaks.t
+--- Package-Stash-0.32/t/author-leaks.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/author-leaks.t	2011-09-06 12:32:22.294728930 +0100
+@@ -14,6 +14,8 @@ use Test::More;
+ use Test::Fatal;
+ use Test::LeakTrace;
+ 
++plan tests => 29;
++
+ use Package::Stash;
+ 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']);
++    SKIP: {
++    skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
+     isa_ok('Foo', 'Exporter');
++    }
+ }
+ 
+ {
+@@ -206,5 +211,3 @@ use Symbol;
+         eval { $foo->get_or_add_symbol('&blorg') };
+     } "doesn't leak on errors";
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.32/t/basic.t.orig Package-Stash-0.32/t/basic.t
+--- Package-Stash-0.32/t/basic.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/basic.t	2011-09-06 12:32:53.015648488 +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-0.31/t/compile-time.t.orig Package-Stash-0.31/t/compile-time.t
---- Package-Stash-0.31/t/compile-time.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/compile-time.t	2011-08-09 09:42:22.757688109 +0100
+diff -up Package-Stash-0.32/t/compile-time.t.orig Package-Stash-0.32/t/compile-time.t
+--- Package-Stash-0.32/t/compile-time.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/compile-time.t	2011-09-06 12:32:22.342728805 +0100
 @@ -2,8 +2,6 @@
  use strict;
  use warnings;
@@ -105,9 +105,9 @@ diff -up Package-Stash-0.31/t/compile-time.t.orig Package-Stash-0.31/t/compile-t
  use_ok('CompileTime');
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/edge-cases.t.orig Package-Stash-0.31/t/edge-cases.t
---- Package-Stash-0.31/t/edge-cases.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/edge-cases.t	2011-08-09 09:41:59.215745836 +0100
+diff -up Package-Stash-0.32/t/edge-cases.t.orig Package-Stash-0.32/t/edge-cases.t
+--- Package-Stash-0.32/t/edge-cases.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/edge-cases.t	2011-09-06 12:32:22.342728805 +0100
 @@ -2,7 +2,7 @@
  use strict;
  use warnings;
@@ -123,9 +123,9 @@ diff -up Package-Stash-0.31/t/edge-cases.t.orig Package-Stash-0.31/t/edge-cases.
  is(ref($stash->get_or_add_symbol('$glob')), 'SCALAR', "got an empty scalar");
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/extension.t.orig Package-Stash-0.31/t/extension.t
---- Package-Stash-0.31/t/extension.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/extension.t	2011-08-09 09:41:59.216745833 +0100
+diff -up Package-Stash-0.32/t/extension.t.orig Package-Stash-0.32/t/extension.t
+--- Package-Stash-0.32/t/extension.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/extension.t	2011-09-06 12:32:22.343728802 +0100
 @@ -2,7 +2,7 @@
  use strict;
  use warnings;
@@ -141,9 +141,9 @@ diff -up Package-Stash-0.31/t/extension.t.orig Package-Stash-0.31/t/extension.t
  ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/get.t.orig Package-Stash-0.31/t/get.t
---- Package-Stash-0.31/t/get.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/get.t	2011-08-09 09:41:59.216745833 +0100
+diff -up Package-Stash-0.32/t/get.t.orig Package-Stash-0.32/t/get.t
+--- Package-Stash-0.32/t/get.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/get.t	2011-09-06 12:32:22.343728802 +0100
 @@ -2,7 +2,7 @@
  use strict;
  use warnings;
@@ -159,9 +159,9 @@ diff -up Package-Stash-0.31/t/get.t.orig Package-Stash-0.31/t/get.t
  }
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/impl-selection/basic-pp.t.orig Package-Stash-0.31/t/impl-selection/basic-pp.t
---- Package-Stash-0.31/t/impl-selection/basic-pp.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/impl-selection/basic-pp.t	2011-08-09 09:41:59.216745833 +0100
+diff -up Package-Stash-0.32/t/impl-selection/basic-pp.t.orig Package-Stash-0.32/t/impl-selection/basic-pp.t
+--- Package-Stash-0.32/t/impl-selection/basic-pp.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/impl-selection/basic-pp.t	2011-09-06 12:32:22.344728799 +0100
 @@ -1,7 +1,7 @@
  #!/usr/bin/env perl
  use strict;
@@ -177,9 +177,9 @@ diff -up Package-Stash-0.31/t/impl-selection/basic-pp.t.orig Package-Stash-0.31/
  }
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/impl-selection/basic-xs.t.orig Package-Stash-0.31/t/impl-selection/basic-xs.t
---- Package-Stash-0.31/t/impl-selection/basic-xs.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/impl-selection/basic-xs.t	2011-08-09 09:41:59.216745833 +0100
+diff -up Package-Stash-0.32/t/impl-selection/basic-xs.t.orig Package-Stash-0.32/t/impl-selection/basic-xs.t
+--- Package-Stash-0.32/t/impl-selection/basic-xs.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/impl-selection/basic-xs.t	2011-09-06 12:32:22.344728799 +0100
 @@ -1,7 +1,7 @@
  #!/usr/bin/env perl
  use strict;
@@ -195,9 +195,9 @@ diff -up Package-Stash-0.31/t/impl-selection/basic-xs.t.orig Package-Stash-0.31/
  }
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/impl-selection/choice.t.orig Package-Stash-0.31/t/impl-selection/choice.t
---- Package-Stash-0.31/t/impl-selection/choice.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/impl-selection/choice.t	2011-08-09 09:41:59.217745830 +0100
+diff -up Package-Stash-0.32/t/impl-selection/choice.t.orig Package-Stash-0.32/t/impl-selection/choice.t
+--- Package-Stash-0.32/t/impl-selection/choice.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/impl-selection/choice.t	2011-09-06 12:32:22.345728796 +0100
 @@ -1,7 +1,7 @@
  #!/usr/bin/env perl
  use strict;
@@ -213,9 +213,9 @@ diff -up Package-Stash-0.31/t/impl-selection/choice.t.orig Package-Stash-0.31/t/
  can_ok('Package::Stash', 'new');
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/impl-selection/env.t.orig Package-Stash-0.31/t/impl-selection/env.t
---- Package-Stash-0.31/t/impl-selection/env.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/impl-selection/env.t	2011-08-09 09:41:59.217745830 +0100
+diff -up Package-Stash-0.32/t/impl-selection/env.t.orig Package-Stash-0.32/t/impl-selection/env.t
+--- Package-Stash-0.32/t/impl-selection/env.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/impl-selection/env.t	2011-09-06 12:32:22.345728796 +0100
 @@ -1,7 +1,7 @@
  #!/usr/bin/env perl
  use strict;
@@ -231,9 +231,9 @@ diff -up Package-Stash-0.31/t/impl-selection/env.t.orig Package-Stash-0.31/t/imp
  }
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/impl-selection/var.t.orig Package-Stash-0.31/t/impl-selection/var.t
---- Package-Stash-0.31/t/impl-selection/var.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/impl-selection/var.t	2011-08-09 09:41:59.217745830 +0100
+diff -up Package-Stash-0.32/t/impl-selection/var.t.orig Package-Stash-0.32/t/impl-selection/var.t
+--- Package-Stash-0.32/t/impl-selection/var.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/impl-selection/var.t	2011-09-06 12:32:22.346728793 +0100
 @@ -1,7 +1,7 @@
  #!/usr/bin/env perl
  use strict;
@@ -249,9 +249,9 @@ diff -up Package-Stash-0.31/t/impl-selection/var.t.orig Package-Stash-0.31/t/imp
  }
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/io.t.orig Package-Stash-0.31/t/io.t
---- Package-Stash-0.31/t/io.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/io.t	2011-08-09 09:41:59.217745830 +0100
+diff -up Package-Stash-0.32/t/io.t.orig Package-Stash-0.32/t/io.t
+--- Package-Stash-0.32/t/io.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/io.t	2011-09-06 12:32:22.346728793 +0100
 @@ -2,7 +2,7 @@
  use strict;
  use warnings;
@@ -267,9 +267,9 @@ diff -up Package-Stash-0.31/t/io.t.orig Package-Stash-0.31/t/io.t
  }
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/isa.t.orig Package-Stash-0.31/t/isa.t
---- Package-Stash-0.31/t/isa.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/isa.t	2011-08-09 09:41:59.218745827 +0100
+diff -up Package-Stash-0.32/t/isa.t.orig Package-Stash-0.32/t/isa.t
+--- Package-Stash-0.32/t/isa.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/isa.t	2011-09-06 12:32:22.346728793 +0100
 @@ -2,7 +2,7 @@
  use strict;
  use warnings;
@@ -289,9 +289,27 @@ diff -up Package-Stash-0.31/t/isa.t.orig Package-Stash-0.31/t/isa.t
 -
 -done_testing;
 +}
-diff -up Package-Stash-0.31/t/scalar-values.t.orig Package-Stash-0.31/t/scalar-values.t
---- Package-Stash-0.31/t/scalar-values.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/scalar-values.t	2011-08-09 09:42:51.692617168 +0100
+diff -up Package-Stash-0.32/t/paamayim_nekdotayim.t.orig Package-Stash-0.32/t/paamayim_nekdotayim.t
+--- Package-Stash-0.32/t/paamayim_nekdotayim.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/paamayim_nekdotayim.t	2011-09-06 12:33:52.822495894 +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-0.32/t/scalar-values.t.orig Package-Stash-0.32/t/scalar-values.t
+--- Package-Stash-0.32/t/scalar-values.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/scalar-values.t	2011-09-06 12:32:22.347728790 +0100
 @@ -2,7 +2,7 @@
  use strict;
  use warnings;
@@ -307,9 +325,9 @@ diff -up Package-Stash-0.31/t/scalar-values.t.orig Package-Stash-0.31/t/scalar-v
     "can add vstring values");
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/stash-deletion.t.orig Package-Stash-0.31/t/stash-deletion.t
---- Package-Stash-0.31/t/stash-deletion.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/stash-deletion.t	2011-08-09 09:43:10.964569928 +0100
+diff -up Package-Stash-0.32/t/stash-deletion.t.orig Package-Stash-0.32/t/stash-deletion.t
+--- Package-Stash-0.32/t/stash-deletion.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/stash-deletion.t	2011-09-06 12:32:22.347728790 +0100
 @@ -2,7 +2,7 @@
  use strict;
  use warnings;
@@ -325,9 +343,9 @@ diff -up Package-Stash-0.31/t/stash-deletion.t.orig Package-Stash-0.31/t/stash-d
  }
 -
 -done_testing;
-diff -up Package-Stash-0.31/t/synopsis.t.orig Package-Stash-0.31/t/synopsis.t
---- Package-Stash-0.31/t/synopsis.t.orig	2011-08-08 16:43:29.000000000 +0100
-+++ Package-Stash-0.31/t/synopsis.t	2011-08-09 09:41:59.218745827 +0100
+diff -up Package-Stash-0.32/t/synopsis.t.orig Package-Stash-0.32/t/synopsis.t
+--- Package-Stash-0.32/t/synopsis.t.orig	2011-09-06 04:23:06.000000000 +0100
++++ Package-Stash-0.32/t/synopsis.t	2011-09-06 12:32:22.348728788 +0100
 @@ -2,7 +2,7 @@
  use strict;
  use warnings;
diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index 1770d7a..a9b1c61 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -5,24 +5,24 @@
 %global old_eumm %(perl -MExtUtils::MakeMaker -e 'printf "%d\\n", $ExtUtils::MakeMaker::VERSION < 6.30 ? 1 : 0;' 2>/dev/null || echo 0)
 
 Name:		perl-Package-Stash
-Version:	0.31
+Version:	0.32
 Release:	1%{?dist}
 Summary:	Routines for manipulating stashes
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/Package-Stash/
 Source0:	http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-%{version}.tar.gz
-Patch0:		Package-Stash-0.30-EU::MM-version.patch
-Patch1:		Package-Stash-0.31-old-Test::More.patch
+Patch0:		Package-Stash-0.32-EU::MM-version.patch
+Patch1:		Package-Stash-0.32-old-Test::More.patch
 Patch2:		Package-Stash-0.31-no-Test::Requires.patch
-Patch3:		Package-Stash-0.25-no-Test::LeakTrace.patch
+Patch3:		Package-Stash-0.32-no-Test::LeakTrace.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
 BuildRequires:	perl(Dist::CheckConflicts) >= 0.02
 BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Scalar::Util)
 BuildRequires:	perl(Package::DeprecationManager)
-BuildRequires:	perl(Package::Stash::XS) >= 0.22
+BuildRequires:	perl(Package::Stash::XS) >= 0.24
 BuildRequires:	perl(Pod::Coverage::TrustPod)
 BuildRequires:	perl(Test::EOL)
 BuildRequires:	perl(Test::Fatal)
@@ -41,7 +41,7 @@ BuildRequires:	perl(Test::Script)
 %endif
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 # For performance and consistency
-Requires:	perl(Package::Stash::XS) >= 0.22
+Requires:	perl(Package::Stash::XS) >= 0.24
 # Not found by rpm auto-provides
 Provides:	perl(Package::Stash::Conflicts) = 0
 
@@ -99,6 +99,15 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Package::Stash::PP.3pm*
 
 %changelog
+* Tue Sep  6 2011 Paul Howarth <paul@city-fan.org> - 0.32-1
+- Update to 0.32
+  - Bring the behavior of has_symbol for nonexistant scalars into line with the
+    XS version
+  - Invalid package names (for instance, Foo:Bar) are not allowed
+  - Invalid stash entry names (anything containing ::) are not allowed
+- Update patches to apply cleanly
+- Bump perl(Package::Stash::XS) version requirement to 0.24
+
 * Tue Aug  9 2011 Paul Howarth <paul@city-fan.org> - 0.31-1
 - Update to 0.31
   - Fix ->add_symbol('$foo', qr/sdlfk/) on 5.12+
diff --git a/sources b/sources
index 2dc2a7c..455f2f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fa2b3318c9c9db1188330db2a3f8a19  Package-Stash-0.31.tar.gz
+bc93efbcf02be35bdb86063b9805333b  Package-Stash-0.32.tar.gz