Patchwork [v2] libcurl: specify capath

login
register
mail settings
Submitter Shawn J. Goff
Date April 17, 2013, 9:31 p.m.
Message ID <1366234287-8062-1-git-send-email-shawn7400@gmail.com>
Download mbox | patch
Permalink /patch/237367/
State Accepted
Commit 4f3c8cf94bd610f60c6963cb6c1df041a1ebb7f3
Headers show

Comments

Shawn J. Goff - April 17, 2013, 9:31 p.m.
From: "Shawn J. Goff" <shawn7400@gmail.com>

Since openssl's path is '/etc/ssl/' (specified in our openssl package),
we should also make sure that's what curl is using.

Previously, it's hasn't been specified, which means it changes depending
on the host system where it's compiled.

Signed-off-by: Shawn J. Goff <shawn7400@gmail.com>
---

Moved the option inside the BR2_PACKAGE_OPENSSL conditional.

 package/libcurl/libcurl.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Peter Korsgaard - April 21, 2013, 9:16 p.m.
>>>>> "Shawn" == Shawn J Goff <shawn7400@gmail.com> writes:

 Shawn> From: "Shawn J. Goff" <shawn7400@gmail.com>

 Shawn> Since openssl's path is '/etc/ssl/' (specified in our openssl
 Shawn> package), we should also make sure that's what curl is using.

 Shawn> Previously, it's hasn't been specified, which means it changes
 Shawn> depending on the host system where it's compiled.

 Shawn> Signed-off-by: Shawn J. Goff <shawn7400@gmail.com>
 Shawn> ---

 Shawn> Moved the option inside the BR2_PACKAGE_OPENSSL conditional.

Committed, thanks.

Patch

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index a631953..f0236d9 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -27,7 +27,9 @@  LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
 # Fix it by setting LD_LIBRARY_PATH to something sensible so those libs
 # are found first.
 LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib
-LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
+LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr \
+	--with-random=/dev/urandom \
+	--with-ca-path=/etc/ssl/certs
 else
 LIBCURL_CONF_OPT += --without-ssl
 endif