Skip to content

Commit d0b5d98

Browse files
authored
Bump libgit2 to 0.28.2 (JuliaLang#32806)
This allows dropping MbedTLS patches which have been upstreamed. The order in which configuration options are returned has changed, making a test fail: make the code more robust by giving priority to more specific options over global ones.
1 parent 9156082 commit d0b5d98

File tree

6 files changed

+12
-1000
lines changed

6 files changed

+12
-1000
lines changed

deps/Versions.make

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ LIBSSH2_VER = 1.8.2
2626
LIBSSH2_BB_REL = 0
2727
CURL_VER = 7.61.0
2828
CURL_BB_REL = 1
29-
LIBGIT2_VER = 0.27.7
30-
LIBGIT2_BB_REL = 1
29+
LIBGIT2_VER = 0.28.2
30+
LIBGIT2_BB_REL = 0
3131
LIBUV_VER = 1.29.1
3232
LIBUV_BB_REL = 0
3333
OBJCONV_VER = 2.49.0

deps/libgit2.mk

+2-14
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,12 @@ endif
4444

4545
LIBGIT2_SRC_PATH := $(SRCCACHE)/$(LIBGIT2_SRC_DIR)
4646

47-
$(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied: $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted
48-
cd $(LIBGIT2_SRC_PATH) && \
49-
patch -p1 -f < $(SRCDIR)/patches/libgit2-mbedtls.patch
50-
echo 1 > $@
51-
52-
$(LIBGIT2_SRC_PATH)/libgit2-mbedtls2.patch-applied: $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted | $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied
53-
cd $(LIBGIT2_SRC_PATH) && \
54-
patch -p1 -f < $(SRCDIR)/patches/libgit2-mbedtls2.patch
55-
echo 1 > $@
56-
57-
$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted | $(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied
47+
$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted
5848
cd $(LIBGIT2_SRC_PATH) && \
5949
patch -p1 -f < $(SRCDIR)/patches/libgit2-agent-nonfatal.patch
6050
echo 1 > $@
6151

6252
$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: \
63-
$(LIBGIT2_SRC_PATH)/libgit2-mbedtls.patch-applied \
64-
$(LIBGIT2_SRC_PATH)/libgit2-mbedtls2.patch-applied \
6553
$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied \
6654

6755
$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/source-extracted
@@ -109,7 +97,7 @@ $(build_prefix)/manifest/libgit2: $(build_datarootdir)/julia/cert.pem # use libg
10997

11098
else # USE_BINARYBUILDER_LIBGIT2
11199

112-
LIBGIT2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibGit2-v$(LIBGIT2_VER)-$(LIBGIT2_BB_REL)
100+
LIBGIT2_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibGit2-v$(LIBGIT2_VER)+$(LIBGIT2_BB_REL)
113101
LIBGIT2_BB_NAME := LibGit2.v$(LIBGIT2_VER)
114102
$(eval $(call bb-install,libgit2,LIBGIT2,false))
115103

deps/libgit2.version

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LIBGIT2_BRANCH=v0.27.7
2-
LIBGIT2_SHA1=f23dc5b29f1394928a940d7ec447f4bfd53dad1f
1+
LIBGIT2_BRANCH=v0.28.2
2+
LIBGIT2_SHA1=b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3

0 commit comments

Comments
 (0)