diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/reproducibility.patch | 22 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1n.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.1.1l.bb) | 4 |
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/reproducibility.patch b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch new file mode 100644 index 0000000000..8accbc9df2 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Using localtime() means the output can depend on the timezone of the build machine. | ||
2 | Using gmtime() is safer. For complete reproducibility use SOURCE_DATE_EPOCH if set. | ||
3 | |||
4 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
5 | Upstream-Status: Pending [should be suitable] | ||
6 | |||
7 | Index: openssl-3.0.1/apps/progs.pl | ||
8 | =================================================================== | ||
9 | --- openssl-3.0.1.orig/apps/progs.pl | ||
10 | +++ openssl-3.0.1/apps/progs.pl | ||
11 | @@ -21,7 +21,10 @@ die "Unrecognised option, must be -C or | ||
12 | my %commands = (); | ||
13 | my $cmdre = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/; | ||
14 | my $apps_openssl = shift @ARGV; | ||
15 | -my $YEAR = [localtime()]->[5] + 1900; | ||
16 | +my $YEAR = [gmtime()]->[5] + 1900; | ||
17 | +if (defined($ENV{SOURCE_DATE_EPOCH}) && $ENV{SOURCE_DATE_EPOCH} !~ /\D/) { | ||
18 | + $YEAR = [gmtime($ENV{SOURCE_DATE_EPOCH})]->[5] + 1900; | ||
19 | +} | ||
20 | |||
21 | # because the program apps/openssl has object files as sources, and | ||
22 | # they then have the corresponding C files as source, we need to chain | ||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1n.bb index 9ea5c4c81f..df13abf54e 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1n.bb | |||
@@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
17 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ | 17 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ |
18 | file://afalg.patch \ | 18 | file://afalg.patch \ |
19 | file://reproducible.patch \ | 19 | file://reproducible.patch \ |
20 | file://reproducibility.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | SRC_URI_append_class-nativesdk = " \ | 23 | SRC_URI_append_class-nativesdk = " \ |
@@ -28,7 +29,7 @@ SRC_URI_append_riscv32 = " \ | |||
28 | file://0004-Fixup-support-for-io_pgetevents_time64-syscall.patch \ | 29 | file://0004-Fixup-support-for-io_pgetevents_time64-syscall.patch \ |
29 | " | 30 | " |
30 | 31 | ||
31 | SRC_URI[sha256sum] = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1" | 32 | SRC_URI[sha256sum] = "40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a" |
32 | 33 | ||
33 | inherit lib_package multilib_header multilib_script ptest | 34 | inherit lib_package multilib_header multilib_script ptest |
34 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" | 35 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" |
@@ -203,6 +204,7 @@ do_install_ptest () { | |||
203 | install -m755 ${B}/apps/CA.pl ${D}${PTEST_PATH}/apps | 204 | install -m755 ${B}/apps/CA.pl ${D}${PTEST_PATH}/apps |
204 | 205 | ||
205 | install -d ${D}${PTEST_PATH}/engines | 206 | install -d ${D}${PTEST_PATH}/engines |
207 | install -m755 ${B}/engines/dasync.so ${D}${PTEST_PATH}/engines | ||
206 | install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines | 208 | install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines |
207 | 209 | ||
208 | # seems to be needed with perl 5.32.1 | 210 | # seems to be needed with perl 5.32.1 |