From 8c00164b3cf63d0bcd97d138dd9104f7d4bb4c55 Mon Sep 17 00:00:00 2001 From: Frityet Date: Tue, 14 Apr 2026 16:42:35 -0700 Subject: [PATCH 1/2] should use opnssl3 for dep --- packages/o/objfw/xmake.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/o/objfw/xmake.lua b/packages/o/objfw/xmake.lua index 7ed408d0c90..b2f9193031a 100644 --- a/packages/o/objfw/xmake.lua +++ b/packages/o/objfw/xmake.lua @@ -84,12 +84,12 @@ package("objfw") if package:is_plat("macosx") then package:add("frameworks", "Security") else - package:add("deps", "openssl") + package:add("deps", "openssl3") end end elseif tls then if tls == "openssl" then - package:add("deps", "openssl") + package:add("deps", "openssl3") elseif tls == "securetransport" then package:add("frameworks", "Security") elseif tls == "gnutls" then From d83fd49323080327e164cf5aba6e5b31a3599748 Mon Sep 17 00:00:00 2001 From: Frityet Date: Tue, 14 Apr 2026 16:47:22 -0700 Subject: [PATCH 2/2] Refactor TLS config and update SSL dependencies Removed conditional TLS configuration for macOS and updated SSL dependency handling to include OpenSSL 3. --- packages/o/objfw/xmake.lua | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/o/objfw/xmake.lua b/packages/o/objfw/xmake.lua index b2f9193031a..206eb43697c 100644 --- a/packages/o/objfw/xmake.lua +++ b/packages/o/objfw/xmake.lua @@ -75,9 +75,6 @@ package("objfw") add_configs("arc", { description = "Enable Automatic Reference Counting (ARC) support.", default = true, type = "boolean" }) on_load(function (package) - if package:is_plat("macosx") and package:version() and package:version():gt("1.4.4") and package:config("tls") == "securetransport" then - package:config_set("tls", "openssl") - end local tls = package:config("tls") if type(tls) == "boolean" then if tls then @@ -134,7 +131,7 @@ package("objfw") -- SecureTransport must be handled by system so we don't worry about providing CFLAGS and LDFLAGS, -- but for OpenSSL and GnuTLS we need to provide the paths - local ssl = package:dep("openssl") or package:dep("gnutls") + local ssl = package:dep("openssl3") or package:dep("gnutls") or package:dep("openssl") local is_gnu = ssl and ssl:name() == "gnutls" if ssl then import("lib.detect.find_library") @@ -150,8 +147,6 @@ package("objfw") if libssl then table.insert(configs, "CPPFLAGS=-I" .. ssl_incdir) table.insert(configs, "LDFLAGS=-L" .. libssl.linkdir) - else - print("No SSL library found, using system default") end end