Add curl license and notices

Author: vicroms

NOTICE.txt

@@ -71,6 +71,35 @@ SOFTWARE.
 =========================================
 END OF CMakeRC NOTICES, INFORMATION, AND LICENSE
 
+curl
+
+%% curl NOTICES, INFORMATION, AND LICENSE BEGIN HERE
+=========================================
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (C) Daniel Stenberg, <[email protected]>, and many
+contributors, see the THANKS file.
+
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
+=========================================
+END OF curl NOTICES, INFORMATION, AND LICENSE
+
 The following third party software is incorporated into vcpkg-artifacts:
 
 ---------------------------------------------------------

cgmanifest.json

@@ -37,6 +37,19 @@
       },
       "DevelopmentDependency": false,
       "DependencyRoots": []
+    },
+    {
+      "Component": {
+        "Type": "other",
+        "other": {
+          "name": "curl",
+          "version": "8.17.0",
+          "downloadUrl": "https://github.com/curl/curl/archive/refs/tags/curl-8_17_0.tar.gz",
+          "hash": "88ab4b7aac12b26a6ad32fb0e1a9675288a45894438cb031102ef5d4ab6b33c2bc99cae0c70b71bdfa12eb49762827e2490555114c5eb4a6876b95e1f2a4eb74"
+        }
+      },
+      "DevelopmentDependency": false,
+      "DependencyRoots": []
     }
   ]
 }

cmake/FindLibCURL.cmake

@@ -18,14 +18,14 @@ endif()
 # Note that the SHA512 is the same, so vcpkg-tool contributors need not be concerned that we built
 # with different content.
 if(NOT VCPKG_LIBCURL_URL)
-    set(VCPKG_LIBCURL_URL "https://github.com/curl/curl/archive/refs/tags/curl-8_8_0.tar.gz")
+    set(VCPKG_LIBCURL_URL "https://github.com/curl/curl/releases/download/curl-8_17_0/curl-8.17.0.tar.gz")
 endif()
 
 include(FetchContent)
 FetchContent_Declare(
     LibCURL
     URL "${VCPKG_LIBCURL_URL}"
-    URL_HASH "SHA512=e66cbf9bd3ae7b9b031475210b80b883b6a133042fbbc7cf2413f399d1b38aa54ab7322626abd3c6f1af56e0d540221f618aa903bd6b463ac8324f2c4e92dfa8"
+    URL_HASH "SHA512=88ab4b7aac12b26a6ad32fb0e1a9675288a45894438cb031102ef5d4ab6b33c2bc99cae0c70b71bdfa12eb49762827e2490555114c5eb4a6876b95e1f2a4eb74"
 )
 
 if(NOT LibCURL_FIND_REQUIRED)
@@ -34,36 +34,46 @@ endif()
 
 # This is in function() so no need to backup the variables
 function(get_libcurl)
-    set(BUILD_SHARED_LIBS OFF)
     set(BUILD_CURL_EXE OFF)
-    set(CURL_ENABLE_EXPORT_TARGET OFF)
-    set(ENABLE_UNICODE ON)
     set(BUILD_LIBCURL_DOCS  OFF)
     set(BUILD_MISC_DOCS OFF)
+    set(BUILD_SHARED_LIBS OFF)
+    set(CURL_ENABLE_EXPORT_TARGET OFF)
+    set(CURL_USE_LIBSSH2 OFF)
+    set(CURL_USE_LIBPSL OFF)
+    if (WIN32)
+        set(CURL_USE_SCHANNEL ON)
+    endif()
     set(ENABLE_CURL_MANUAL OFF)
+    set(ENABLE_UNICODE ON)
     set(PICKY_COMPILER OFF)
+    set(USE_NGHTTP2 OFF)
+    set(USE_LIBIDN2 OFF)
     set(CMAKE_DISABLE_FIND_PACKAGE_Perl ON)
     set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB ON)
     set(CMAKE_DISABLE_FIND_PACKAGE_LibPSL ON)
     set(CMAKE_DISABLE_FIND_PACKAGE_LibSSH2 ON)
+    set(CMAKE_DISABLE_FIND_PACKAGE_Brotli ON)
+    set(CMAKE_DISABLE_FIND_PACKAGE_Zstd ON)
+    set(CMAKE_DISABLE_FIND_PACKAGE_NGHTTP2 ON)
+    set(CMAKE_DISABLE_FIND_PACKAGE_Libidn2 ON)
     if(MSVC)
         string(APPEND CMAKE_C_FLAGS " /wd6101")
         string(APPEND CMAKE_C_FLAGS " /wd6011")
         string(APPEND CMAKE_C_FLAGS " /wd6054")
-        string(APPEND CMAKE_C_FLAGS " /wd6240")
-        string(APPEND CMAKE_C_FLAGS " /wd6239")
+        #string(APPEND CMAKE_C_FLAGS " /wd6240")
+        #string(APPEND CMAKE_C_FLAGS " /wd6239")
+        string(APPEND CMAKE_C_FLAGS " /wd6287")
         string(APPEND CMAKE_C_FLAGS " /wd6323")
+        string(APPEND CMAKE_C_FLAGS " /wd6385")
         string(APPEND CMAKE_C_FLAGS " /wd6387")
         string(APPEND CMAKE_C_FLAGS " /wd28182")
-        string(APPEND CMAKE_C_FLAGS " /wd28183")
+        #string(APPEND CMAKE_C_FLAGS " /wd28183")
         string(APPEND CMAKE_C_FLAGS " /wd28251")
         string(APPEND CMAKE_C_FLAGS " /wd28301")
     else()
         string(APPEND CMAKE_C_FLAGS " -Wno-error")
     endif()
-    if (WIN32)
-        set(CURL_USE_SCHANNEL ON)
-    endif()
     FetchContent_MakeAvailable(LibCURL)
 endfunction()
 

src/vcpkg/base/downloads.cpp

@@ -145,7 +145,7 @@ namespace vcpkg
         auto machine_readable_progress = static_cast<MessageSink*>(clientp);
         if (dltotal && machine_readable_progress)
         {
-            double percentage = (static_cast<double>(dlnow) / static_cast<double>(dltotal)) * 100.0;
+            double percentage = static_cast<double>(dlnow) / static_cast<double>(dltotal) * 100.0;
             machine_readable_progress->println(LocalizedString::from_raw(fmt::format("{:.2f}%", percentage)));
         }
         return 0;