diff mbox series

curl: Ensure 'CURL_CA_BUNDLE' from host env is indeed respected

Message ID 20251124055533.857103-1-Moritz.Haase@bmw.de
State New
Headers show
Series curl: Ensure 'CURL_CA_BUNDLE' from host env is indeed respected | expand

Commit Message

Moritz Haase Nov. 24, 2025, 5:55 a.m. UTC
Due to what looks like a copy'n'paste mistake, the environment setup script
might override 'CURL_CA_BUNDLE' from the host env instead of leaving it
untouched. Fix that.

CC: changqing.li@windriver.com
CC: raj.khem@gmail.com
Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
---
 meta/recipes-support/curl/curl/environment.d-curl.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Khem Raj Nov. 24, 2025, 6 a.m. UTC | #1
On Sun, Nov 23, 2025 at 9:55 PM Moritz Haase <Moritz.Haase@bmw.de> wrote:

> Due to what looks like a copy'n'paste mistake, the environment setup script
> might override 'CURL_CA_BUNDLE' from the host env instead of leaving it
> untouched. Fix that.
>
> CC: changqing.li@windriver.com
> CC: raj.khem@gmail.com
> Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
> ---
>  meta/recipes-support/curl/curl/environment.d-curl.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh
> b/meta/recipes-support/curl/curl/environment.d-curl.sh
> index 581108ef35..b948db2cf6 100644
> --- a/meta/recipes-support/curl/curl/environment.d-curl.sh
> +++ b/meta/recipes-support/curl/curl/environment.d-curl.sh
> @@ -1,6 +1,6 @@
>  # Respect host env CURL_CA_BUNDLE/CURL_CA_PATH first, then auto-detected
> host cert, then cert in buildtools
> -# CAFILE/CAPATH is auto-deteced when source buildtools
> -if [ -z "${CURL_CA_PATH:-}" ]; then
> +# CAFILE/CAPATH is auto-detected when source buildtools
> +if [ -z "${CURL_CA_BUNDLE:-}" ]; then
>

Looks good.


>         if [ -n "${CAFILE:-}" ];then
>                 export CURL_CA_BUNDLE="$CAFILE"
>         elif [ -e
> "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then
>
diff mbox series

Patch

diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh b/meta/recipes-support/curl/curl/environment.d-curl.sh
index 581108ef35..b948db2cf6 100644
--- a/meta/recipes-support/curl/curl/environment.d-curl.sh
+++ b/meta/recipes-support/curl/curl/environment.d-curl.sh
@@ -1,6 +1,6 @@ 
 # Respect host env CURL_CA_BUNDLE/CURL_CA_PATH first, then auto-detected host cert, then cert in buildtools
-# CAFILE/CAPATH is auto-deteced when source buildtools
-if [ -z "${CURL_CA_PATH:-}" ]; then
+# CAFILE/CAPATH is auto-detected when source buildtools
+if [ -z "${CURL_CA_BUNDLE:-}" ]; then
 	if [ -n "${CAFILE:-}" ];then
 		export CURL_CA_BUNDLE="$CAFILE"
 	elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then