libcurl: build with ca-bundle; bump version 7.60.0

diff --git a/make/archives.mk b/make/archives.mk
index eda24104169a6e8713f1a818da3cac13e1325bff..2281f21072866bf51aaf7ef302e7f61191b25437 100755 (executable)
--- 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 24313324585175f36c9600f1cef1f46a0dc65d72..1c14d91844ec649b15e01568b5a6f724bc70c645 100755 (executable)
--- 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 4a321c5ede324a006c908b9597b1a8bc4dd06276..e7b2e938f26a1162dc41ec788c8d0af51e70cf65 100755 (executable)
--- 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 3c107a1b2c4a4254cfb707d57271bc0857dd077c..8b0d61a34a4049387db5a4936f9f2fde6eedf151 100644 (file)
--- 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