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

[notifications at fedoraproject.org]

From fc2e8abf540aae8bb1db3655a966a1d5a72c23f4 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik at redhat.com>
Date: Thu, 24 Sep 2015 10:41:39 +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 038e972..b068ffc 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:        327%{?dist}
+Release:        328%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -105,6 +105,10 @@ Patch27:        perl-5.21.6-Report-inaccesible-file-on-failed-require.patch
 # RT#123338, in upstream after 5.21.6
 Patch28:        perl-5.21.6-t-op-taint.t-Perform-SHA-256-algorithm-by-crypt-if-d.patch
 
+# Fix debugger y command scope level, bug #1129850,
+# riIn upstream after 5.21.3
+Patch29:        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
 
@@ -2043,6 +2047,7 @@ tarball from perl.org.
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
 %patch200 -p1
 %patch201 -p1
 
@@ -2064,6 +2069,7 @@ perl -x patchlevel.h \
     'Fedora Patch26: Make *DBM_File desctructors thread-safe (RT#61912)' \
     'Fedora Patch27: Report inaccesible file on failed require (RT#123270)' \
     'Fedora Patch28: Use stronger algorithm needed for FIPS in t/op/taint.t (RT#123338)' \
+    'Fedora Patch29: 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}
@@ -3917,6 +3923,9 @@ sed \
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Thu Sep 24 2015 Jitka Plesnikova <jplesnik at redhat.com> - 4:5.20.3-328
+- Fix debugger y command scope level (bug #1129850)
+
 * Mon Sep 14 2015 Jitka Plesnikova <jplesnik at redhat.com> - 4:5.20.3-327
 - 5.20.3 bump (see <http://search.cpan.org/dist/perl-5.20.3/pod/perldelta.pod>
   for release notes
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl.git/commit/?h=f22&id=fc2e8abf540aae8bb1db3655a966a1d5a72c23f4