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:39:58 +0100 |
commit | 3f7e55baa6b65b39c5698bb58320f85876cebe23 (patch) | |
tree | 398e48b0e167f958d084ce1e8ccf25162ac9f0a8 /meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff | |
parent | a01d406f6b0d9e08ce6d7408c2928a433fdf1843 (diff) | |
download | poky-3f7e55baa6b65b39c5698bb58320f85876cebe23.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
(From OE-Core rev: 06d43a90acbe63baea62d220659149a3ff2f9198)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff b/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff deleted file mode 100644 index 9557560a1c..0000000000 --- a/meta/recipes-devtools/perl/perl-5.20.0/debian/db_file_ver.diff +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 4da39e2ce6c5a510409c2da1c7b24e0e7ff87f31 Mon Sep 17 00:00:00 2001 | ||
2 | From: Brendan O'Dea <bod@debian.org> | ||
3 | Date: Fri, 16 Dec 2005 01:32:14 +1100 | ||
4 | Subject: Remove overly restrictive DB_File version check. | ||
5 | |||
6 | Bug-Debian: http://bugs.debian.org/340047 | ||
7 | |||
8 | Package dependencies ensure the correct library is linked at run-time. | ||
9 | |||
10 | Patch-Name: debian/db_file_ver.diff | ||
11 | --- | ||
12 | cpan/DB_File/version.c | 2 ++ | ||
13 | 1 file changed, 2 insertions(+) | ||
14 | |||
15 | diff --git a/cpan/DB_File/version.c b/cpan/DB_File/version.c | ||
16 | index e01f6f6..544e6ee 100644 | ||
17 | --- a/cpan/DB_File/version.c | ||
18 | +++ b/cpan/DB_File/version.c | ||
19 | @@ -48,6 +48,7 @@ __getBerkeleyDBInfo() | ||
20 | |||
21 | (void)db_version(&Major, &Minor, &Patch) ; | ||
22 | |||
23 | +#ifndef DEBIAN | ||
24 | /* Check that the versions of db.h and libdb.a are the same */ | ||
25 | if (Major != DB_VERSION_MAJOR || Minor != DB_VERSION_MINOR ) | ||
26 | /* || Patch != DB_VERSION_PATCH) */ | ||
27 | @@ -55,6 +56,7 @@ __getBerkeleyDBInfo() | ||
28 | croak("\nDB_File was build with libdb version %d.%d.%d,\nbut you are attempting to run it with libdb version %d.%d.%d\n", | ||
29 | DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH, | ||
30 | Major, Minor, Patch) ; | ||
31 | +#endif /* DEBIAN */ | ||
32 | |||
33 | /* check that libdb is recent enough -- we need 2.3.4 or greater */ | ||
34 | if (Major == 2 && (Minor < 3 || (Minor == 3 && Patch < 4))) | ||