[SCM] Debian packaging of libdata-dump-streamer-perl branch, master, updated. debian/2.34-1-11-gb9e3a81
gregor herrmann
gregoa at debian.org
Fri May 24 23:58:57 UTC 2013
The following commit has been merged in the master branch:
commit 7cc3d6115bedad257fca41dfdb8e953deb4f6a1b
Author: gregor herrmann <gregoa at debian.org>
Date: Sat May 25 01:53:17 2013 +0200
Add patch from CPAN RT to fix regex dumping in newer perl.
Closes: #709665
diff --git a/debian/patches/perl-5.18.patch b/debian/patches/perl-5.18.patch
new file mode 100644
index 0000000..13bde3b
--- /dev/null
+++ b/debian/patches/perl-5.18.patch
@@ -0,0 +1,58 @@
+Description: Fix regexp dumping on perl 5.17.6+
+Origin: CPAN RT
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=82958
+Bug-Debian: http://bugs.debian.org/709665
+Forwarded: not-needed
+Author: ilmari [...] ilmari.org
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-05-25
+
+---
+ lib/Data/Dump/Streamer.pm | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- a/lib/Data/Dump/Streamer.pm
++++ b/lib/Data/Dump/Streamer.pm
+@@ -127,7 +127,7 @@
+ # As I write this, 5.13.10 doesn't exist so I'm guessing that
+ # we can begin using the ordinary core function again.
+ eval q[
+- use re qw(regexp_pattern);
++ use re qw(regexp_pattern is_regexp);
+ *regex= *regexp_pattern;
+ ] or die $@;
+ }
+@@ -135,7 +135,7 @@
+ # Perl-5.13.6 through perl-5.13.9 began returning modifier
+ # flags that weren't yet legal at the time.
+ eval q[
+- use re qw(regexp_pattern);
++ use re qw(regexp_pattern is_regexp);
+ sub regex {
+ if (wantarray) {
+ my ($pat,$mod) = regexp_pattern($_[0]);
+@@ -153,11 +153,14 @@
+ }
+ elsif ($]>=5.009004) {
+ eval q[
+- use re qw(regexp_pattern);
++ use re qw(regexp_pattern is_regexp);
+ *regex= *regexp_pattern;
+ 1;
+ ] or die $@;
+ }
++ else {
++ eval q[sub is_regexp($) { defined regex($_[0]) }];
++ }
+ if ($]<=5.008) {
+ *hidden_keys=sub(\%) { return () };
+ *legal_keys=sub(\%) { return keys %{$_[0]} };
+@@ -2827,7 +2830,7 @@
+ $idx=$self->{ref}{$addr};
+ $type=reftype($item);
+ $class=blessed($item);
+- $class=undef if $class and $class eq 'Regexp' and regex $item;
++ $class=undef if $class and $class eq 'Regexp' and is_regexp $item;
+
+ $DEBUG and
+ printf "_dump_rv %d %s %#x\n",$depth,$name,$addr;
diff --git a/debian/patches/series b/debian/patches/series
index 5622f22..6d7b55f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fix-pod-spelling.patch
+perl-5.18.patch
--
Debian packaging of libdata-dump-streamer-perl
More information about the Pkg-perl-cvs-commits
mailing list