diff options
author | Steve Sakoman <steve@sakoman.com> | 2023-07-21 06:15:59 -1000 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-07-22 16:24:17 -1000 |
commit | 6e42635ae0bc5d6b1d6a10315721c3a11205fe27 (patch) | |
tree | 3e8341043d85a4d5de4c06ebbab0e4f2fa89e56e | |
parent | f8a370159bea7dec25d08de3216c1cc832477cf6 (diff) | |
download | poky-6e42635ae0bc5d6b1d6a10315721c3a11205fe27.tar.gz |
openssl: fix intermittent openssl-ptest reproducibility issue
Adds two missing key sorts in generation of unified_info
Backported from a similar (but more invasive) patch in the 3.x source code:
https://github.com/openssl/openssl/commit/764cf5b26306a8712e8b3d41599c44dc5ed07a25]
(From OE-Core rev: 6c505ef6c9950eb6d09bcec683fefe6edc7b2e6b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/0001-Configure-add-2-missing-key-sorts.patch | 38 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1t.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Configure-add-2-missing-key-sorts.patch b/meta/recipes-connectivity/openssl/openssl/0001-Configure-add-2-missing-key-sorts.patch new file mode 100644 index 0000000000..e2a65d0998 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Configure-add-2-missing-key-sorts.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 679ae2f72ef8cf37609cb0eff5de3b98aa85e395 Mon Sep 17 00:00:00 2001 | ||
2 | From: Steve Sakoman <steve@sakoman.com> | ||
3 | Date: Thu, 20 Jul 2023 04:14:42 -1000 | ||
4 | Subject: [PATCH] Configure: add 2 missing key sorts in generation of unified_info | ||
5 | |||
6 | Otherwise generation of this section in configdata.pm is not reproducible | ||
7 | |||
8 | Signed-off-by: Steve Sakoman <steve@sakoman.com> | ||
9 | Upstream-Status: Backport [adapted from 3.x commit https://github.com/openssl/openssl/commit/764cf5b26306a8712e8b3d41599c44dc5ed07a25] | ||
10 | --- | ||
11 | Configure | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/Configure b/Configure | ||
15 | index 2a01746..8fc5a2c 100755 | ||
16 | --- a/Configure | ||
17 | +++ b/Configure | ||
18 | @@ -2326,7 +2326,7 @@ EOF | ||
19 | "dso" => [ @{$unified_info{engines}} ], | ||
20 | "bin" => [ @{$unified_info{programs}} ], | ||
21 | "script" => [ @{$unified_info{scripts}} ] ); | ||
22 | - foreach my $type (keys %loopinfo) { | ||
23 | + foreach my $type (sort keys %loopinfo) { | ||
24 | foreach my $product (@{$loopinfo{$type}}) { | ||
25 | my %dirs = (); | ||
26 | my $pd = dirname($product); | ||
27 | @@ -2347,7 +2347,7 @@ EOF | ||
28 | push @{$unified_info{dirinfo}->{$d}->{deps}}, $_ | ||
29 | if $d ne $pd; | ||
30 | } | ||
31 | - foreach (keys %dirs) { | ||
32 | + foreach (sort keys %dirs) { | ||
33 | push @{$unified_info{dirinfo}->{$_}->{products}->{$type}}, | ||
34 | $product; | ||
35 | } | ||
36 | -- | ||
37 | 2.34.1 | ||
38 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1t.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1t.bb index 75fc3c5c1a..eea8ef64af 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1t.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1t.bb | |||
@@ -18,6 +18,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
18 | file://afalg.patch \ | 18 | file://afalg.patch \ |
19 | file://reproducible.patch \ | 19 | file://reproducible.patch \ |
20 | file://reproducibility.patch \ | 20 | file://reproducibility.patch \ |
21 | file://0001-Configure-add-2-missing-key-sorts.patch \ | ||
21 | file://CVE-2023-0464.patch \ | 22 | file://CVE-2023-0464.patch \ |
22 | file://CVE-2023-0465.patch \ | 23 | file://CVE-2023-0465.patch \ |
23 | file://CVE-2023-0466.patch \ | 24 | file://CVE-2023-0466.patch \ |