From 1bba2b69bd256e99867ace6727dea82e2bae976a Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 5 May 2026 05:10:29 +0700 Subject: [PATCH] openssl3: Patches for linux relibc --- recipes/libs/openssl3/redox.patch | 34 ++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/recipes/libs/openssl3/redox.patch b/recipes/libs/openssl3/redox.patch index b11ccc48..20d28977 100644 --- a/recipes/libs/openssl3/redox.patch +++ b/recipes/libs/openssl3/redox.patch @@ -1,18 +1,18 @@ diff -ruwN source/apps/lib/apps.c source-new/apps/lib/apps.c --- source/apps/lib/apps.c 2025-09-16 19:05:33.000000000 +0700 -+++ source-new/apps/lib/apps.c 2025-09-20 12:29:36.439917319 +0700 ++++ source-new/apps/lib/apps.c 2026-05-05 05:08:40.007422945 +0700 @@ -2839,7 +2839,7 @@ return ret; } -#elif defined(_SC_CLK_TCK) /* by means of unistd.h */ -+#elif defined(_SC_CLK_TCK) && !defined(__redox__) /* by means of unistd.h */ ++#elif defined(_SC_CLK_TCK) && !defined(__RELIBC__) /* by means of unistd.h */ # include double app_tminterval(int stop, int usertime) diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main.conf --- source/Configurations/10-main.conf 2025-09-16 19:05:33.000000000 +0700 -+++ source-new/Configurations/10-main.conf 2025-09-20 13:13:14.569456910 +0700 ++++ source-new/Configurations/10-main.conf 2026-05-05 05:08:44.812616321 +0700 @@ -208,6 +208,40 @@ shared_extension => ".so", }, @@ -54,3 +54,31 @@ diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main. #### Solaris configurations "solaris-common" => { inherit_from => [ "BASE_unix" ], +@@ -693,7 +727,6 @@ + shared_target => "linux-shared", + shared_cflag => "-fPIC", + shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" }, +- enable => [ "afalgeng" ], + }, + "linux-latomic" => { + inherit_from => [ "linux-generic32" ], +@@ -890,7 +923,6 @@ + bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'x86_64', + perlasm_scheme => "elf", +- multilib => "64", + }, + "linux-x86_64-clang" => { + inherit_from => [ "linux-x86_64" ], +diff -ruwN source/include/crypto/rand.h source-new/include/crypto/rand.h +--- source/include/crypto/rand.h 2025-09-16 19:05:33.000000000 +0700 ++++ source-new/include/crypto/rand.h 2026-05-05 05:08:40.007980910 +0700 +@@ -41,7 +41,7 @@ + * default, we will try to read at least one of these files + */ + # define DEVRANDOM "/dev/urandom", "/dev/random", "/dev/hwrng", "/dev/srandom" +-# if defined(__linux) && !defined(__ANDROID__) ++# if defined(__linux) && !defined(__RELIBC__) && !defined(__ANDROID__) /* needs sys/shm.h */ + # ifndef DEVRANDOM_WAIT + # define DEVRANDOM_WAIT "/dev/random" + # endif