diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-07-01 15:51:53 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-08 11:20:12 +0100 |
commit | e73deac6dc7861c64ced49d2a35f781d655db79a (patch) | |
tree | df7352dd791d9714ef62d4a6a87b64e2a90903e2 /meta/recipes-devtools/perl/perl-5.14.3/0001-Fix-misparsing-of-maketext-strings.patch | |
parent | 93d77b6ca83e55f3ecbc09f5502d8ae928f2bd91 (diff) | |
download | poky-e73deac6dc7861c64ced49d2a35f781d655db79a.tar.gz |
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 <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/0001-Fix-misparsing-of-maketext-strings.patch')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.3/0001-Fix-misparsing-of-maketext-strings.patch | 86 |
1 files changed, 0 insertions, 86 deletions
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 @@ | |||
1 | From 1735f6f53ca19f99c6e9e39496c486af323ba6a8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Brian Carlson <brian.carlson@cpanel.net> | ||
3 | Date: Wed, 28 Nov 2012 08:54:33 -0500 | ||
4 | Subject: [PATCH] Fix misparsing of maketext strings. | ||
5 | |||
6 | Case 61251: This commit fixes a misparse of maketext strings that could | ||
7 | lead to arbitrary code execution. Basically, maketext was compiling | ||
8 | bracket notation into functions, but neglected to escape backslashes | ||
9 | inside the content or die on fully-qualified method names when | ||
10 | generating the code. This change escapes all such backslashes and dies | ||
11 | when a method name with a colon or apostrophe is specified. | ||
12 | --- | ||
13 | AUTHORS | 1 + | ||
14 | dist/Locale-Maketext/lib/Locale/Maketext.pm | 24 ++++++++---------------- | ||
15 | 2 files changed, 9 insertions(+), 16 deletions(-) | ||
16 | |||
17 | Upstream-Status: Backport | ||
18 | |||
19 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
20 | |||
21 | |||
22 | diff --git a/AUTHORS b/AUTHORS | ||
23 | index 70734b0..009dea0 100644 | ||
24 | --- a/AUTHORS | ||
25 | +++ b/AUTHORS | ||
26 | @@ -154,6 +154,7 @@ Breno G. de Oliveira <garu@cpan.org> | ||
27 | Brent Dax <brentdax@cpan.org> | ||
28 | Brooks D Boyd | ||
29 | Brian Callaghan <callagh@itginc.com> | ||
30 | +Brian Carlson <brian.carlson@cpanel.net> | ||
31 | Brian Clarke <clarke@appliedmeta.com> | ||
32 | brian d foy <brian.d.foy@gmail.com> | ||
33 | Brian Fraser <fraserbn@gmail.com> | ||
34 | diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm | ||
35 | index 4822027..63e5fba 100644 | ||
36 | --- a/dist/Locale-Maketext/lib/Locale/Maketext.pm | ||
37 | +++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm | ||
38 | @@ -625,21 +625,9 @@ sub _compile { | ||
39 | # 0-length method name means to just interpolate: | ||
40 | push @code, ' ('; | ||
41 | } | ||
42 | - elsif($m =~ /^\w+(?:\:\:\w+)*$/s | ||
43 | - and $m !~ m/(?:^|\:)\d/s | ||
44 | - # exclude starting a (sub)package or symbol with a digit | ||
45 | + elsif($m =~ /^\w+$/s | ||
46 | + # exclude anything fancy, especially fully-qualified module names | ||
47 | ) { | ||
48 | - # Yes, it even supports the demented (and undocumented?) | ||
49 | - # $obj->Foo::bar(...) syntax. | ||
50 | - $target->_die_pointing( | ||
51 | - $string_to_compile, q{Can't use "SUPER::" in a bracket-group method}, | ||
52 | - 2 + length($c[-1]) | ||
53 | - ) | ||
54 | - if $m =~ m/^SUPER::/s; | ||
55 | - # Because for SUPER:: to work, we'd have to compile this into | ||
56 | - # the right package, and that seems just not worth the bother, | ||
57 | - # unless someone convinces me otherwise. | ||
58 | - | ||
59 | push @code, ' $_[0]->' . $m . '('; | ||
60 | } | ||
61 | else { | ||
62 | @@ -693,7 +681,9 @@ sub _compile { | ||
63 | elsif(substr($1,0,1) ne '~') { | ||
64 | # it's stuff not containing "~" or "[" or "]" | ||
65 | # i.e., a literal blob | ||
66 | - $c[-1] .= $1; | ||
67 | + my $text = $1; | ||
68 | + $text =~ s/\\/\\\\/g; | ||
69 | + $c[-1] .= $text; | ||
70 | |||
71 | } | ||
72 | elsif($1 eq '~~') { # "~~" | ||
73 | @@ -731,7 +721,9 @@ sub _compile { | ||
74 | else { | ||
75 | # It's a "~X" where X is not a special character. | ||
76 | # Consider it a literal ~ and X. | ||
77 | - $c[-1] .= $1; | ||
78 | + my $text = $1; | ||
79 | + $text =~ s/\\/\\\\/g; | ||
80 | + $c[-1] .= $text; | ||
81 | } | ||
82 | } | ||
83 | } | ||
84 | -- | ||
85 | 1.8.3.1 | ||
86 | |||