diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-05 16:43:44 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-09 12:00:42 +0000 |
| commit | 79223afc724c52abf8d7722e1a6a55d7d42bff19 (patch) | |
| tree | ae59d9e7b37ad188d9f3aef8a1f117bbe50fd4e0 | |
| parent | 7c8a6cbf42271442189e463e9f8772521b4f263d (diff) | |
| download | poky-79223afc724c52abf8d7722e1a6a55d7d42bff19.tar.gz | |
perl: update to 5.30.1
Drop fix-setgroup.patch as the upstream has fixed the issue.
(From OE-Core rev: 45edc6d23e20f7634c50db71e419c7e3bb7f393e)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/perl/files/fix-setgroup.patch | 49 | ||||
| -rw-r--r-- | meta/recipes-devtools/perl/perl_5.30.1.bb (renamed from meta/recipes-devtools/perl/perl_5.30.0.bb) | 11 |
2 files changed, 5 insertions, 55 deletions
diff --git a/meta/recipes-devtools/perl/files/fix-setgroup.patch b/meta/recipes-devtools/perl/files/fix-setgroup.patch deleted file mode 100644 index 2b490e6067..0000000000 --- a/meta/recipes-devtools/perl/files/fix-setgroup.patch +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | Test script to reproduce the problem: | ||
| 2 | |||
| 3 | #!/usr/bin/env perl | ||
| 4 | $) = "2 2"; | ||
| 5 | print $!; | ||
| 6 | |||
| 7 | Result from perl 5.28 under strace: | ||
| 8 | |||
| 9 | setgroups(1, [2]) = 0 | ||
| 10 | setresgid(-1, 2, -1) = 0 | ||
| 11 | |||
| 12 | Result from perl 5.30 under strace: | ||
| 13 | |||
| 14 | setgroups(1, [-1]) = -1 EINVAL (Invalid argument) | ||
| 15 | setresgid(-1, 2, -1) = 0 | ||
| 16 | |||
| 17 | Patch which broke this upstream: | ||
| 18 | https://perl5.git.perl.org/perl.git/commitdiff/5d4a52b5c68a11bfc97c2e24806993b84a61eade | ||
| 19 | |||
| 20 | Issue is that the new function changes the endptr to the end of the | ||
| 21 | scanned number and needs to be reset to the end of the string for | ||
| 22 | each iteration of the loop. | ||
| 23 | |||
| 24 | [YOCTO #13391] | ||
| 25 | |||
| 26 | RP | ||
| 27 | 2019/6/14 | ||
| 28 | Upstream-Status: Pending | ||
| 29 | |||
| 30 | Index: perl-5.30.0/mg.c | ||
| 31 | =================================================================== | ||
| 32 | --- perl-5.30.0.orig/mg.c | ||
| 33 | +++ perl-5.30.0/mg.c | ||
| 34 | @@ -3179,6 +3256,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) | ||
| 35 | const char *p = SvPV_const(sv, len); | ||
| 36 | Groups_t *gary = NULL; | ||
| 37 | const char* endptr = p + len; | ||
| 38 | + const char* realend = p + len; | ||
| 39 | UV uv; | ||
| 40 | #ifdef _SC_NGROUPS_MAX | ||
| 41 | int maxgrp = sysconf(_SC_NGROUPS_MAX); | ||
| 42 | @@ -3209,6 +3287,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) | ||
| 43 | Newx(gary, i + 1, Groups_t); | ||
| 44 | else | ||
| 45 | Renew(gary, i + 1, Groups_t); | ||
| 46 | + endptr = realend; | ||
| 47 | if (grok_atoUV(p, &uv, &endptr)) | ||
| 48 | gary[i] = (Groups_t)uv; | ||
| 49 | else { | ||
diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 1d906a7515..9b1f1af072 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb | |||
| @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ | |||
| 8 | 8 | ||
| 9 | 9 | ||
| 10 | SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ | 10 | SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ |
| 11 | https://github.com/arsv/perl-cross/releases/download/1.3/perl-cross-1.3.tar.gz;name=perl-cross \ | 11 | https://github.com/arsv/perl-cross/releases/download/1.3.1/perl-cross-1.3.1.tar.gz;name=perl-cross \ |
| 12 | file://perl-rdepends.txt \ | 12 | file://perl-rdepends.txt \ |
| 13 | file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ | 13 | file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ |
| 14 | file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ | 14 | file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ |
| @@ -18,7 +18,6 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ | |||
| 18 | file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ | 18 | file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ |
| 19 | file://perl-dynloader.patch \ | 19 | file://perl-dynloader.patch \ |
| 20 | file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ | 20 | file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ |
| 21 | file://fix-setgroup.patch \ | ||
| 22 | file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ | 21 | file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ |
| 23 | file://0002-Constant-Fix-up-shebang.patch \ | 22 | file://0002-Constant-Fix-up-shebang.patch \ |
| 24 | " | 23 | " |
| @@ -26,10 +25,10 @@ SRC_URI_append_class-native = " \ | |||
| 26 | file://perl-configpm-switch.patch \ | 25 | file://perl-configpm-switch.patch \ |
| 27 | " | 26 | " |
| 28 | 27 | ||
| 29 | SRC_URI[perl.md5sum] = "9770584cdf9b5631c38097645ce33549" | 28 | SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" |
| 30 | SRC_URI[perl.sha256sum] = "851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2" | 29 | SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" |
| 31 | SRC_URI[perl-cross.md5sum] = "4dda3daf9c4fe42b3d6a5dd052852a48" | 30 | SRC_URI[perl-cross.md5sum] = "1e463b105cfa56d251a86979af23e3a7" |
| 32 | SRC_URI[perl-cross.sha256sum] = "49edea1ea2cd6c5c47386ca71beda8d150c748835781354dbe7f75b1df27e703" | 31 | SRC_URI[perl-cross.sha256sum] = "edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d1590551e40694f21200141d" |
| 33 | 32 | ||
| 34 | S = "${WORKDIR}/perl-${PV}" | 33 | S = "${WORKDIR}/perl-${PV}" |
| 35 | 34 | ||
