curl: Ensure 'CURL_CA_BUNDLE' from host env is indeed respected
PATCH 1/1 curl: Ensure 'CURL_CA_BUNDLE' from host env is indeed respected
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.
--- meta/recipes-support/curl/curl/environment.d-curl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/curl/curl/environment.d-curl.sh +2 -2
@@ -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
Quoted 20 lines · Moritz Haase
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.--- meta/recipes-support/curl/curl/environment.d-curl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta/recipes-support/curl/curl/environment.d-curl.sh +0
-0@@ -1,6 +1,6 @@ # Respect host env CURL_CA_BUNDLE/CURL_CA_PATH first, then auto-detectedhost cert, then cert in buildtools
meta/recipes-support/curl/curl/environment.d-curl.sh line 3
Quoted 4 lines
meta/recipes-support/curl/curl/environment.d-curl.sh +2
-2-# 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.
Quoted 5 lines
if [ -n "${CAFILE:-}" ];then
export CURL_CA_BUNDLE="$CAFILE"
elif [ -e
"${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then
Quoted 19 lines · Moritz Haase
CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.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.--- meta/recipes-support/curl/curl/environment.d-curl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta/recipes-support/curl/curl/environment.d-curl.sh +0
-0
meta/recipes-support/curl/curl/environment.d-curl.sh line 3
Quoted 5 lines
meta/recipes-support/curl/curl/environment.d-curl.sh +2
-2@@ -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
Look good, it should be a copy'n'paste mistake. Could you also send this to Scarthgap branch? Thanks
//Changqing
Quoted 3 lines
meta/recipes-support/curl/curl/environment.d-curl.sh +0
-0if [ -n "${CAFILE:-}" ];then export CURL_CA_BUNDLE="$CAFILE" elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then
Hi,
Quoted 1 line
Look good, it should be a copy'n'paste mistake. Could you also send this to Scarthgap branch?
yes, will do once accepted for 'master'.
Moritz