fix ca-bundle url and libcurl target

diff --git a/make/libraries.mk b/make/libraries.mk
index d26f2f5979739868671c95aff03b59a1831b15dd..a1ddb0e53c8c40cb3f76dd441d4e7ff65c919208 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -436,11 +436,13 @@ $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz | $(TARG
        chmod 0755 $(TARGETPREFIX)/lib/libcrypto.so.* $(TARGETPREFIX)/lib/libssl.so.*
        $(TOUCH)
 
-$(D)/ca-bundle: $(ARCHIVE)/cacert.pem | $(TARGETPREFIX)
+CA_URL = https://curl.se/ca/cacert.pem
+$(D)/ca-bundle: | $(TARGETPREFIX)
        $(START_BUILD)  
        cd $(ARCHIVE); \
-               curl -s --remote-name --time-cond $(ARCHIVE)/cacert.pem https://curl.haxx.se/ca/cacert.pem
+               curl -s --remote-name --time-cond $(ARCHIVE)/cacert.pem $(CA_URL)
        install -D -m 644 $(ARCHIVE)/cacert.pem $(TARGETPREFIX)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE)
+       openssl verify $(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)
@@ -452,26 +454,29 @@ $(D)/libcurl: $(ARCHIVE)/curl-$(CURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D)
                        --prefix=${PREFIX} \
                        --build=$(BUILD) \
                        --host=$(TARGET) \
-                       --mandir=/.remove \
-                       --enable-silent-rules \
-                       --disable-debug \
-                       --disable-curldebug \
+                       $(if $(filter $(BOXSERIES),hd1),--disable-ipv6,--enable-ipv6) \
                        --disable-manual \
                        --disable-file \
                        --disable-rtsp \
                        --disable-dict \
+                       --disable-ldap \
+                       --disable-curldebug \
+                       --disable-static \
                        --disable-imap \
                        --disable-gopher \
                        --disable-pop3 \
                        --disable-smtp \
-                       --enable-shared \
-                       --disable-ldap \
+                       --disable-verbose \
+                       --disable-manual \
+                       --disable-ntlm-wb \
+                       --disable-ares \
                        --without-libidn \
-                       --without-libpsl \
-                       --with-random=/dev/urandom \
                        --with-ca-bundle=/$(CA_BUNDLE_DIR)/$(CA_BUNDLE) \
+                       --with-random=/dev/urandom \
                        --with-ssl=$(TARGETPREFIX) \
-                       --with-librtmp=$(TARGETPREFIX)/lib; \
+                       --with-librtmp=$(TARGETPREFIX)/lib \
+                       --enable-optimize \
+                       ; \
                $(MAKE) all; \
                mkdir -p $(HOSTPREFIX)/bin; \
                sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < curl-config > $(HOSTPREFIX)/bin/curl-config; \