[ptxdist] [PATCH] libcurl: install /etc/ssl/certs/ca-bundle.crt

[jon@ringle.org]

From: Jon Ringle <jringle@gridpoint.com>

This will generate a ca-bundle.crt using mk-ca-bundle.pl and install it if
selected

Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
 rules/libcurl.in   |  3 +++
 rules/libcurl.make | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/rules/libcurl.in b/rules/libcurl.in
index 4ab928d..4be2416 100644
--- a/rules/libcurl.in
+++ b/rules/libcurl.in
@@ -44,4 +44,7 @@ config LIBCURL_CRYPTO_AUTH
 config LIBCURL_LIBSSH2
        bool "scp/sftp (via libssh2)"
 
+config LIBCURL_CA_BUNDLE
+       bool "install /etc/ssl/certs/ca-bundle.crt"
+
 endif
diff --git a/rules/libcurl.make b/rules/libcurl.make
index 1f2b566..0d07e3b 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -25,6 +25,28 @@ LIBCURL_URL	:= http://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)
 LIBCURL_SOURCE	:= $(SRCDIR)/$(LIBCURL).$(LIBCURL_SUFFIX)
 LIBCURL_DIR	:= $(BUILDDIR)/$(LIBCURL)
 
+CERTDATA := certdata.txt
+CERTDATA_URL := http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/$(CERTDATA)?raw=1
+CERTDATA_SOURCE := $(SRCDIR)/$(CERTDATA)
+$(CERTDATA_SOURCE) := CERTDATA
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libcurl.extract:
+	@$(call targetinfo)
+	@$(call clean, $(LIBCURL_DIR))
+	@$(call extract, LIBCURL, $(BUILDDIR))
+	@$(call patchin, LIBCURL, $(LIBCURL_DIR))
+ifdef PTXCONF_LIBCURL_CA_BUNDLE
+	@$(call get, CERTDATA)
+	@cd $(LIBCURL_DIR); \
+	ln -s $(CERTDATA_SOURCE) ; \
+	$(LIBCURL_DIR)/lib/mk-ca-bundle.pl -n -u $(LIBCURL_DIR)/ca-bundle.crt
+endif
+	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
@@ -62,7 +84,6 @@ LIBCURL_AUTOCONF := \
 	--without-gssapi \
 	--without-gnutls \
 	--without-nss \
-	--without-ca-bundle \
 	--without-ca-path \
 	--without-libidn \
 	--without-axtls \
@@ -75,6 +96,12 @@ LIBCURL_AUTOCONF := \
 	--$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-crypto-auth \
 	--$(call ptx/endis, PTXCONF_LIBCURL_LIBSSH2)-libssh2
 
+ifdef PTXCONF_LIBCURL_CA_BUNDLE
+LIBCURL_AUTOCONF += --with-ca-bundle=/etc/ssl/certs/ca-bundle.crt
+else
+LIBCURL_AUTOCONF += --without-ca-bundle
+endif
+
 ifdef PTXCONF_LIBCURL_SSL
 LIBCURL_AUTOCONF += --with-ssl=$(SYSROOT)
 else
@@ -97,6 +124,10 @@ $(STATEDIR)/libcurl.targetinstall:
 ifdef PTXCONF_LIBCURL_CURL
 	@$(call install_copy, libcurl, 0, 0, 0755, -, /usr/bin/curl)
 endif
+
+ifdef PTXCONF_LIBCURL_CA_BUNDLE
+	@$(call install_copy, libcurl, 0, 0, 0444, $(LIBCURL_DIR)/ca-bundle.crt, /etc/ssl/certs/ca-bundle.crt)
+endif
 	@$(call install_lib, libcurl, 0, 0, 0644, libcurl)
 
 	@$(call install_finish, libcurl)
-- 
1.8.5.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de