diff --git a/dev-libs/openssl/openssl3-3.5.0.recipe b/dev-libs/openssl/openssl3-3.5.0.recipe index fb36bd6da..dd0cfb6a2 100644 --- a/dev-libs/openssl/openssl3-3.5.0.recipe +++ b/dev-libs/openssl/openssl3-3.5.0.recipe @@ -15,7 +15,7 @@ HOMEPAGE="https://www.openssl.org/" COPYRIGHT="1995-1998 Eric Young 1998-2024 The OpenSSL Project" LICENSE="OpenSSL" -REVISION="1" +REVISION="2" SOURCE_URI="https://www.openssl.org/source/openssl-$portVersion.tar.gz" CHECKSUM_SHA256="344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0" SOURCE_DIR="openssl-$portVersion" @@ -71,7 +71,7 @@ REQUIRES_devel=" openssl3$secondaryArchSuffix == $portVersion base " CONFLICTS_devel=" - openssl3${secondaryArchSuffix}_devel + openssl${secondaryArchSuffix}_devel " BUILD_REQUIRES=" @@ -107,7 +107,7 @@ BUILD() { ./config --prefix=$prefix --libdir=$relativeLibDir \ --openssldir=$dataRootDir/ssl \ - zlib shared no-asm -g + zlib shared no-asm no-tests -g make $jobArgs } diff --git a/dev-libs/openssl/patches/openssl3-3.5.0.patchset b/dev-libs/openssl/patches/openssl3-3.5.0.patchset index 323f77652..ddca01614 100644 --- a/dev-libs/openssl/patches/openssl3-3.5.0.patchset +++ b/dev-libs/openssl/patches/openssl3-3.5.0.patchset @@ -1,4 +1,4 @@ -From 86678667c290a800177fc80a6589c4a1273348d4 Mon Sep 17 00:00:00 2001 +From 93ad4221e2818a270fee7aa8e27ed87e6ff9d433 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 14 Mar 2020 19:20:45 -0400 Subject: Small changes for Haiku. @@ -21,7 +21,7 @@ index 0c0415b..1578908 100644 2.45.2 -From 31465dd4021a5805e81495a21d7f07f9f46fc528 Mon Sep 17 00:00:00 2001 +From 8e7b8c025c49ada55380f212670e8fbcc2f7e1ab 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 @@ -74,7 +74,7 @@ index 7d5b642..92544ec 100644 2.45.2 -From c19610c947b8535e4728576d801aecf2a1e6bfcf Mon Sep 17 00:00:00 2001 +From bb52f649a0b46c25a29ef2dce9f13fd8a6cae2f2 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 @@ -109,7 +109,7 @@ index 2a66b48..e608f4b 100644 2.45.2 -From 00d59adc87c03b1f0eaeaa133714ccb7fcc8cfd8 Mon Sep 17 00:00:00 2001 +From 23eeed9dff9eabdf1b1198d2d3de2b1fd3e227a7 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 @@ -133,7 +133,7 @@ index 252a9ab..eb389f0 100644 2.45.2 -From b9eec60f160e3d79a3ee41ab4991b4316a6012fe Mon Sep 17 00:00:00 2001 +From 7352e134f1b0c8986a35155a1735b4c3a105ac65 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 @@ -161,7 +161,7 @@ index 24423aa..4696a89 100644 2.45.2 -From 96cc78f7a2ea5b186d44998814e8d050cbf2993c Mon Sep 17 00:00:00 2001 +From 889c4fcae4700b6ece08e775cc5f46b4c7770ab5 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 @@ -254,7 +254,7 @@ index 675d99a..5d9b667 100755 2.45.2 -From 30d20613172be8a9fb92ae80a00b73cbbe02da36 Mon Sep 17 00:00:00 2001 +From d8a977df1051e212eadf9284b7ae8b24dc550348 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. @@ -296,7 +296,7 @@ index abace0e..c1a142f 100644 2.45.2 -From 70283b62c27a3ffe214d8bb4e88a8d22fe076935 Mon Sep 17 00:00:00 2001 +From 236d446a926fecb28d49c5a2ad21fdd3e848e3ce 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 @@ -318,3 +318,39 @@ index 96953f9..b4437c2 100644 -- 2.45.2 + +From 5599155088b7b8353d92b922eb780681e7fd86c6 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 9 Apr 2025 20:00:11 +0200 +Subject: fix gcc2 build + + +diff --git a/crypto/hashtable/hashtable.c b/crypto/hashtable/hashtable.c +index 74b4ec9..3ca8ad0 100644 +--- a/crypto/hashtable/hashtable.c ++++ b/crypto/hashtable/hashtable.c +@@ -79,7 +79,7 @@ + * cache line it is advantageous, when supported to fetch the entire + * structure for faster lookups + */ +-#if defined(__GNUC__) || defined(__CLANG__) ++#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__CLANG__) + # define PREFETCH_NEIGHBORHOOD(x) __builtin_prefetch(x.entries) + # define PREFETCH(x) __builtin_prefetch(x) + #else +diff --git a/include/internal/common.h b/include/internal/common.h +index 1578908..c45c0e9 100644 +--- a/include/internal/common.h ++++ b/include/internal/common.h +@@ -18,7 +18,7 @@ + # include "internal/e_os.h" /* ossl_inline in many files */ + # include "internal/nelem.h" + +-# if defined(__GNUC__) || defined(__clang__) ++# if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__clang__) + # define ossl_likely(x) __builtin_expect(!!(x), 1) + # define ossl_unlikely(x) __builtin_expect(!!(x), 0) + # else +-- +2.45.2 +