@@ 0,0 1,49 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Mon, 11 Apr 2017 3:23:00 +0200
+Subject: [PATCH] Build both static and dynamic library
+
+This is very hack-ish, it makes option BUILD_SHARED_LIBS unusable.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,7 +39,6 @@
+ # Build options
+ #
+ OPTION( SONAME				"Set the (SO)VERSION of the target"		ON  )
+-OPTION( BUILD_SHARED_LIBS	"Build Shared Library (OFF for Static)"	ON  )
+ OPTION( THREADSAFE			"Build libgit2 as threadsafe"			ON )
+ OPTION( BUILD_CLAR			"Build Tests using the Clar suite"		ON  )
+ OPTION( BUILD_EXAMPLES		"Build library usage example apps"		OFF )
+@@ -58,6 +57,8 @@
+ OPTION( DEBUG_POOL			"Enable debug pool allocator"			OFF )
+ OPTION( ENABLE_WERROR			"Enable compilation with -Werror"		OFF )
+ OPTION( USE_BUNDLED_ZLIB    "Use the bundled version of zlib"       OFF )
++
++SET( BUILD_SHARED_LIBS ON )
+ 
+ IF (UNIX AND NOT APPLE)
+ 	OPTION( ENABLE_REPRODUCIBLE_BUILDS	"Enable reproducible builds" 			OFF )
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -407,9 +407,12 @@
+ ENDIF()
+ 
+ # Compile and link libgit2
+-ADD_LIBRARY(git2 ${WIN_RC} ${LIBGIT2_OBJECTS})
++ADD_LIBRARY(git2 SHARED ${WIN_RC} ${LIBGIT2_OBJECTS})
+ TARGET_LINK_LIBRARIES(git2 ${LIBGIT2_LIBS})
+ 
++ADD_LIBRARY(git2_static STATIC ${WIN_RC} ${LIBGIT2_OBJECTS})
++SET_TARGET_PROPERTIES(git2_static PROPERTIES OUTPUT_NAME git2 CLEAN_DIRECT_OUTPUT 1)
++
+ SET_TARGET_PROPERTIES(git2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
+ SET_TARGET_PROPERTIES(git2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
+ SET_TARGET_PROPERTIES(git2 PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
+@@ -445,7 +448,7 @@
+ ENDIF ()
+ 
+ # Install
+-INSTALL(TARGETS git2
++INSTALL(TARGETS git2 git2_static
+ 	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+ 	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ 	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}


@@ 0,0 1,57 @@
+From 5e88f13eaa8ca30439b496066f6c57e608e18c4e Mon Sep 17 00:00:00 2001
+From: Drew DeVault <sir@cmpwn.com>
+Date: Fri, 22 Mar 2019 23:56:10 -0400
+Subject: [PATCH] patch_parse.c: Handle CRLF in parse_header_start
+
+---
+ src/patch_parse.c  |  3 ++-
+ tests/diff/parse.c | 25 +++++++++++++++++++++++++
+ 2 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/src/patch_parse.c b/src/patch_parse.c
+index 647929fd5f..1182f19884 100644
+--- a/src/patch_parse.c
++++ b/src/patch_parse.c
+@@ -328,7 +328,8 @@ static int parse_header_start(git_patch_parsed *patch, git_patch_parse_ctx *ctx)
+ 	 * proceeed here. We then hope for the "---" and "+++" lines to fix that
+ 	 * for us.
+ 	 */
+-	if (!git_parse_ctx_contains(&ctx->parse_ctx, "\n", 1)) {
++	if (!git_parse_ctx_contains(&ctx->parse_ctx, "\n", 1)
++			&& !git_parse_ctx_contains(&ctx->parse_ctx, "\r\n", 2)) {
+ 		git_parse_advance_chars(&ctx->parse_ctx, ctx->parse_ctx.line_len - 1);
+ 
+ 		git__free(patch->header_old_path);
+diff --git a/tests/diff/parse.c b/tests/diff/parse.c
+index 9cdaa92fbc..927ee90d80 100644
+--- a/tests/diff/parse.c
++++ b/tests/diff/parse.c
+@@ -359,3 +359,28 @@ void test_diff_parse__lineinfo(void)
+ 	git_patch_free(patch);
+ 	git_diff_free(diff);
+ }
++
++void test_diff_parse__crlf(void)
++{
++	const char *text = "diff --git a/test-file b/test-file\r\n"
++	"new file mode 100644\r\n"
++	"index 0000000..af431f2 100644\r\n"
++	"--- /dev/null\r\n"
++	"+++ b/test-file\r\n"
++	"@@ -0,0 +1 @@\r\n"
++	"+a contents\r\n";
++
++	git_diff *diff;
++	git_patch *patch;
++	const git_diff_delta *delta;
++
++	cl_git_pass(git_diff_from_buffer(&diff, text, strlen(text)));
++	cl_git_pass(git_patch_from_diff(&patch, diff, 0));
++	delta = git_patch_get_delta(patch);
++
++	cl_assert_equal_s(delta->old_file.path, "test-file");
++	cl_assert_equal_s(delta->new_file.path, "test-file");
++
++	git_patch_free(patch);
++	git_diff_free(diff);
++}