From 7307b91030b3807c2903e5169d5a020f48bf316c Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sun, 3 Jun 2018 09:44:16 +0200
Subject: [PATCH] libcurl: build with ca-bundle; bump version 7.60.0

---
 make/archives.mk    |  3 +++
 make/environment.mk |  4 ++++
 make/libraries.mk   | 11 +++++++++--
 make/versions.mk    |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/make/archives.mk b/make/archives.mk
index eda2410..2281f21 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -133,6 +133,9 @@ $(ARCHIVE)/procps-3.2.8.tar.gz:
 $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2:
 	$(WGET) https://busybox.net/downloads/busybox-$(BUSYBOX_VER).tar.bz2
 
+$(ARCHIVE)/cacert.pem:
+	$(WGET) https://curl.haxx.se/ca/cacert.pem
+
 $(ARCHIVE)/cortex-strings-git-$(CORTEX_STRINGS_VER).tar.gz:
 	set -e; cd $(BUILD_TMP); \
 		rm -rf cortex-strings-git-$(CORTEX_STRINGS_VER); \
diff --git a/make/environment.mk b/make/environment.mk
index 2431332..1c14d91 100755
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -161,6 +161,10 @@ PKG_CONFIG = $(HOSTPREFIX)/bin/$(TARGET)-pkg-config
 PKG_CONFIG_LIBDIR = $(TARGETPREFIX)/lib
 PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig
 
+# certificates
+CA_BUNDLE             = ca-certificates.crt
+CA_BUNDLE_DIR         = etc/ssl/certs
+
 # helper-"functions":
 REWRITE_LIBTOOL    = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(TARGETLIB)
 REWRITE_LIBTOOLDEP = sed -i -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGETLIB),g" $(TARGETLIB)
diff --git a/make/libraries.mk b/make/libraries.mk
index 4a321c5..e7b2e93 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -391,7 +391,12 @@ $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz | $(TARG
 	chmod 0755 $(TARGETPREFIX)/lib/libcrypto.so.* $(TARGETPREFIX)/lib/libssl.so.*
 	$(TOUCH)
 
-$(D)/libcurl: $(ARCHIVE)/curl-$(CURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D)/zlib | $(TARGETPREFIX)
+$(D)/ca-bundle: $(ARCHIVE)/cacert.pem | $(TARGETPREFIX)
+	$(START_BUILD)
+	install -D -m 644 $(ARCHIVE)/cacert.pem $(TARGETPREFIX)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE)
+	$(TOUCH)
+
+$(D)/libcurl: $(ARCHIVE)/curl-$(CURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D)/zlib $(D)/ca-bundle | $(TARGETPREFIX)
 	$(START_BUILD)
 	$(UNTAR)/curl-$(CURL_VER).tar.bz2
 	set -e; cd $(BUILD_TMP)/curl-$(CURL_VER); \
@@ -409,13 +414,15 @@ $(D)/libcurl: $(ARCHIVE)/curl-$(CURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D)
 			--disable-rtsp \
 			--disable-dict \
 			--disable-imap \
+			--disable-gopher \
 			--disable-pop3 \
 			--disable-smtp \
 			--enable-shared \
 			--disable-ldap \
 			--without-libidn \
 			--without-libpsl \
-			--with-random \
+			--with-random=/dev/urandom \
+			--with-ca-bundle=/$(CA_BUNDLE_DIR)/$(CA_BUNDLE) \
 			--with-ssl=$(TARGETPREFIX)/lib \
 			--with-librtmp=$(TARGETPREFIX)/lib; \
 		$(MAKE) all; \
diff --git a/make/versions.mk b/make/versions.mk
index 3c107a1..8b0d61a 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -41,7 +41,7 @@ GETTEXT_VER = 0.19.8.1
 GIFLIB_VER=5.1.4
 
 # curl; command line tool for transferring data with URL syntax
-CURL_VER = 7.59.0
+CURL_VER = 7.60.0
 
 # e2fsprogs; filesystem utilities for use with the ext[x] filesystem
 E2FSPROGS_VER=1.42.13
-- 
2.39.5