diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-06-17 00:19:42 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-01 15:38:20 +0100 |
| commit | 06d43a90acbe63baea62d220659149a3ff2f9198 (patch) | |
| tree | 7bc9adc24b74694192fba12119e87b0d86521fb5 /meta/recipes-devtools/perl/perl/debian/locale-robustness.diff | |
| parent | eb54c29d0566e01c287bdccbdb26c188aac66033 (diff) | |
| download | openembedded-core-contrib-06d43a90acbe63baea62d220659149a3ff2f9198.tar.gz | |
perl: 5.20.0 -> 5.22.0
* Remove:
- perl-5.14.3-fix-CVE-2010-4777.patch: backport
- fix-FF_MORE-crash.patch: backport
- perl-rprovides.inc: it was introduced by 5.8.7, the lines in it are like:
RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata"
If some packages do RPDEND on something like
perl-module-${TARGET_SYS}-b-asmdatam, we need update the package rather
than keep use RPROVIDES in perl-rprovides.inc, so remove it.
- perl-rprovides_5.20.0.inc: it only has one line:
RPROVIDES_perl-module-module-build, but the perl-module-module-build
is gone in 5.22.0, so remove it.
* Update:
- debian patches from http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz
- Makefile.SH.patch
- Merge 0001-Makefile.SH-fix-do_install-failed.patch into Makefile.SH.patch
- native-nopacklist.patch
- config.sh
* The CGI.pm and Module::Build disappear from core, so no
perl-module-module-build.rpm any more, more info:
http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/perl/perl/debian/locale-robustness.diff')
| -rw-r--r-- | meta/recipes-devtools/perl/perl/debian/locale-robustness.diff | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff b/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff new file mode 100644 index 0000000000..fd471ed7a5 --- /dev/null +++ b/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff @@ -0,0 +1,52 @@ +From 289eaf87f8de4d9ebfd661d4e4299c2952435243 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Fri, 10 Apr 2015 10:19:51 +0300 +Subject: Make t/run/locale.t survive missing locales masked by LC_ALL + +If LC_ALL is set to a valid locale but another LC_* setting like LC_CTYPE +isn't, t/run/locale.t would fail because it explicitly unsets LC_ALL, +unmasking the problem underneath. All the other tests survive such +a scenario. + +While this is clearly an error in the build environment, it's easy to make +the test more robust by first clearing all the locale relevant variables. + +Bug: https://rt.perl.org/Ticket/Display.html?id=124310 +Bug-Debian: https://bugs.debian.org/782068 +Patch-Name: debian/locale-robustness.diff +--- + t/run/locale.t | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/t/run/locale.t b/t/run/locale.t +index bd1a034..2105339 100644 +--- a/t/run/locale.t ++++ b/t/run/locale.t +@@ -27,6 +27,9 @@ my @locales = eval { find_locales( [ &LC_ALL, &LC_CTYPE, &LC_NUMERIC ], + ) }; + skip_all("no locales available") unless @locales; + ++# reset the locale environment ++local @ENV{'LANG', (grep /^LC_/, keys %ENV)}; ++ + plan tests => &last; + + my $non_C_locale; +@@ -58,9 +61,6 @@ EOF + SKIP: { + skip("Windows stores locale defaults in the registry", 1 ) + if $^O eq 'MSWin32'; +- local $ENV{LC_NUMERIC}; # So not taken as a default +- local $ENV{LC_ALL}; # so it never overrides LC_NUMERIC +- local $ENV{LANG}; # So not taken as a default + fresh_perl_is("for (qw(@locales)) {\n" . <<'EOF', + use POSIX qw(locale_h); + use locale; +@@ -348,7 +348,6 @@ EOF + + { + local $ENV{LC_NUMERIC} = $different; +- local $ENV{LC_ALL}; # so it never overrides LC_NUMERIC + fresh_perl_is(<<"EOF", + use POSIX qw(locale_h); + |