summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-Antoine Couret <charles-antoine.couret@essensium.com>2018-04-06 14:53:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-03 09:53:49 +0100
commit0d0ca4211e500a292bc8908d18b658b7bb310e05 (patch)
treecd048a0be1049133e26e0a7098091cd7d3cea408
parent54b9f0da14ddad68d17a64706724d537ac669114 (diff)
downloadpoky-0d0ca4211e500a292bc8908d18b658b7bb310e05.tar.gz
perl: add patch to solve libcrypt incompatibility
Add Perl's patch submitted to upstream to be compiled along with glibc with libcrypt split. (From OE-Core rev: 79703d83790a2973fefdb0e12e125b5f17e98cdf) (From OE-Core rev: 53eef48621b19a1b88c042f9ee5eeb84d9746c64) Signed-off-by: Charles-Antoine Couret <charles-antoine.couret@essensium.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/perl/perl-native_5.24.1.bb1
-rw-r--r--meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch28
-rw-r--r--meta/recipes-devtools/perl/perl_5.24.1.bb1
3 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-native_5.24.1.bb b/meta/recipes-devtools/perl/perl-native_5.24.1.bb
index 6c56a7d701..2f5dffd65b 100644
--- a/meta/recipes-devtools/perl/perl-native_5.24.1.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.24.1.bb
@@ -16,6 +16,7 @@ SRC_URI += "\
16 file://dynaloaderhack.patch \ 16 file://dynaloaderhack.patch \
17 file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \ 17 file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
18 file://0001-Configure-Remove-fstack-protector-strong-for-native-.patch \ 18 file://0001-Configure-Remove-fstack-protector-strong-for-native-.patch \
19 file://perl-5.26.1-guard_old_libcrypt_fix.patch \
19 " 20 "
20 21
21SRC_URI[md5sum] = "af6a84c7c3e2b8b269c105a5db2f6d53" 22SRC_URI[md5sum] = "af6a84c7c3e2b8b269c105a5db2f6d53"
diff --git a/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch b/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch
new file mode 100644
index 0000000000..bb6c573c9a
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch
@@ -0,0 +1,28 @@
1commit 13e70b397dcb0d1bf4a869b670f041c1d7b730d0
2Author: Bjรถrn Esser <besser82@fedoraproject.org>
3Date: Sat Jan 20 20:22:53 2018 +0100
4
5 pp: Guard fix for really old bug in glibc libcrypt
6
7Upstream-Status: Pending
8Signed-off-by Richard Purdie <richard.purdie@linuxfoundation.org>
9
10diff --git a/pp.c b/pp.c
11index d50ad7ddbf..6510c7b15c 100644
12--- a/pp.c
13+++ b/pp.c
14@@ -3650,8 +3650,12 @@ PP(pp_crypt)
15 #if defined(__GLIBC__) || defined(__EMX__)
16 if (PL_reentrant_buffer->_crypt_struct_buffer) {
17 PL_reentrant_buffer->_crypt_struct_buffer->initialized = 0;
18- /* work around glibc-2.2.5 bug */
19+#if (defined(__GLIBC__) && __GLIBC__ == 2) && \
20+ (defined(__GLIBC_MINOR__) && __GLIBC_MINOR__ >= 2 && __GLIBC_MINOR__ < 4)
21+ /* work around glibc-2.2.5 bug, has been fixed at some
22+ * time in glibc-2.3.X */
23 PL_reentrant_buffer->_crypt_struct_buffer->current_saltbits = 0;
24+#endif
25 }
26 #endif
27 }
28
diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb b/meta/recipes-devtools/perl/perl_5.24.1.bb
index b55d2223e2..8c5dd82207 100644
--- a/meta/recipes-devtools/perl/perl_5.24.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.24.1.bb
@@ -65,6 +65,7 @@ SRC_URI += " \
65 file://perl-errno-generation-gcc5.patch \ 65 file://perl-errno-generation-gcc5.patch \
66 file://perl-fix-conflict-between-skip_all-and-END.patch \ 66 file://perl-fix-conflict-between-skip_all-and-END.patch \
67 file://perl-test-customized.patch \ 67 file://perl-test-customized.patch \
68 file://perl-5.26.1-guard_old_libcrypt_fix.patch \
68" 69"
69 70
70# Fix test case issues 71# Fix test case issues