From d51e5bc40eb35a4501a176e5841293a5e7e26309 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 23 Jul 2019 16:47:26 -0400 Subject: [PATCH] Add changelog entry for 1.1.3. Remove verbose curl. --- CHANGELOG.md | 5 +++++ Makefile | 6 +++--- src/network.cpp | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37e86ad1..9d8fef04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ In this document, Mod is Ctrl on Windows/Linux and Cmd on Mac. +### 1.1.3 (2019-07-23) +- Include root certificate bundle for libcurl on all OS's. +- Revert to OpenSSL from Schannel on Windows. +- Bundle unsigned Fundamental package on Mac. + ### 1.1.2 (2019-07-20) - Add app notarization on Mac, which removes the "Apple cannot check for malicious software" message on launch. - Write stack trace to log.txt and display dialog box when Rack crashes. diff --git a/Makefile b/Makefile index d26c160e..f8f01b84 100644 --- a/Makefile +++ b/Makefile @@ -185,13 +185,13 @@ UPLOAD_URL := vortico@vcvrack.com:files/ upload: # This will only work if you have a private key to my server ifdef ARCH_MAC - rsync dist/*.zip $(UPLOAD_URL) -zP + rsync dist/Rack-$(VERSION)-$(ARCH).zip $(UPLOAD_URL) -zP endif ifdef ARCH_WIN - rsync dist/*.{exe,zip} $(UPLOAD_URL) -P + rsync dist/Rack-$(VERSION)-$(ARCH).zip Rack-$(VERSION)-$(ARCH).exe Rack-SDK-$(VERSION).zip $(UPLOAD_URL) -P endif ifdef ARCH_LIN - rsync dist/*.zip $(UPLOAD_URL) -zP + rsync dist/Rack-$(VERSION)-$(ARCH).zip $(UPLOAD_URL) -zP endif diff --git a/src/network.cpp b/src/network.cpp index 31c15069..ff84e2f7 100644 --- a/src/network.cpp +++ b/src/network.cpp @@ -13,7 +13,7 @@ static CURL *createCurl() { assert(curl); // curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, true); + // curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, true); std::string caPath = asset::system("cacert.pem"); curl_easy_setopt(curl, CURLOPT_CAINFO, caPath.c_str());