commit a15730cda231524745ac1497f9b36bf367da353e
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Mon Oct 20 12:33:46 2014 +0200
Fix perl stack handling after a subroutine call
Encode-2.54-SPAGAIN_after_callpv.patch | 35 ++++++++++++++++++++++++++++++++
perl-Encode.spec | 8 ++++++-
2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/Encode-2.54-SPAGAIN_after_callpv.patch b/Encode-2.54-SPAGAIN_after_callpv.patch
new file mode 100644
index 0000000..a8b2190
--- /dev/null
+++ b/Encode-2.54-SPAGAIN_after_callpv.patch
@@ -0,0 +1,35 @@
+From c2b2772d2d14724d16baa0ca0cb16eca7a48a38e Mon Sep 17 00:00:00 2001
+From: Dan Kogai <dankogai+github@xxxxxxxxx>
+Date: Sun, 19 Oct 2014 15:58:32 +0900
+Subject: [PATCH] pre-2.63
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx>
+
+Petr Pisar: Ported to 2.54.
+
+diff --git a/Encode.xs b/Encode.xs
+index 71740cf..b545604 100644
+--- a/Encode.xs
++++ b/Encode.xs
+@@ -686,6 +686,7 @@ CODE:
+ /* require_pv(PERLIO_FILENAME); */
+
+ eval_pv("require PerlIO::encoding", 0);
++ SPAGAIN;
+
+ if (SvTRUE(get_sv("@", 0))) {
+ ST(0) = &PL_sv_no;
+@@ -703,6 +704,7 @@ CODE:
+ encode_t *enc = INT2PTR(encode_t *, SvIV(SvRV(obj)));
+ SV *retval;
+ eval_pv("require Encode::MIME::Name", 0);
++ SPAGAIN;
+
+ if (SvTRUE(get_sv("@", 0))) {
+ ST(0) = &PL_sv_undef;
+--
+1.9.3
+
diff --git a/perl-Encode.spec b/perl-Encode.spec
index 8e38281..c0fa751 100644
--- a/perl-Encode.spec
+++ b/perl-Encode.spec
@@ -1,7 +1,7 @@
Name: perl-Encode
Epoch: 1
Version: 2.54
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Character encodings in Perl
License: GPL+ or Artistic
Group: Development/Libraries
@@ -9,6 +9,8 @@ URL: http://search.cpan.org/dist/Encode/
Source0: http://www.cpan.org/authors/id/D/DA/DANKOGAI/Encode-%{version}.tar.gz
# Stringify all decode_utf8() arguments, bug #1048134, CPAN RT#91569, in 2.56
Patch0: Encode-2.54-Stringify-all-decode_utf8-arguments.patch
+# Fix perl stack handling after a subroutine call, CPAN RT#99264, in 2.63
+Patch1: Encode-2.54-SPAGAIN_after_callpv.patch
BuildRequires: perl
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(File::Spec)
@@ -78,6 +80,7 @@ your own encoding to perl. No knowledge of XS is necessary.
%prep
%setup -q -n Encode-%{version}
%patch0 -p1
+%patch1 -p1
%build
# Additional scripts can be installed by appending MORE_SCRIPTS, UCM files by
@@ -112,6 +115,9 @@ make test
%{perl_vendorarch}/Encode/encode.h
%changelog
+* Mon Oct 20 2014 Petr Pisar <ppisar@xxxxxxxxxx> - 1:2.54-3
+- Fix perl stack handling after a subroutine call
+
* Fri Jan 03 2014 Petr Pisar <ppisar@xxxxxxxxxx> - 1:2.54-2
- Stringify all decode_utf8() arguments (bug #1048134)
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
