From 052c1b231346da93ff11a7b53a2a959fe8714051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 2 Feb 2026 18:37:23 +0100 Subject: [PATCH] openssl: bump version --- ...sl3-3.5.4.recipe => openssl3-3.5.5.recipe} | 2 +- ...3.5.4.patchset => openssl3-3.5.5.patchset} | 103 +++++++++--------- 2 files changed, 52 insertions(+), 53 deletions(-) rename dev-libs/openssl/{openssl3-3.5.4.recipe => openssl3-3.5.5.recipe} (98%) rename dev-libs/openssl/patches/{openssl3-3.5.4.patchset => openssl3-3.5.5.patchset} (80%) diff --git a/dev-libs/openssl/openssl3-3.5.4.recipe b/dev-libs/openssl/openssl3-3.5.5.recipe similarity index 98% rename from dev-libs/openssl/openssl3-3.5.4.recipe rename to dev-libs/openssl/openssl3-3.5.5.recipe index 44b7e69f4..cb1b39c65 100644 --- a/dev-libs/openssl/openssl3-3.5.4.recipe +++ b/dev-libs/openssl/openssl3-3.5.5.recipe @@ -17,7 +17,7 @@ COPYRIGHT="1995-1998 Eric Young LICENSE="OpenSSL" REVISION="1" SOURCE_URI="https://www.openssl.org/source/openssl-$portVersion.tar.gz" -CHECKSUM_SHA256="967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99" +CHECKSUM_SHA256="b28c91532a8b65a1f983b4c28b7488174e4a01008e29ce8e69bd789f28bc2a89" SOURCE_DIR="openssl-$portVersion" PATCHES="openssl3-$portVersion.patchset" diff --git a/dev-libs/openssl/patches/openssl3-3.5.4.patchset b/dev-libs/openssl/patches/openssl3-3.5.5.patchset similarity index 80% rename from dev-libs/openssl/patches/openssl3-3.5.4.patchset rename to dev-libs/openssl/patches/openssl3-3.5.5.patchset index 73907dab7..840aa9989 100644 --- a/dev-libs/openssl/patches/openssl3-3.5.4.patchset +++ b/dev-libs/openssl/patches/openssl3-3.5.5.patchset @@ -1,27 +1,27 @@ -From a2022d65e4a02b65f7d32e79c83a5d26685a959a Mon Sep 17 00:00:00 2001 +From c7c8c19eb47de9b15780561bd67187b0b6d7e0e1 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 894dac9..1db8f34 100644 +index 5de7279..f5febc3 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, - # ifndef OPENSSL_SYS_VMS - # define X509_CERT_AREA OPENSSLDIR - # define X509_CERT_DIR OPENSSLDIR "/certs" --# define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+# define X509_CERT_FILE OPENSSLDIR "/CARootCertificates.pem" - # define X509_PRIVATE_DIR OPENSSLDIR "/private" - # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" - # else +@@ -82,7 +82,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, + #ifndef OPENSSL_SYS_VMS + #define X509_CERT_AREA OPENSSLDIR + #define X509_CERT_DIR OPENSSLDIR "/certs" +-#define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++#define X509_CERT_FILE OPENSSLDIR "/CARootCertificates.pem" + #define X509_PRIVATE_DIR OPENSSLDIR "/private" + #define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + #else -- -2.48.1 +2.51.0 -From 52755365827349df19d155d1ffbc2192453887e1 Mon Sep 17 00:00:00 2001 +From 38b1305cd3e63c2828d9ac9ed883762235a011de 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 @@ -34,7 +34,7 @@ This was previously done in BSecureSocket (overriding OpenSSL defaults), now it is valid also for apps using OpenSSL directly. diff --git a/crypto/x509/x509_def.c b/crypto/x509/x509_def.c -index 7d5b642..92544ec 100644 +index 5a6ecaf..39220df 100644 --- a/crypto/x509/x509_def.c +++ b/crypto/x509/x509_def.c @@ -65,6 +65,10 @@ DEFINE_RUN_ONCE_STATIC(do_openssldir_setup) @@ -47,12 +47,12 @@ index 7d5b642..92544ec 100644 + const char *X509_get_default_private_dir(void) { - #if defined (_WIN32) + #if defined(_WIN32) @@ -87,7 +91,20 @@ const char *X509_get_default_cert_area(void) const char *X509_get_default_cert_dir(void) { --#if defined (_WIN32) +-#if defined(_WIN32) +#if defined(__HAIKU__) + static char path[PATH_MAX]; + if (path[0] != 0) @@ -66,22 +66,22 @@ index 7d5b642..92544ec 100644 + strlcat(path, "/ssl/certs/", sizeof(path)); + return path; + } -+#elif defined (_WIN32) ++#elif defined(_WIN32) RUN_ONCE(&openssldir_setup_init, do_openssldir_setup); return x509_cert_dirptr; #else -- -2.48.1 +2.51.0 -From 3c211d320fef8da68f469f61bf8134670cc24ec5 Mon Sep 17 00:00:00 2001 +From 3351260e7884c1c72bc7e7ef76530fe835ce88c0 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 diff --git a/test/errtest.c b/test/errtest.c -index 2a66b48..e608f4b 100644 +index 323184d..8f19709 100644 --- a/test/errtest.c +++ b/test/errtest.c @@ -21,6 +21,12 @@ @@ -94,7 +94,7 @@ index 2a66b48..e608f4b 100644 + return TEST_skip("not supported on Haiku"); +} +#else - # define IS_HEX(ch) ((ch >= '0' && ch <='9') || (ch >= 'A' && ch <='F')) + #define IS_HEX(ch) ((ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'F')) static int test_print_error_format(void) @@ -112,6 +118,7 @@ err: @@ -106,41 +106,40 @@ index 2a66b48..e608f4b 100644 /* Test that querying the error queue preserves the OS error. */ static int preserves_system_error(void) -- -2.48.1 +2.51.0 -From 244bc2f4b7d43ad2dfb265814d2963e20b81b7ef Mon Sep 17 00:00:00 2001 +From 8be158d76da6ea9ddce895f4833260e25210769a 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 diff --git a/crypto/bio/bio_sock2.c b/crypto/bio/bio_sock2.c -index 252a9ab..eb389f0 100644 +index a9face3..136f43d 100644 --- a/crypto/bio/bio_sock2.c +++ b/crypto/bio/bio_sock2.c -@@ -328,7 +328,8 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options) +@@ -328,7 +328,7 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options) } - /* On OpenBSD it is always IPv6 only with IPv6 sockets thus read-only */ --# if defined(IPV6_V6ONLY) && !defined(__OpenBSD__) -+ /* IPV6_V6ONLY is broken on Haiku */ -+# if defined(IPV6_V6ONLY) && !defined(__OpenBSD__) && !defined(__HAIKU__) + /* On OpenBSD it is always IPv6 only with IPv6 sockets thus read-only */ +-#if defined(IPV6_V6ONLY) && !defined(__OpenBSD__) ++#if defined(IPV6_V6ONLY) && !defined(__OpenBSD__) && !defined(__HAIKU__) if (BIO_ADDR_family(addr) == AF_INET6) { /* * Note: Windows default of IPV6_V6ONLY is ON, and Linux is OFF. -- -2.48.1 +2.51.0 -From 9ff7c3de72602e95edb5ece237b7ea8056f84d94 Mon Sep 17 00:00:00 2001 +From 0d2d67c0c2269bede173c17996e879df22cdd0b2 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 diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c -index 24423aa..4696a89 100644 +index 14bc36d..04bc647 100644 --- a/crypto/bio/bss_acpt.c +++ b/crypto/bio/bss_acpt.c @@ -94,7 +94,13 @@ static BIO_ACCEPT *BIO_ACCEPT_new(void) @@ -158,10 +157,10 @@ index 24423aa..4696a89 100644 return ret; } -- -2.48.1 +2.51.0 -From 946c5333a1288251822f39e0f5abdd9bbdfa369c Mon Sep 17 00:00:00 2001 +From c641c4e972f0577112c35f231c6200f8cb3a8679 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 +250,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.48.1 +2.51.0 -From 12e18b2db505143133d010678bc1513092006b02 Mon Sep 17 00:00:00 2001 +From 80da47cac5fd0f11e01e78291cc221cb19753c57 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 +292,10 @@ index abace0e..c1a142f 100644 -- -2.48.1 +2.51.0 -From f4481d39c3ac17fea3ffe4a03b9da11a1bffe040 Mon Sep 17 00:00:00 2001 +From d87e5377341f07c8c625f8cfa53d64f6fd939a76 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,17 +315,17 @@ index 96953f9..b4437c2 100644 }, 'linux-shared' => sub { -- -2.48.1 +2.51.0 -From f2eb88d87f18d9e8d3f7033409e9e4af41441c66 Mon Sep 17 00:00:00 2001 +From 3051cd153e103791f6dfcc18aab0656e600ee5ff 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 +index dba05eb..1189ef0 100644 --- a/crypto/hashtable/hashtable.c +++ b/crypto/hashtable/hashtable.c @@ -79,7 +79,7 @@ @@ -335,22 +334,22 @@ index 74b4ec9..3ca8ad0 100644 */ -#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) + #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 1db8f34..0127e8d 100644 +index f5febc3..a1f9953 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" + #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 +-#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.48.1 +2.51.0