Bump libgit2 to 0.28.2

This allows dropping MbedTLS patches which have been upstreamed.
JuliaLang · Aug 6, 2019 · c3f5414 · c3f5414
1 parent e891bca
commit c3f5414
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 997 deletions.
diff --git a/deps/Versions.make b/deps/Versions.make
@@ -26,7 +26,7 @@ LIBSSH2_VER = 1.8.2
 LIBSSH2_BB_REL = 0
 CURL_VER = 7.61.0
 CURL_BB_REL = 1
-LIBGIT2_VER = 0.27.7
+LIBGIT2_VER = 0.28.2
 LIBGIT2_BB_REL = 1
 LIBUV_VER = 1.29.1
 LIBUV_BB_REL = 0

diff --git a/deps/libgit2.mk b/deps/libgit2.mk
@@ -44,24 +44,12 @@ endif
 
 LIBGIT2_SRC_PATH := $(SRCCACHE)/$(LIBGIT2_SRC_DIR)
 
-$(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied: $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted
-	cd $(LIBGIT2_SRC_PATH) && \
-		patch -p1 -f < $(SRCDIR)/patches/libgit2-mbedtls.patch
-	echo 1 > $@
-
-$(LIBGIT2_SRC_PATH)/libgit2-mbedtls2.patch-applied: $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted | $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied
-	cd $(LIBGIT2_SRC_PATH) && \
-		patch -p1 -f < $(SRCDIR)/patches/libgit2-mbedtls2.patch
-	echo 1 > $@
-
-$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted | $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied
+$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted
 	cd $(LIBGIT2_SRC_PATH) && \
 		patch -p1 -f < $(SRCDIR)/patches/libgit2-agent-nonfatal.patch
 	echo 1 > $@
 
 $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: \
-	$(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied \
-	$(LIBGIT2_SRC_PATH)/libgit2-mbedtls2.patch-applied \
 	$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied \
 
 $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/source-extracted

diff --git a/deps/libgit2.version b/deps/libgit2.version
@@ -1,2 +1,2 @@
-LIBGIT2_BRANCH=v0.27.7
-LIBGIT2_SHA1=f23dc5b29f1394928a940d7ec447f4bfd53dad1f
+LIBGIT2_BRANCH=v0.28.2
+LIBGIT2_SHA1=b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3