Merging upstream version 1.8.1+ds.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 87 insertions, 28 deletions

diff --git a/cmake/FindIconv.cmake b/cmake/FindIntlIconv.cmake
index 9e6ded9..9e6ded9 100644
--- a/cmake/FindIconv.cmake
+++ b/cmake/FindIntlIconv.cmake
diff --git a/cmake/FindLLHTTP.cmake b/cmake/FindLLHTTP.cmake
new file mode 100644
index 0000000..a87d335
--- /dev/null
+++ b/cmake/FindLLHTTP.cmake
@@ -0,0 +1,39 @@
+# - Try to find llhttp
+#
+# Defines the following variables:
+#
+# LLHTTP_FOUND - system has llhttp
+# LLHTTP_INCLUDE_DIR - the llhttp include directory
+# LLHTTP_LIBRARIES - Link these to use llhttp
+# LLHTTP_VERSION_MAJOR - major version
+# LLHTTP_VERSION_MINOR - minor version
+# LLHTTP_VERSION_STRING - the version of llhttp found
+
+# Find the header and library
+find_path(LLHTTP_INCLUDE_DIR NAMES llhttp.h)
+find_library(LLHTTP_LIBRARY NAMES llhttp libllhttp)
+
+# Found the header, read version
+if(LLHTTP_INCLUDE_DIR AND EXISTS "${LLHTTP_INCLUDE_DIR}/llhttp.h")
+	file(READ "${LLHTTP_INCLUDE_DIR}/llhttp.h" LLHTTP_H)
+	if(LLHTTP_H)
+		string(REGEX REPLACE ".*#define[\t ]+LLHTTP_VERSION_MAJOR[\t ]+([0-9]+).*" "\\1" LLHTTP_VERSION_MAJOR "${LLHTTP_H}")
+		string(REGEX REPLACE ".*#define[\t ]+LLHTTP_VERSION_MINOR[\t ]+([0-9]+).*" "\\1" LLHTTP_VERSION_MINOR "${LLHTTP_H}")
+		set(LLHTTP_VERSION_STRING "${LLHTTP_VERSION_MAJOR}.${LLHTTP_VERSION_MINOR}")
+	endif()
+	unset(LLHTTP_H)
+endif()
+
+# Handle the QUIETLY and REQUIRED arguments and set LLHTTP_FOUND
+# to TRUE if all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LLHTTP REQUIRED_VARS LLHTTP_INCLUDE_DIR LLHTTP_LIBRARY)
+
+# Hide advanced variables
+mark_as_advanced(LLHTTP_INCLUDE_DIR LLHTTP_LIBRARY)
+
+# Set standard variables
+if(LLHTTP_FOUND)
+	set(LLHTTP_LIBRARIES ${LLHTTP_LIBRARY})
+	set(LLHTTP_INCLUDE_DIRS ${LLHTTP_INCLUDE_DIR})
+endif()
diff --git a/cmake/SelectHTTPParser.cmake b/cmake/SelectHTTPParser.cmake
index 955aea3..4fc1f69 100644
--- a/cmake/SelectHTTPParser.cmake
+++ b/cmake/SelectHTTPParser.cmake
@@ -1,19 +1,32 @@
 # Optional external dependency: http-parser
-if(USE_HTTP_PARSER STREQUAL "system")
+if(USE_HTTP_PARSER STREQUAL "http-parser")
 	find_package(HTTPParser)
 
 	if(HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2)
 		list(APPEND LIBGIT2_SYSTEM_INCLUDES ${HTTP_PARSER_INCLUDE_DIRS})
 		list(APPEND LIBGIT2_SYSTEM_LIBS ${HTTP_PARSER_LIBRARIES})
 		list(APPEND LIBGIT2_PC_LIBS "-lhttp_parser")
-		add_feature_info(http-parser ON "http-parser support (system)")
+		set(GIT_HTTPPARSER_HTTPPARSER 1)
+		add_feature_info(http-parser ON "using http-parser (system)")
 	else()
 		message(FATAL_ERROR "http-parser support was requested but not found")
 	endif()
+elseif(USE_HTTP_PARSER STREQUAL "llhttp")
+	find_package(LLHTTP)
+
+	if(LLHTTP_FOUND AND LLHTTP_VERSION_MAJOR EQUAL 9)
+		list(APPEND LIBGIT2_SYSTEM_INCLUDES ${LLHTTP_INCLUDE_DIRS})
+		list(APPEND LIBGIT2_SYSTEM_LIBS ${LLHTTP_LIBRARIES})
+		list(APPEND LIBGIT2_PC_LIBS "-lllhttp")
+		set(GIT_HTTPPARSER_LLHTTP 1)
+		add_feature_info(http-parser ON "using llhttp (system)")
+	else()
+		message(FATAL_ERROR "llhttp support was requested but not found")
+	endif()
 else()
-	message(STATUS "http-parser version 2 was not found or disabled; using bundled 3rd-party sources.")
-	add_subdirectory("${PROJECT_SOURCE_DIR}/deps/http-parser" "${PROJECT_BINARY_DIR}/deps/http-parser")
-	list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${PROJECT_SOURCE_DIR}/deps/http-parser")
-	list(APPEND LIBGIT2_DEPENDENCY_OBJECTS "$<TARGET_OBJECTS:http-parser>")
-	add_feature_info(http-parser ON "http-parser support (bundled)")
+	add_subdirectory("${PROJECT_SOURCE_DIR}/deps/llhttp" "${PROJECT_BINARY_DIR}/deps/llhttp")
+	list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${PROJECT_SOURCE_DIR}/deps/llhttp")
+	list(APPEND LIBGIT2_DEPENDENCY_OBJECTS "$<TARGET_OBJECTS:llhttp>")
+	set(GIT_HTTPPARSER_BUILTIN 1)
+	add_feature_info(http-parser ON "using bundled parser")
 endif()
diff --git a/cmake/SelectHTTPSBackend.cmake b/cmake/SelectHTTPSBackend.cmake
index d149416..d293001 100644
--- a/cmake/SelectHTTPSBackend.cmake
+++ b/cmake/SelectHTTPSBackend.cmake
@@ -55,6 +55,10 @@ if(USE_HTTPS)
 		set(GIT_OPENSSL 1)
 		list(APPEND LIBGIT2_SYSTEM_INCLUDES ${OPENSSL_INCLUDE_DIR})
 		list(APPEND LIBGIT2_SYSTEM_LIBS ${OPENSSL_LIBRARIES})
+		# Static OpenSSL (lib crypto.a) requires libdl, include it explicitly
+		if(LINK_WITH_STATIC_LIBRARIES STREQUAL ON)
+			list(APPEND LIBGIT2_SYSTEM_LIBS ${CMAKE_DL_LIBS})
+		endif()
 		list(APPEND LIBGIT2_PC_LIBS ${OPENSSL_LDFLAGS})
 		list(APPEND LIBGIT2_PC_REQUIRES "openssl")
 	elseif(USE_HTTPS STREQUAL "mbedTLS")
@@ -109,8 +113,8 @@ if(USE_HTTPS)
 	elseif(USE_HTTPS STREQUAL "Schannel")
 		set(GIT_SCHANNEL 1)
 
-		list(APPEND LIBGIT2_SYSTEM_LIBS "rpcrt4" "crypt32" "ole32" "secur32")
-		list(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcrypt32" "-lole32" "-lsecur32")
+		list(APPEND LIBGIT2_SYSTEM_LIBS "rpcrt4" "crypt32" "ole32")
+		list(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcrypt32" "-lole32")
 	elseif(USE_HTTPS STREQUAL "WinHTTP")
 		set(GIT_WINHTTP 1)
 
@@ -125,8 +129,8 @@ if(USE_HTTPS)
 			list(APPEND LIBGIT2_PC_LIBS "-lwinhttp")
 		endif()
 
-		list(APPEND LIBGIT2_SYSTEM_LIBS "rpcrt4" "crypt32" "ole32" "secur32")
-		list(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcrypt32" "-lole32" "-lsecur32")
+		list(APPEND LIBGIT2_SYSTEM_LIBS "rpcrt4" "crypt32" "ole32")
+		list(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcrypt32" "-lole32")
 	elseif(USE_HTTPS STREQUAL "OpenSSL-Dynamic")
 		set(GIT_OPENSSL 1)
 		set(GIT_OPENSSL_DYNAMIC 1)
diff --git a/cmake/SelectSSH.cmake b/cmake/SelectSSH.cmake
index 23dfc97..079857f 100644
--- a/cmake/SelectSSH.cmake
+++ b/cmake/SelectSSH.cmake
@@ -1,6 +1,11 @@
-# Optional external dependency: libssh2
-if(USE_SSH)
+if(USE_SSH STREQUAL "exec")
+	set(GIT_SSH 1)
+	set(GIT_SSH_EXEC 1)
+
+	add_feature_info(SSH ON "using OpenSSH exec support")
+elseif(USE_SSH STREQUAL ON OR USE_SSH STREQUAL "libssh2")
 	find_pkglibraries(LIBSSH2 libssh2)
+
 	if(NOT LIBSSH2_FOUND)
 		find_package(LibSSH2)
 		set(LIBSSH2_INCLUDE_DIRS ${LIBSSH2_INCLUDE_DIR})
@@ -12,30 +17,28 @@ if(USE_SSH)
 	if(NOT LIBSSH2_FOUND)
 		message(FATAL_ERROR "LIBSSH2 not found. Set CMAKE_PREFIX_PATH if it is installed outside of the default search path.")
 	endif()
-endif()
 
-if(LIBSSH2_FOUND)
-	set(GIT_SSH 1)
 	list(APPEND LIBGIT2_SYSTEM_INCLUDES ${LIBSSH2_INCLUDE_DIRS})
 	list(APPEND LIBGIT2_SYSTEM_LIBS ${LIBSSH2_LIBRARIES})
 	list(APPEND LIBGIT2_PC_LIBS ${LIBSSH2_LDFLAGS})
 
 	check_library_exists("${LIBSSH2_LIBRARIES}" libssh2_userauth_publickey_frommemory "${LIBSSH2_LIBRARY_DIRS}" HAVE_LIBSSH2_MEMORY_CREDENTIALS)
 	if(HAVE_LIBSSH2_MEMORY_CREDENTIALS)
-		set(GIT_SSH_MEMORY_CREDENTIALS 1)
+		set(GIT_SSH_LIBSSH2_MEMORY_CREDENTIALS 1)
 	endif()
-else()
-	message(STATUS "LIBSSH2 not found. Set CMAKE_PREFIX_PATH if it is installed outside of the default search path.")
-endif()
 
-if(WIN32 AND EMBED_SSH_PATH)
-	file(GLOB SSH_SRC "${EMBED_SSH_PATH}/src/*.c")
-	list(SORT SSH_SRC)
-	list(APPEND LIBGIT2_DEPENDENCY_OBJECTS ${SSH_SRC})
+	if(WIN32 AND EMBED_SSH_PATH)
+		file(GLOB SSH_SRC "${EMBED_SSH_PATH}/src/*.c")
+		list(SORT SSH_SRC)
+		list(APPEND LIBGIT2_DEPENDENCY_OBJECTS ${SSH_SRC})
+
+		list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${EMBED_SSH_PATH}/include")
+		file(WRITE "${EMBED_SSH_PATH}/src/libssh2_config.h" "#define HAVE_WINCNG\n#define LIBSSH2_WINCNG\n#include \"../win32/libssh2_config.h\"")
+	endif()
 
-	list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${EMBED_SSH_PATH}/include")
-	file(WRITE "${EMBED_SSH_PATH}/src/libssh2_config.h" "#define HAVE_WINCNG\n#define LIBSSH2_WINCNG\n#include \"../win32/libssh2_config.h\"")
 	set(GIT_SSH 1)
+	set(GIT_SSH_LIBSSH2 1)
+	add_feature_info(SSH ON "using libssh2")
+else()
+	add_feature_info(SSH OFF "SSH transport support")
 endif()
-
-add_feature_info(SSH GIT_SSH "SSH transport support")