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/squelch-locale-warnings.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/squelch-locale-warnings.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff b/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff new file mode 100644 index 0000000000..cb31457761 --- /dev/null +++ b/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff @@ -0,0 +1,56 @@ +From 487a6d6ada0b08e6a7276520ebc61cd851005e7c Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Sun, 3 Oct 2010 21:36:17 +0300 +Subject: Squelch locale warnings in Debian package maintainer scripts + +Bug-Debian: http://bugs.debian.org/508764 + +The system locales are rather frequently out of sync with the C library +during package upgrades, causing a huge amount of useless Perl locale +warnings. Squelch them when running package maintainer scripts, detected +by the DPKG_RUNNING_VERSION environment variable. + +Any real locale problem will show up after the system upgrade too, and +the warning will be triggered normally again at that point. + +Patch-Name: debian/squelch-locale-warnings.diff +--- + locale.c | 5 ++++- + pod/perllocale.pod | 8 ++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/locale.c b/locale.c +index 7a4a418..fdf911d 100644 +--- a/locale.c ++++ b/locale.c +@@ -674,7 +674,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn) + + const bool locwarn = (printwarn > 1 + || (printwarn +- && (! bad_lang_use_once ++ && ++ /* Debian specific change - see http://bugs.debian.org/508764 */ ++ (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) && ++ (! bad_lang_use_once + || ( + /* disallow with "" or "0" */ + *bad_lang_use_once +diff --git a/pod/perllocale.pod b/pod/perllocale.pod +index 701b422..58cabaf 100644 +--- a/pod/perllocale.pod ++++ b/pod/perllocale.pod +@@ -1217,6 +1217,14 @@ B<NOTE>: C<PERL_BADLANG> only gives you a way to hide the warning message. + The message tells about some problem in your system's locale support, + and you should investigate what the problem is. + ++=item DPKG_RUNNING_VERSION ++ ++On Debian systems, if the DPKG_RUNNING_VERSION environment variable is ++set (to any value), the locale failure warnings will be suppressed just ++like with a zero PERL_BADLANG setting. This is done to avoid floods ++of spurious warnings during system upgrades. ++See L<http://bugs.debian.org/508764>. ++ + =back + + The following environment variables are not specific to Perl: They are |