From 5e98219f1923f2d7bda8d6c5deb478c97c995ae4 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 9 Jan 2025 15:20:51 -0700
Subject: [PATCH] Use /etc/ssl/certs for SSL certificates
---
recipes/net/curl/recipe.toml | 2 +-
recipes/other/ca-certificates/recipe.toml | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/recipes/net/curl/recipe.toml b/recipes/net/curl/recipe.toml
index b55b006c6..4c28f0d2e 100644
--- a/recipes/net/curl/recipe.toml
+++ b/recipes/net/curl/recipe.toml
@@ -29,7 +29,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
--disable-tftp
--disable-threaded-resolver
--enable-static
- --with-ca-path=/ssl/certs
+ --with-ca-path=/etc/ssl/certs
--with-nghttp2="${COOKBOOK_SYSROOT}"
--with-ssl="${COOKBOOK_SYSROOT}"
--with-zlib="${COOKBOOK_SYSROOT}"
diff --git a/recipes/other/ca-certificates/recipe.toml b/recipes/other/ca-certificates/recipe.toml
index cbd708270..b7674f22b 100644
--- a/recipes/other/ca-certificates/recipe.toml
+++ b/recipes/other/ca-certificates/recipe.toml
@@ -4,6 +4,8 @@ git = "https://gitlab.redox-os.org/redox-os/ca-certificates.git"
[build]
template = "custom"
script = """
-mkdir -pv "${COOKBOOK_STAGE}/ssl"
-cp -rv "${COOKBOOK_SOURCE}/certs" "${COOKBOOK_STAGE}/ssl/certs"
+mkdir -pv "${COOKBOOK_STAGE}/etc/ssl"
+cp -rv "${COOKBOOK_SOURCE}/certs" "${COOKBOOK_STAGE}/etc/ssl/certs"
+#TODO: remove deprecated location after all recipes are fixed
+ln -s etc/ssl "${COOKBOOK_STAGE}/ssl"
"""
--
GitLab