From aa2a6ce46b4194978e9ae8729280a3bb24b4558f Mon Sep 17 00:00:00 2001
From: gixxpunk <thomas.harfmann@gmail.com>
Date: Mon, 23 Oct 2017 17:25:20 +0200
Subject: [PATCH] - curl: add ca-bundle, disable ipv6 on nevis and link against
 librtmp

---
 make/archives.mk    |  5 +++++
 make/system-libs.mk | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/make/archives.mk b/make/archives.mk
index 23ce5251..4e457669 100644
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -375,3 +375,8 @@ $(ARCHIVE)/wget-$(WGET_VER).tar.gz:
 MTOOLS_VER=4.0.18
 $(ARCHIVE)/mtools-$(MTOOLS_VER).tar.gz:
 	$(WGET) ftp://ftp.gnu.org/gnu/mtools/mtools-$(MTOOLS_VER).tar.gz
+
+$(ARCHIVE)/curl-ca-bundle.crt:
+	cd $(ARCHIVE); \
+		wget https://curl.haxx.se/ca/cacert.pem; \
+		mv cacert.pem curl-ca-bundle.crt
diff --git a/make/system-libs.mk b/make/system-libs.mk
index 0f891af8..855e212e 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -95,7 +95,12 @@ $(D)/giflib: $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.bz2 | $(TARGETPREFIX)
 	$(REMOVE)/giflib-$(GIFLIB_VER)
 	touch $@
 
-$(D)/libcurl: $(D)/zlib $(D)/openssl $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 | $(TARGETPREFIX)
+CURL_IPV6="--enable-ipv6"
+ifeq ($(BOXSERIES), hd1)
+	CURL_IPV6="--disable-ipv6"
+endif
+
+$(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(ARCHIVE)/curl-ca-bundle.crt $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 | $(TARGETPREFIX)
 	$(UNTAR)/curl-$(LIBCURL_VER).tar.bz2
 	pushd $(BUILD_TMP)/curl-$(LIBCURL_VER) && \
 		$(CONFIGURE) \
@@ -118,12 +123,17 @@ $(D)/libcurl: $(D)/zlib $(D)/openssl $(ARCHIVE)/curl-$(LIBCURL_VER).tar.bz2 | $(
 			--disable-ntlm-wb \
 			--disable-ares \
 			--without-libidn \
+			--with-ca-bundle=/share/curl/curl-ca-bundle.crt \
 			--with-random=/dev/urandom \
 			--with-ssl=$(TARGETPREFIX) \
+			--with-librtmp=$(TARGETPREFIX)/lib \
+			$(CURL_IPV6) \
 			--enable-optimize && \
 		$(MAKE) all && \
 		mkdir -p $(HOSTPREFIX)/bin && \
 		sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < curl-config > $(HOSTPREFIX)/bin/curl-config && \
+		mkdir -p $(TARGETPREFIX)/share/curl && \
+		cp -a $(ARCHIVE)/curl-ca-bundle.crt $(TARGETPREFIX)/share/curl && \
 		chmod 755 $(HOSTPREFIX)/bin/curl-config && \
 		make install DESTDIR=$(TARGETPREFIX)
 	rm -rf $(TARGETPREFIX)/bin/curl-config $(TARGETPREFIX)/share/zsh