From 267605f66b2e490018fd8425e0d0cb4bc40a3be9 Mon Sep 17 00:00:00 2001 From: Tyler Wanek Date: Fri, 8 Mar 2019 10:54:42 -0700 Subject: [PATCH 1/5] Use LibGit2 branch that still uses libcurl for proxy support --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index 97e4179a7..29dabfb49 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 97e4179a76b935a15589a44662ce54a0ce0f3026 +Subproject commit 29dabfb49f8b46c4a1b150e22e8579a9af74ac8c From 371b17f53f4ffd00634675c44efbc2aa01a8fc14 Mon Sep 17 00:00:00 2001 From: Ian Hattendorf Date: Thu, 7 Mar 2019 14:01:43 -0700 Subject: [PATCH 2/5] Remove registry and add curl to gyp --- vendor/libgit2.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index c6e72268b..8ecd8921b 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -174,8 +174,6 @@ "libgit2/src/streams/mbedtls.h", "libgit2/src/streams/openssl.c", "libgit2/src/streams/openssl.h", - "libgit2/src/streams/registry.c", - "libgit2/src/streams/registry.h", "libgit2/src/pack-objects.c", "libgit2/src/pack-objects.h", "libgit2/src/pack.c", @@ -229,6 +227,8 @@ "libgit2/src/sha1_lookup.h", "libgit2/src/signature.c", "libgit2/src/signature.h", + "libgit2/src/streams/curl.c", + "libgit2/src/streams/curl.h", "libgit2/src/streams/socket.c", "libgit2/src/streams/socket.h", "libgit2/src/sortedcache.c", From aebaf875ea0d5b46f0958831aae4fe70bd67f29b Mon Sep 17 00:00:00 2001 From: Steven King Jr Date: Thu, 7 Mar 2019 13:49:51 -0700 Subject: [PATCH 3/5] Add curl links back in --- generate/templates/templates/binding.gyp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp index 3d2d80a0d..309168da2 100644 --- a/generate/templates/templates/binding.gyp +++ b/generate/templates/templates/binding.gyp @@ -153,6 +153,13 @@ ] } ], + [ + "OS=='linux' or OS=='mac' or OS.endswith('bsd') or <(is_IBMi) == 1", { + "libraries": [ + " Date: Fri, 8 Mar 2019 09:57:05 -0700 Subject: [PATCH 4/5] Update libgit2.gyp for curl --- vendor/libgit2.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index 8ecd8921b..a3a2666f6 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -325,7 +325,12 @@ } }], ["OS=='mac' or OS=='linux' or OS.endswith('bsd') or <(is_IBMi) == 1", { + "cflags": [ + "-DGIT_CURL", + " Date: Wed, 20 Mar 2019 13:20:13 -0700 Subject: [PATCH 5/5] Bring in https://github.com/libgit2/libgit2/pull/5023 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index 29dabfb49..62e9d83f6 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 29dabfb49f8b46c4a1b150e22e8579a9af74ac8c +Subproject commit 62e9d83f6f7c54683ebbe8521d489da74d2931f6