From b526c937f996df8bdfe88b6cf38e879cf59762c8 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 18 Jul 2025 08:00:32 +0200 Subject: [PATCH] openssl3, bump to 3.5.1 (#12546) --- ...sl3-3.5.0.recipe => openssl3-3.5.1.recipe} | 34 ++++++++++++++-- ...3.5.0.patchset => openssl3-3.5.1.patchset} | 40 +++++++++---------- 2 files changed, 51 insertions(+), 23 deletions(-) rename dev-libs/openssl/{openssl3-3.5.0.recipe => openssl3-3.5.1.recipe} (74%) rename dev-libs/openssl/patches/{openssl3-3.5.0.patchset => openssl3-3.5.1.patchset} (93%) diff --git a/dev-libs/openssl/openssl3-3.5.0.recipe b/dev-libs/openssl/openssl3-3.5.1.recipe similarity index 74% rename from dev-libs/openssl/openssl3-3.5.0.recipe rename to dev-libs/openssl/openssl3-3.5.1.recipe index dd0cfb6a2..df348110b 100644 --- a/dev-libs/openssl/openssl3-3.5.0.recipe +++ b/dev-libs/openssl/openssl3-3.5.1.recipe @@ -15,9 +15,9 @@ HOMEPAGE="https://www.openssl.org/" COPYRIGHT="1995-1998 Eric Young 1998-2024 The OpenSSL Project" LICENSE="OpenSSL" -REVISION="2" +REVISION="1" SOURCE_URI="https://www.openssl.org/source/openssl-$portVersion.tar.gz" -CHECKSUM_SHA256="344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0" +CHECKSUM_SHA256="529043b15cffa5f36077a4d0af83f3de399807181d607441d734196d889b641f" SOURCE_DIR="openssl-$portVersion" PATCHES="openssl3-$portVersion.patchset" @@ -155,6 +155,34 @@ INSTALL() TEST() { +# Test Summary Report +# ------------------- +# 04-test_bio_dgram.t (Wstat: 256 (exited 1) Tests: 1 Failed: 1) +# Failed test: 1 +# Non-zero exit status: 1 +# 70-test_quic_multistream.t (Wstat: 256 (exited 1) Tests: 2 Failed: 1) +# Failed test: 1 +# Non-zero exit status: 1 +# 70-test_quic_radix.t (Wstat: 256 (exited 1) Tests: 1 Failed: 1) +# Failed test: 1 +# Non-zero exit status: 1 +# 70-test_quic_tserver.t (Wstat: 256 (exited 1) Tests: 1 Failed: 1) +# Failed test: 1 +# Non-zero exit status: 1 +# 75-test_quicapi.t (Wstat: 256 (exited 1) Tests: 1 Failed: 1) +# Failed test: 1 +# Non-zero exit status: 1 +# 82-test_ocsp_cert_chain.t (Wstat: 256 (exited 1) Tests: 3 Failed: 1) +# Failed test: 3 +# Non-zero exit status: 1 +# 90-test_asn1_time.t (Wstat: 256 (exited 1) Tests: 1 Failed: 1) +# Failed test: 1 +# Non-zero exit status: 1 +# Files=342, Tests=4422, 776 wallclock secs ( 7.86 usr 0.53 sys + 572.93 cusr 128.73 csys = 710.06 CPU) +# Result: FAIL + + # VFP = show subtests verbosely and show failed tests verbosely + # Normal V=1 would show everything verbosely but this slows things down. export LIBRARY_PATH=$LIBRARY_PATH:$sourceDir - make test + make VFP=1 test } diff --git a/dev-libs/openssl/patches/openssl3-3.5.0.patchset b/dev-libs/openssl/patches/openssl3-3.5.1.patchset similarity index 93% rename from dev-libs/openssl/patches/openssl3-3.5.0.patchset rename to dev-libs/openssl/patches/openssl3-3.5.1.patchset index ddca01614..73907dab7 100644 --- a/dev-libs/openssl/patches/openssl3-3.5.0.patchset +++ b/dev-libs/openssl/patches/openssl3-3.5.1.patchset @@ -1,11 +1,11 @@ -From 93ad4221e2818a270fee7aa8e27ed87e6ff9d433 Mon Sep 17 00:00:00 2001 +From a2022d65e4a02b65f7d32e79c83a5d26685a959a Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 14 Mar 2020 19:20:45 -0400 Subject: Small changes for Haiku. diff --git a/include/internal/common.h b/include/internal/common.h -index 0c0415b..1578908 100644 +index 894dac9..1db8f34 100644 --- a/include/internal/common.h +++ b/include/internal/common.h @@ -83,7 +83,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, @@ -18,10 +18,10 @@ index 0c0415b..1578908 100644 # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" # else -- -2.45.2 +2.48.1 -From 8e7b8c025c49ada55380f212670e8fbcc2f7e1ab Mon Sep 17 00:00:00 2001 +From 52755365827349df19d155d1ffbc2192453887e1 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Nov 2020 18:29:38 +0100 Subject: Use find_directory to locate user certificates @@ -71,10 +71,10 @@ index 7d5b642..92544ec 100644 return x509_cert_dirptr; #else -- -2.45.2 +2.48.1 -From bb52f649a0b46c25a29ef2dce9f13fd8a6cae2f2 Mon Sep 17 00:00:00 2001 +From 3c211d320fef8da68f469f61bf8134670cc24ec5 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Wed, 13 Dec 2023 14:54:54 +0100 Subject: Haiku: skip test case test_print_error_format @@ -106,10 +106,10 @@ index 2a66b48..e608f4b 100644 /* Test that querying the error queue preserves the OS error. */ static int preserves_system_error(void) -- -2.45.2 +2.48.1 -From 23eeed9dff9eabdf1b1198d2d3de2b1fd3e227a7 Mon Sep 17 00:00:00 2001 +From 244bc2f4b7d43ad2dfb265814d2963e20b81b7ef Mon Sep 17 00:00:00 2001 From: David Karoly Date: Wed, 13 Dec 2023 14:59:20 +0100 Subject: Haiku: don't use IPV6_V6ONLY @@ -130,10 +130,10 @@ index 252a9ab..eb389f0 100644 /* * Note: Windows default of IPV6_V6ONLY is ON, and Linux is OFF. -- -2.45.2 +2.48.1 -From 7352e134f1b0c8986a35155a1735b4c3a105ac65 Mon Sep 17 00:00:00 2001 +From 9ff7c3de72602e95edb5ece237b7ea8056f84d94 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Wed, 13 Dec 2023 17:49:28 +0100 Subject: Haiku: listening sockets shall default to IPv4 @@ -158,10 +158,10 @@ index 24423aa..4696a89 100644 return ret; } -- -2.45.2 +2.48.1 -From 889c4fcae4700b6ece08e775cc5f46b4c7770ab5 Mon Sep 17 00:00:00 2001 +From 946c5333a1288251822f39e0f5abdd9bbdfa369c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 4 Jun 2024 21:35:22 +0200 Subject: Haiku: inherit unix, add symbol versioning @@ -251,10 +251,10 @@ index 675d99a..5d9b667 100755 # necessarily does the trick. Trouble is that with introduction # of SafeDllSearchMode in XP/2003 it's more appropriate to copy -- -2.45.2 +2.48.1 -From d8a977df1051e212eadf9284b7ae8b24dc550348 Mon Sep 17 00:00:00 2001 +From 12e18b2db505143133d010678bc1513092006b02 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Wed, 8 Jun 2022 20:45:32 +0200 Subject: Remove the provider section. @@ -293,10 +293,10 @@ index abace0e..c1a142f 100644 -- -2.45.2 +2.48.1 -From 236d446a926fecb28d49c5a2ad21fdd3e848e3ce Mon Sep 17 00:00:00 2001 +From f4481d39c3ac17fea3ffe4a03b9da11a1bffe040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 16 Mar 2025 19:50:17 +0100 Subject: gnu-shared: remove Bsymbolic like Debian @@ -316,10 +316,10 @@ index 96953f9..b4437c2 100644 }, 'linux-shared' => sub { -- -2.45.2 +2.48.1 -From 5599155088b7b8353d92b922eb780681e7fd86c6 Mon Sep 17 00:00:00 2001 +From f2eb88d87f18d9e8d3f7033409e9e4af41441c66 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 9 Apr 2025 20:00:11 +0200 Subject: fix gcc2 build @@ -339,7 +339,7 @@ index 74b4ec9..3ca8ad0 100644 # define PREFETCH(x) __builtin_prefetch(x) #else diff --git a/include/internal/common.h b/include/internal/common.h -index 1578908..c45c0e9 100644 +index 1db8f34..0127e8d 100644 --- a/include/internal/common.h +++ b/include/internal/common.h @@ -18,7 +18,7 @@ @@ -352,5 +352,5 @@ index 1578908..c45c0e9 100644 # define ossl_unlikely(x) __builtin_expect(!!(x), 0) # else -- -2.45.2 +2.48.1