diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-03-19 08:16:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-20 00:02:22 +0000 |
commit | 4470f05bd64aef6793be306741c7cbccacbe882b (patch) | |
tree | 7b0354d5047c5e198591eaf0ff6b183c777b0efa /meta/recipes-devtools/perl/files | |
parent | f7b8493add9255dfa8ff80d72ad7abba4974113c (diff) | |
download | poky-4470f05bd64aef6793be306741c7cbccacbe882b.tar.gz |
perl: update 5.34.0 -> 5.34.1
(From OE-Core rev: 0e318a46ceae38a33a99f55079c463e90a15944d)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/files')
5 files changed, 2 insertions, 138 deletions
diff --git a/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch b/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch deleted file mode 100644 index 1cb65d932c..0000000000 --- a/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 5bc1e5fdd87aa205011512cd1e6cc655bcf677fd Mon Sep 17 00:00:00 2001 | ||
2 | From: Sergey Poznyakoff <gray@gnu.org> | ||
3 | Date: Wed, 23 Jun 2021 15:31:42 +0300 | ||
4 | Subject: [PATCH] Fix definition of ITEM_NOT_FOUND for pre-1.13 versions. | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | ext/GDBM_File/GDBM_File.xs | 9 +++++---- | ||
10 | 1 file changed, 5 insertions(+), 4 deletions(-) | ||
11 | |||
12 | diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs | ||
13 | index 494c2889ca89..0125b5dcac4d 100644 | ||
14 | --- a/ext/GDBM_File/GDBM_File.xs | ||
15 | +++ b/ext/GDBM_File/GDBM_File.xs | ||
16 | @@ -145,10 +145,11 @@ output_datum(pTHX_ SV *arg, char *str, int size) | ||
17 | #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt") | ||
18 | #endif | ||
19 | |||
20 | -#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 | ||
21 | -/* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR | ||
22 | - if the requested key did not exist */ | ||
23 | -# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR) | ||
24 | +#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 | ||
25 | +/* Prior to 1.13, only gdbm_fetch set GDBM_ITEM_NOT_FOUND if the requested | ||
26 | + key did not exist. Other similar function wouls set GDBM_NO_ERROR instead. | ||
27 | + The GDBM_ITEM_NOT_FOUND existeds as early as in 1.7.3 */ | ||
28 | +# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == GDBM_ITEM_NOT_FOUND) | ||
29 | #else | ||
30 | # define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND) | ||
31 | #endif | ||
diff --git a/meta/recipes-devtools/perl/files/CVE-2021-36770.patch b/meta/recipes-devtools/perl/files/CVE-2021-36770.patch deleted file mode 100644 index 1ef548b305..0000000000 --- a/meta/recipes-devtools/perl/files/CVE-2021-36770.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | Backport patch to fix CVE-2021-36770. And drop the section of code which | ||
2 | updates version. | ||
3 | |||
4 | Upstream-Status: Backport [https://github.com/Perl/perl5/commit/c1a937f] | ||
5 | CVE: CVE-2021-36770 | ||
6 | |||
7 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
8 | |||
9 | From c1a937fef07c061600a0078f4cb53fe9c2136bb9 Mon Sep 17 00:00:00 2001 | ||
10 | From: Ricardo Signes <rjbs@semiotic.systems> | ||
11 | Date: Mon, 9 Aug 2021 08:14:05 -0400 | ||
12 | Subject: [PATCH] Encode.pm: apply a local patch for CVE-2021-36770 | ||
13 | |||
14 | I expect Encode to see a new release today. | ||
15 | |||
16 | Without this fix, Encode::ConfigLocal can be loaded from a path relative | ||
17 | to the current directory, because the || operator will evaluate @INC in | ||
18 | scalar context, putting an integer as the only value in @INC. | ||
19 | --- | ||
20 | cpan/Encode/Encode.pm | 4 ++-- | ||
21 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm | ||
24 | index a56a99947f..b96a850416 100644 | ||
25 | --- a/cpan/Encode/Encode.pm | ||
26 | +++ b/cpan/Encode/Encode.pm | ||
27 | @@ -65,8 +66,8 @@ require Encode::Config; | ||
28 | eval { | ||
29 | local $SIG{__DIE__}; | ||
30 | local $SIG{__WARN__}; | ||
31 | - local @INC = @INC || (); | ||
32 | - pop @INC if $INC[-1] eq '.'; | ||
33 | + local @INC = @INC; | ||
34 | + pop @INC if @INC && $INC[-1] eq '.'; | ||
35 | require Encode::ConfigLocal; | ||
36 | }; | ||
37 | |||
38 | -- | ||
39 | 2.33.0 | ||
40 | |||
diff --git a/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch b/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch deleted file mode 100644 index 628903f41c..0000000000 --- a/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From aacd2398e766500cb5d83c4d76b642fcf31d997a Mon Sep 17 00:00:00 2001 | ||
2 | From: Sergey Poznyakoff <gray@gnu.org> | ||
3 | Date: Wed, 23 Jun 2021 10:26:50 +0300 | ||
4 | Subject: [PATCH] Fix GDBM_File to compile with version 1.20 and earlier | ||
5 | |||
6 | * ext/GDBM_File/GDBM_File.xs (ITEM_NOT_FOUND): Define conditionally, | ||
7 | depending on the GDBM_VERSION_MAJOR and GDBM_VERSION_MINOR. | ||
8 | Don't assume GDBM_ITEM_NOT_FOUND is a define (it isn't since | ||
9 | gdbm commit d3e27957). | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | --- | ||
14 | ext/GDBM_File/GDBM_File.xs | 11 +++++------ | ||
15 | 1 file changed, 5 insertions(+), 6 deletions(-) | ||
16 | |||
17 | diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs | ||
18 | index cd0bb6f26ffa..494c2889ca89 100644 | ||
19 | --- a/ext/GDBM_File/GDBM_File.xs | ||
20 | +++ b/ext/GDBM_File/GDBM_File.xs | ||
21 | @@ -145,14 +145,13 @@ output_datum(pTHX_ SV *arg, char *str, int size) | ||
22 | #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt") | ||
23 | #endif | ||
24 | |||
25 | -#ifndef GDBM_ITEM_NOT_FOUND | ||
26 | -# define GDBM_ITEM_NOT_FOUND GDBM_NO_ERROR | ||
27 | -#endif | ||
28 | - | ||
29 | +#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 | ||
30 | /* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR | ||
31 | if the requested key did not exist */ | ||
32 | -#define ITEM_NOT_FOUND() \ | ||
33 | - (gdbm_errno == GDBM_ITEM_NOT_FOUND || gdbm_errno == GDBM_NO_ERROR) | ||
34 | +# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR) | ||
35 | +#else | ||
36 | +# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND) | ||
37 | +#endif | ||
38 | |||
39 | #define CHECKDB(db) do { \ | ||
40 | if (!db->dbp) { \ | ||
diff --git a/meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch b/meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch deleted file mode 100644 index 3864f1a121..0000000000 --- a/meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From ea57297a58b8f10ab885c19eec48ea076116cc1f Mon Sep 17 00:00:00 2001 | ||
2 | From: Sergey Poznyakoff <gray@gnu.org> | ||
3 | Date: Wed, 23 Jun 2021 14:24:47 +0300 | ||
4 | Subject: [PATCH] Raise version number in ext/GDBM_File/GDBM_File.pm | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | ext/GDBM_File/GDBM_File.pm | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/ext/GDBM_File/GDBM_File.pm b/ext/GDBM_File/GDBM_File.pm | ||
14 | index d837536f804c..cb08d091b829 100644 | ||
15 | --- a/ext/GDBM_File/GDBM_File.pm | ||
16 | +++ b/ext/GDBM_File/GDBM_File.pm | ||
17 | @@ -363,7 +363,7 @@ require XSLoader; | ||
18 | ); | ||
19 | |||
20 | # This module isn't dual life, so no need for dev version numbers. | ||
21 | -$VERSION = '1.19'; | ||
22 | +$VERSION = '1.20'; | ||
23 | |||
24 | XSLoader::load(); | ||
25 | |||
diff --git a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch index 80ce4a6de7..15189a0c04 100644 --- a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch +++ b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5120acaa2be5787d9657f6b91bc8ee3c2d664fbe Mon Sep 17 00:00:00 2001 | 1 | From 1f7cc5db2ca549c37c6a7923368e1a0104f31b99 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Sun, 27 May 2007 21:04:11 +0000 | 3 | Date: Sun, 27 May 2007 21:04:11 +0000 |
4 | Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE) | 4 | Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE) |
@@ -20,7 +20,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
20 | 1 file changed, 16 insertions(+), 2 deletions(-) | 20 | 1 file changed, 16 insertions(+), 2 deletions(-) |
21 | 21 | ||
22 | diff --git a/configpm b/configpm | 22 | diff --git a/configpm b/configpm |
23 | index c8de8bf..204613c 100755 | 23 | index 94a4778..99b20c9 100755 |
24 | --- a/configpm | 24 | --- a/configpm |
25 | +++ b/configpm | 25 | +++ b/configpm |
26 | @@ -687,7 +687,7 @@ sub FETCH { | 26 | @@ -687,7 +687,7 @@ sub FETCH { |