From e73deac6dc7861c64ced49d2a35f781d655db79a Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 1 Jul 2014 15:51:53 +0800 Subject: perl, perl-native, perl-ptest: upgrade from 5.14.3 to 5.20.0 Changed: - The Copying has no change, except the company address. - pick patches from debian http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz - Not used by oe: deprecate-with-apt.diff patchlevel.diff fakeroot.diff - Create/Update perl-rdepends_${PV}.inc by the hardcode script; - Update config.sh by: 1) Copy the Perl 5.20.0 source code onto your TARGET machine linux qemuarm 3.14.5-yocto-standard from OE-Core rev: f506d0660c9949485268a92724ac770b5457b0ca 2) Execute sh Configure as normal and configure as required, do not "make"; 3) Compare with the old config.sh files, and update; - perl-ptest.inc 1) Copy the souce code to ptest since almost 112 test cases failed with the reason that no souce code found; 2) Add two patches to fix test case issue; - perl-native Reference perl (5.20.0-1) in debian to update perl shared library headers https://packages.debian.org/experimental/i386/perl/filelist Obsolete: - 09_fix_installperl.patch The dead code was removed from installperl http://perl5.git.perl.org/perl.git/commit/236818e0b9d9fe874831086b4d0b94dc6f245dfd - perl-build-in-t-dir.patch The upstream has fix it. The issue description: Perl cannot cross build in a path containing a directory that has the name of "t". As an example, you can make the perl build fail with "mkdir -p /tmp/build/t", go to the directory, unpack the sources, configure and cross build. - 0001-Fix-misparsing-of-maketext-strings.patch as they are part of the upstream code now: http://perl5.git.perl.org/perl.git/commit/1735f6f53ca19f99c6e9e39496c486af323ba6a8 - 0001-Prevent-premature-hsplit-calls-and-only-trigger-REHA.patch the hash function changed: http://perl5.git.perl.org/perl.git/commit/7dc8663964c66a698d31bbdc8e8abed69bddeec3 (From OE-Core rev: c7ac82415efc42ff7a93c6df163f88f2dde00d26) Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- .../0001-Fix-misparsing-of-maketext-strings.patch | 86 ---------------------- 1 file changed, 86 deletions(-) delete mode 100644 meta/recipes-devtools/perl/perl-5.14.3/0001-Fix-misparsing-of-maketext-strings.patch (limited to 'meta/recipes-devtools/perl/perl-5.14.3/0001-Fix-misparsing-of-maketext-strings.patch') diff --git a/meta/recipes-devtools/perl/perl-5.14.3/0001-Fix-misparsing-of-maketext-strings.patch b/meta/recipes-devtools/perl/perl-5.14.3/0001-Fix-misparsing-of-maketext-strings.patch deleted file mode 100644 index 89ec6eff0f..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/0001-Fix-misparsing-of-maketext-strings.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 1735f6f53ca19f99c6e9e39496c486af323ba6a8 Mon Sep 17 00:00:00 2001 -From: Brian Carlson -Date: Wed, 28 Nov 2012 08:54:33 -0500 -Subject: [PATCH] Fix misparsing of maketext strings. - -Case 61251: This commit fixes a misparse of maketext strings that could -lead to arbitrary code execution. Basically, maketext was compiling -bracket notation into functions, but neglected to escape backslashes -inside the content or die on fully-qualified method names when -generating the code. This change escapes all such backslashes and dies -when a method name with a colon or apostrophe is specified. ---- - AUTHORS | 1 + - dist/Locale-Maketext/lib/Locale/Maketext.pm | 24 ++++++++---------------- - 2 files changed, 9 insertions(+), 16 deletions(-) - -Upstream-Status: Backport - -Signed-off-by: Saul Wold - - -diff --git a/AUTHORS b/AUTHORS -index 70734b0..009dea0 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -154,6 +154,7 @@ Breno G. de Oliveira - Brent Dax - Brooks D Boyd - Brian Callaghan -+Brian Carlson - Brian Clarke - brian d foy - Brian Fraser -diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm -index 4822027..63e5fba 100644 ---- a/dist/Locale-Maketext/lib/Locale/Maketext.pm -+++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm -@@ -625,21 +625,9 @@ sub _compile { - # 0-length method name means to just interpolate: - push @code, ' ('; - } -- elsif($m =~ /^\w+(?:\:\:\w+)*$/s -- and $m !~ m/(?:^|\:)\d/s -- # exclude starting a (sub)package or symbol with a digit -+ elsif($m =~ /^\w+$/s -+ # exclude anything fancy, especially fully-qualified module names - ) { -- # Yes, it even supports the demented (and undocumented?) -- # $obj->Foo::bar(...) syntax. -- $target->_die_pointing( -- $string_to_compile, q{Can't use "SUPER::" in a bracket-group method}, -- 2 + length($c[-1]) -- ) -- if $m =~ m/^SUPER::/s; -- # Because for SUPER:: to work, we'd have to compile this into -- # the right package, and that seems just not worth the bother, -- # unless someone convinces me otherwise. -- - push @code, ' $_[0]->' . $m . '('; - } - else { -@@ -693,7 +681,9 @@ sub _compile { - elsif(substr($1,0,1) ne '~') { - # it's stuff not containing "~" or "[" or "]" - # i.e., a literal blob -- $c[-1] .= $1; -+ my $text = $1; -+ $text =~ s/\\/\\\\/g; -+ $c[-1] .= $text; - - } - elsif($1 eq '~~') { # "~~" -@@ -731,7 +721,9 @@ sub _compile { - else { - # It's a "~X" where X is not a special character. - # Consider it a literal ~ and X. -- $c[-1] .= $1; -+ my $text = $1; -+ $text =~ s/\\/\\\\/g; -+ $c[-1] .= $text; - } - } - } --- -1.8.3.1 - -- cgit v1.2.3-54-g00ecf