Bug#35897778: Upgrade to CURL 8.4.0 [patches]

The cmake option -DWITH_CURL=bundled is now supported on all
platforms.

Set the default value of WITH_CURL to "bundled" rather than "none" on
Windows.

Update CURL_VERSION_DIR

Set options in extra/curl/CMakeLists.txt
 - PICKY_COMPILER    OFF
 - BUILD_SHARED_LIBS OFF
 - BUILD_STATIC_LIBS OFF
 - SHARE_LIB_OBJECT  OFF

Disable in curl cmake files:
 - CMAKE_DEBUG_POSTFIX
 - find_package(OpenSSL)
 - Do not add "/MP" for clang on Windows
 - install(...)

Enable in curl cmake files:
 - Keep the FILE protocol for HTTP_ONLY

Add comments about 'libcurl' and 'libcurl_static'

Remove obsolete INCLUDE_DIRECTORIES and LINK_DIRECTORIES
from extra/curl/CMakeLists.

Change-Id: I3abe7bf8da5720df4705109def7b637fbf7e5923

Author: Tor Didriksen

CMakeLists.txt

@@ -976,9 +976,12 @@ OPTION(WITH_AUTHENTICATION_CLIENT_PLUGINS
   "Build client-side authentication plugins, even if server-side are disabled"
   ${WITH_AUTHENTICATION_CLIENT_PLUGINS_DEFAULT})
 
-# On windows we need a non-standard package for CURL.
-IF(WITH_INTERNAL AND UNIX)
-  SET(WITH_CURL_DEFAULT "system")
+IF(WITH_INTERNAL)
+  IF(UNIX)
+    SET(WITH_CURL_DEFAULT "system")
+  ELSE()
+    SET(WITH_CURL_DEFAULT "bundled")
+  ENDIF()
 ELSE()
   SET(WITH_CURL_DEFAULT "none")
 ENDIF()

cmake/curl.cmake

@@ -124,12 +124,12 @@ FUNCTION(FIND_SYSTEM_CURL ARG_CURL_INCLUDE_DIR)
   ENDIF()
 ENDFUNCTION(FIND_SYSTEM_CURL)
 
-SET(CURL_VERSION_DIR "curl-8.2.1")
+SET(CURL_VERSION_DIR "curl-8.4.0")
 FUNCTION(MYSQL_USE_BUNDLED_CURL CURL_INCLUDE_DIR)
   SET(WITH_CURL "bundled" CACHE STRING "Bundled curl library")
   ADD_SUBDIRECTORY(extra/curl)
   SET(CURL_FOUND ON CACHE INTERNAL "")
-  SET(CURL_LIBRARY libcurl)
+  SET(CURL_LIBRARY libcurl) # libcurl is an alias for libcurl_static
   SET(CURL_INCLUDE_DIR
     ${CMAKE_SOURCE_DIR}/extra/curl/${CURL_VERSION_DIR}/include)
   SET(CURL_INCLUDE_DIR ${CURL_INCLUDE_DIR} PARENT_SCOPE)

extra/curl/CMakeLists.txt

@@ -20,14 +20,20 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-
-INCLUDE_DIRECTORIES(BEFORE SYSTEM ${ZSTD_INCLUDE_DIR})
-LINK_DIRECTORIES(BEFORE ${OPENSSL_LIB_DIR})
-
 SET(BUILD_CURL_EXE OFF)
 SET(BUILD_CURL_EXE OFF CACHE INTERNAL "" FORCE)
 
+SET(PICKY_COMPILER OFF)
+SET(PICKY_COMPILER OFF CACHE INTERNAL "" FORCE)
+
 SET(BUILD_SHARED_LIBS OFF)
+SET(BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE)
+
+SET(BUILD_STATIC_LIBS ON)
+SET(BUILD_STATIC_LIBS ON CACHE INTERNAL "" FORCE)
+
+SET(SHARE_LIB_OBJECT OFF)
+SET(SHARE_LIB_OBJECT OFF CACHE INTERNAL "" FORCE)
 
 SET(BUILD_TESTING OFF)
 SET(BUILD_TESTING OFF CACHE INTERNAL "" FORCE)
@@ -57,6 +63,11 @@ IF(UNIX)
   STRING_APPEND(CMAKE_CXX_FLAGS " -fvisibility=hidden")
 ENDIF()
 
+MY_CHECK_CXX_COMPILER_WARNING("format-overflow" HAS_WARN_FLAG)
+IF(HAS_WARN_FLAG)
+  STRING_APPEND(CMAKE_C_FLAGS   " ${HAS_WARN_FLAG}")
+ENDIF()
+
 # Xcode >= 14 makes noise about sprintf.
 IF(APPLE)
   STRING_APPEND(CMAKE_C_FLAGS " -Wno-deprecated-declarations")

extra/curl/curl-8.4.0/CMakeLists.txt

@@ -60,7 +60,7 @@
 # to ON or OFF), the symbol detection will be skipped.  If the
 # variable is NOT DEFINED, the symbol detection will be performed.
 
-cmake_minimum_required(VERSION 3.7...3.16 FATAL_ERROR)
+# cmake_minimum_required(VERSION 3.7...3.16 FATAL_ERROR)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
 include(Utilities)
@@ -144,7 +144,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")
@@ -273,7 +273,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)
@@ -473,7 +473,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)
 
@@ -1420,7 +1420,7 @@ if(MSVC)
   endif()
 
   # Use multithreaded compilation on VS 2008+
-  if(MSVC_VERSION GREATER_EQUAL 1500)
+  if(MSVC_VERSION GREATER_EQUAL 1500 AND NOT WIN32_CLANG)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
   endif()
 endif()
@@ -1673,7 +1673,7 @@ set(VERSIONNUM              "${CURL_VERSION_NUM}")
 # * ENABLE_STATIC
 configure_file("${CURL_SOURCE_DIR}/curl-config.in"
                "${CURL_BINARY_DIR}/curl-config" @ONLY)
-install(FILES "${CURL_BINARY_DIR}/curl-config"
+do_not_install(FILES "${CURL_BINARY_DIR}/curl-config"
         DESTINATION ${CMAKE_INSTALL_BINDIR}
         PERMISSIONS
           OWNER_READ OWNER_WRITE OWNER_EXECUTE
@@ -1683,11 +1683,11 @@ install(FILES "${CURL_BINARY_DIR}/curl-config"
 # Finally generate a pkg-config file matching this config
 configure_file("${CURL_SOURCE_DIR}/libcurl.pc.in"
                "${CURL_BINARY_DIR}/libcurl.pc" @ONLY)
-install(FILES "${CURL_BINARY_DIR}/libcurl.pc"
+do_not_install(FILES "${CURL_BINARY_DIR}/libcurl.pc"
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # install headers
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/curl"
+do_not_install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/curl"
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h")
 
@@ -1716,14 +1716,14 @@ configure_package_config_file(CMake/curl-config.cmake.in
 )
 
 if(CURL_ENABLE_EXPORT_TARGET)
-  install(
+  do_not_install(
           EXPORT "${TARGETS_EXPORT_NAME}"
           NAMESPACE "${PROJECT_NAME}::"
           DESTINATION ${CURL_INSTALL_CMAKE_DIR}
   )
 endif()
 
-install(
+do_not_install(
         FILES ${version_config} ${project_config}
         DESTINATION ${CURL_INSTALL_CMAKE_DIR}
 )

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

@@ -207,6 +207,7 @@ if(BUILD_SHARED_LIBS)
     $<BUILD_INTERFACE:${CURL_SOURCE_DIR}/include>)
 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})