jplesnik pushed to perl (f21). "Fix debugger y command scope level (bug #1129850)"

[notifications at fedoraproject.org]

From 868e7c707e0489367c5289a4cd8c278f60f8c928 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik at redhat.com>
Date: Thu, 24 Sep 2015 11:12:48 +0200
Subject: Fix debugger y command scope level (bug #1129850)


diff --git a/perl-5.21.3-fix-debugger-y-command-scope-level.patch b/perl-5.21.3-fix-debugger-y-command-scope-level.patch
new file mode 100644
index 0000000..5c9b1ee
--- /dev/null
+++ b/perl-5.21.3-fix-debugger-y-command-scope-level.patch
@@ -0,0 +1,28 @@
+From 496f5ba57a43840a3c8ee61b21dc60d0c8bb5d52 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony at develop-help.com>
+Date: Fri, 15 Aug 2014 10:45:57 +1000
+Subject: [PATCH] fix debugger y command scope level
+
+5c2b78e73d3 moved handling of the y command into its own function,
+but did not adjust the provided scope level to account for the extra
+scope.
+---
+ lib/perl5db.pl | 2 +-
+ 1 file changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/perl5db.pl b/lib/perl5db.pl
+index e3f63b3..e8d7751 100644
+--- a/lib/perl5db.pl
++++ b/lib/perl5db.pl
+@@ -1957,7 +1957,7 @@ sub _DB__handle_y_command {
+         my @vars = split( ' ', $match_vars || '' );
+ 
+         # Find the pad.
+-        my $h = eval { PadWalker::peek_my( ( $match_level || 0 ) + 1 ) };
++        my $h = eval { PadWalker::peek_my( ( $match_level || 0 ) + 2 ) };
+ 
+         # Oops. Can't find it.
+         if (my $Err = $@) {
+-- 
+2.4.3
+
diff --git a/perl.spec b/perl.spec
index 9215370..26d8c2c 100644
--- a/perl.spec
+++ b/perl.spec
@@ -30,7 +30,7 @@
 Name:           perl
 Version:        %{perl_version}
 # release number must be even higher, because dual-lived modules will be broken otherwise
-Release:        309%{?dist}
+Release:        310%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -136,6 +136,10 @@ Patch25:        perl-5.18.4-CPAN-Attemp-to-create-site-library-directories-on-fi
 # Don't leak the temp utf8 copy of namepv, bug #1062576, CPAN RT#123786
 Patch26:        perl-123786-don-t-leak-the-temp-utf8-copy-of-n.patch
 
+# Fix debugger y command scope level, bug #1129850,
+# in upstream after 5.21.3
+Patch27:        perl-5.21.3-fix-debugger-y-command-scope-level.patch
+
 # Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
 Patch200:       perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
 
@@ -1998,6 +2002,7 @@ tarball from perl.org.
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 %patch200 -p1
 %patch201 -p1
 
@@ -2028,6 +2033,7 @@ perl -x patchlevel.h \
     'Fedora Patch24: Pass -fwrapv to stricter GCC 4.9 (RT#121505)' \
     'Fedora Patch25: Create site paths by cpan for the first time (CPAN RT#99905)' \
     'Fedora Patch26: Do not leak the temp utf8 copy of namepv (CPAN RT#123786)' \
+    'Fedora Patch27: Fix debugger y command scope level' \
     'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
     'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
     %{nil}
@@ -3759,6 +3765,9 @@ sed \
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Thu Sep 24 2015 Jitka Plesnikova <jplesnik at redhat.com> - 4:5.18.1-310
+- Fix debugger y command scope level (bug #1129850)
+
 * Wed Sep 16 2015 Jitka Plesnikova <jplesnik at redhat.com> - 4:5.18.1-309
 - Don't leak the temp utf8 copy of namepv (bug #1062576)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl.git/commit/?h=f21&id=868e7c707e0489367c5289a4cd8c278f60f8c928