Bug#37389565 CURL UPDATE TO AT LEAST 8.11.1 [patches]

 Update CURL_VERSION_DIR Changes to curl cmake files: - cmake_minimum_required - CMAKE_DEBUG_POSTFIX - Keep FILE protocol for HTTP_ONLY - find_package(OpenSSL) - optional_dependency(ZLIB) to reuse results from cmake/zlib.cmake - Do not add "/MP" for clang on Windows - Disable the ALIAS CURL::libcurl Change-Id: I3c7efaaaa9e5ed5e16eea38b90e69cd9811fc57a

Author: Tor Didriksen

cmake/curl.cmake

@@ -127,7 +127,7 @@ FUNCTION(FIND_SYSTEM_CURL ARG_CURL_INCLUDE_DIR)
  ENDIF()
 ENDFUNCTION(FIND_SYSTEM_CURL)
 
-SET(CURL_VERSION_DIR "curl-8.9.1")
+SET(CURL_VERSION_DIR "curl-8.11.1")
 FUNCTION(MYSQL_USE_BUNDLED_CURL CURL_INCLUDE_DIR)
  SET(WITH_CURL "bundled" CACHE STRING "Bundled curl library")
  ADD_SUBDIRECTORY(extra/curl)

extra/curl/curl-8.11.1/CMakeLists.txt

@@ -43,7 +43,7 @@
 # to ON or OFF), the symbol detection is skipped. If the variable is
 # NOT DEFINED, the symbol detection is performed.
 
-cmake_minimum_required(VERSION 3.7...3.16 FATAL_ERROR)
+# cmake_minimum_required(VERSION 3.7...3.16 FATAL_ERROR)
 message(STATUS "Using CMake version ${CMAKE_VERSION}")
 
 # Collect command-line arguments for buildinfo.txt.
@@ -243,7 +243,7 @@ endif()
 
 # For debug libs and exes, add "-d" postfix
 if(NOT DEFINED CMAKE_DEBUG_POSTFIX)
- set(CMAKE_DEBUG_POSTFIX "-d")
+# set(CMAKE_DEBUG_POSTFIX "-d")
 endif()
 
 set(LIB_STATIC "libcurl_static")
@@ -402,7 +402,7 @@ mark_as_advanced(HTTP_ONLY)
 
 if(HTTP_ONLY)
  set(CURL_DISABLE_DICT ON)
- set(CURL_DISABLE_FILE ON)
+# set(CURL_DISABLE_FILE ON) Keep the FILE protocol
  set(CURL_DISABLE_FTP ON)
  set(CURL_DISABLE_GOPHER ON)
  set(CURL_DISABLE_IMAP ON)
@@ -631,7 +631,7 @@ if(_use_core_foundation_and_core_services)
 endif()
 
 if(CURL_USE_OPENSSL)
- find_package(OpenSSL REQUIRED)
+# find_package(OpenSSL REQUIRED)
  set(_ssl_enabled ON)
  set(USE_OPENSSL ON)
 
@@ -773,7 +773,8 @@ endif()
 # and before calling openssl_check_symbol_exists().
 
 set(HAVE_LIBZ OFF)
-curl_dependency_option(ZLIB)
+# Use result from cmake/zlib.cmake
+# curl_dependency_option(ZLIB)
 if(ZLIB_FOUND)
  set(HAVE_LIBZ ON)
 
@@ -1823,7 +1824,7 @@ if(MSVC)
  endif()
 
  # Use multithreaded compilation on VS 2008+
- if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1500)
+ if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1500 AND NOT WIN32_CLANG)
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
  endif()
 endif()

extra/curl/curl-8.11.1/lib/CMakeLists.txt

@@ -264,8 +264,11 @@ if(BUILD_SHARED_LIBS)
  endif()
 endif()
 
+# Here we do: add_library(libcurl ALIAS libcurl_static})
 add_library(${LIB_NAME} ALIAS ${LIB_SELECTED})
-add_library(${PROJECT_NAME}::${LIB_NAME} ALIAS ${LIB_SELECTED})
+# Here we do: add_library(CURL::libcurl ALIAS libcurl_static)
+# Disable it, we want all projects to use ext::curl (alias curl_interface)
+# add_library(${PROJECT_NAME}::${LIB_NAME} ALIAS ${LIB_SELECTED})
 
 if(CURL_ENABLE_EXPORT_TARGET)
  if(BUILD_STATIC_LIBS)