diff options
| author | Kang Kai <kai.kang@windriver.com> | 2013-01-21 17:03:21 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-25 12:42:48 +0000 |
| commit | e80f02a93b1c717e6bc7001a05c773290ca68992 (patch) | |
| tree | dcc1f97095f9b2a91a63025aa850e9b15a4510b3 /meta/recipes-devtools/perl/perl-5.14.3/perl-configpm-switch.patch | |
| parent | 4a7a476785a9bdbd72fd9c32cf640e3c82a2f531 (diff) | |
| download | poky-e80f02a93b1c717e6bc7001a05c773290ca68992.tar.gz | |
perl-native: update to 5.14.3:
There is a securty issue:
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-5195
Update perl to 5.14.3 could resolve this problem. And update perl-native
first.
(From OE-Core rev: 360401af6e7729a373d0a6d13995714aff121064)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/perl-configpm-switch.patch')
| -rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.3/perl-configpm-switch.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/perl-configpm-switch.patch b/meta/recipes-devtools/perl/perl-5.14.3/perl-configpm-switch.patch new file mode 100644 index 0000000000..c6cc15c93f --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/perl-configpm-switch.patch | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | Upstream-Status:Inappropriate [native] | ||
| 2 | |||
| 3 | This patch is used for perl-native only. It enables the switching of | ||
| 4 | configuration files between Config_heavy.pl and | ||
| 5 | Config_heavy-target.pl by setting the environment variables | ||
| 6 | PERLCONFIGTARGET - the later containing settings for the target while | ||
| 7 | the former contains those for the host. This will allow cpan.bbclass | ||
| 8 | to use the settings appropriate for the native and/or target builds | ||
| 9 | as required. This also disables the use of the cache since the cached | ||
| 10 | values would be valid for the host only. | ||
| 11 | |||
| 12 | Index: perl-5.14.2/configpm | ||
| 13 | =================================================================== | ||
| 14 | --- perl-5.14.2.orig/configpm | ||
| 15 | +++ perl-5.14.2/configpm | ||
| 16 | @@ -658,7 +658,7 @@ sub FETCH { | ||
| 17 | my($self, $key) = @_; | ||
| 18 | |||
| 19 | # check for cached value (which may be undef so we use exists not defined) | ||
| 20 | - return exists $self->{$key} ? $self->{$key} : $self->fetch_string($key); | ||
| 21 | + return $self->fetch_string($key); | ||
| 22 | } | ||
| 23 | |||
| 24 | ENDOFEND | ||
| 25 | @@ -816,7 +816,21 @@ $config_txt .= sprintf <<'ENDOFTIE', $fa | ||
| 26 | sub DESTROY { } | ||
| 27 | |||
| 28 | sub AUTOLOAD { | ||
| 29 | - require 'Config_heavy.pl'; | ||
| 30 | + my $cfgfile = 'Config_heavy.pl'; | ||
| 31 | + if (defined $ENV{PERLCONFIGTARGET} and $ENV{PERLCONFIGTARGET} eq "yes") | ||
| 32 | + { | ||
| 33 | + $cfgfile = 'Config_heavy-target.pl'; | ||
| 34 | + } | ||
| 35 | + if (defined $ENV{PERL_ARCHLIB}) | ||
| 36 | + { | ||
| 37 | + push @INC, $ENV{PERL_ARCHLIB}; | ||
| 38 | + require $cfgfile; | ||
| 39 | + pop @INC; | ||
| 40 | + } | ||
| 41 | + else | ||
| 42 | + { | ||
| 43 | + require $cfgfile; | ||
| 44 | + } | ||
| 45 | goto \&launcher unless $Config::AUTOLOAD =~ /launcher$/; | ||
| 46 | die "&Config::AUTOLOAD failed on $Config::AUTOLOAD"; | ||
| 47 | } | ||
