Skip to content

Commit 37e0579

Browse files
IanButterworthIanButterworth
authored
[LibGit2_jll] Update to v1.5.0 (#47382)
1 parent 27201e5 commit 37e0579

File tree

10 files changed

+71
-76
lines changed

10 files changed

+71
-76
lines changed

‎deps/checksums/libgit2‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
LibGit2.v1.4.3+2.aarch64-apple-darwin.tar.gz/md5/df6f108f17778bafe0dec2db18a4a312
2-
LibGit2.v1.4.3+2.aarch64-apple-darwin.tar.gz/sha512/d9ad1f441fd705b8c91a9fbfd39e97a1fe84753a0435af67e19344476c390dd301ed53a138867cc61552a9d4f26e6bac9ddf5284354c5631312893eb828c0b27
3-
LibGit2.v1.4.3+2.aarch64-linux-gnu.tar.gz/md5/044f354966ea77f380eef9ec8093b13e
4-
LibGit2.v1.4.3+2.aarch64-linux-gnu.tar.gz/sha512/e6feef32df7a5ffff48a34afbba5efb02452406de756a411c5675de9434641f4678ba7a0bec849d0f74de0df089a9a3769eb4ce466570b976442ae217ea62509
5-
LibGit2.v1.4.3+2.aarch64-linux-musl.tar.gz/md5/d985b03be81552fff6f5d451319f6a23
6-
LibGit2.v1.4.3+2.aarch64-linux-musl.tar.gz/sha512/0d606b358010839c9ee1a25c557c347f6532f6cafad66b0ce8d28945d2d6c84745b245193765a168e3b0aec93fbd7f3bc1c80afffdc96fb18fbf27c8b340ae8c
7-
LibGit2.v1.4.3+2.armv6l-linux-gnueabihf.tar.gz/md5/b1c839415fcceb2b0c3c75606cbf3494
8-
LibGit2.v1.4.3+2.armv6l-linux-gnueabihf.tar.gz/sha512/92ffd4ad4ab754ddab7be786374a54fed97694714ac99cf93372829821540f78eaa071c974efddbb3bdb9ad7824a95a6b935bb19c222f402a407b7a36e162b94
9-
LibGit2.v1.4.3+2.armv6l-linux-musleabihf.tar.gz/md5/3cada4ec0a62e441169b0247f1b86daf
10-
LibGit2.v1.4.3+2.armv6l-linux-musleabihf.tar.gz/sha512/8ced3cad5b25370348ed68b932f03e0b67974d7a3fa973a954247cd783e9e2647adb4ced66e8dccd3918429dc5df0afbde2a28c979a5c6fe7b5d0b103f88ddb5
11-
LibGit2.v1.4.3+2.armv7l-linux-gnueabihf.tar.gz/md5/dc4b8c69e534beae8a7b31a990cecda7
12-
LibGit2.v1.4.3+2.armv7l-linux-gnueabihf.tar.gz/sha512/05327ba85893ff3aa478c35ea3e12ceddbca7e53d5714474bec640c9d613e362975e89569aa84cc713facdae90a0292b144fbdfd1a4c8a1f21ab6916b467e0a8
13-
LibGit2.v1.4.3+2.armv7l-linux-musleabihf.tar.gz/md5/8f9defcc523bf0a6ae6b1623e250fc8e
14-
LibGit2.v1.4.3+2.armv7l-linux-musleabihf.tar.gz/sha512/2770b6f969d23389724a2f4b14671fa1dcd4b344abd2a7c2a5c5bef7ffd06a95f262066d2541c1df39f1394efa66a1bef07e5a031f05b12397c997ce9d71d17d
15-
LibGit2.v1.4.3+2.i686-linux-gnu.tar.gz/md5/a014ce0eefc4371e77cec90ee073c78e
16-
LibGit2.v1.4.3+2.i686-linux-gnu.tar.gz/sha512/d762404b6554078af5e681a4b766d9586e6b1f40c1f297ec1f7a1f70b00a426dc6429ef781581c757754ee31f14b662a60d7b40fefc1106ff7dc79aeb734a2fd
17-
LibGit2.v1.4.3+2.i686-linux-musl.tar.gz/md5/ceb843d699ed19384c6a11c0cbf37ce5
18-
LibGit2.v1.4.3+2.i686-linux-musl.tar.gz/sha512/ba169256ae760543a5513d06f260a00c27e2907c72d545e74af10341e29a8376dc980d6b19603b8d73354df07a7e8c58fd9473513f93f742a77bcf863519570e
19-
LibGit2.v1.4.3+2.i686-w64-mingw32.tar.gz/md5/98fecb082adac2b6dcaa992c018f6def
20-
LibGit2.v1.4.3+2.i686-w64-mingw32.tar.gz/sha512/566fdd275e01f3756134d998879a8fba15ac779505f4e7524ea3928dbb52d2212579de2896659e497c56292d69f2f3f661c712ed483f09835b80854472c713df
21-
LibGit2.v1.4.3+2.powerpc64le-linux-gnu.tar.gz/md5/324fd370a11e082b5c1e61c9be2fbd01
22-
LibGit2.v1.4.3+2.powerpc64le-linux-gnu.tar.gz/sha512/983bbb9b0922da4120cf61ed62e310ba6b5bdf42c734632e0cb531fd2053ba6c90a5afcbe9c94568a14122ef0a1271e6c654236df903e9fc769e6a65be0ce6a0
23-
LibGit2.v1.4.3+2.x86_64-apple-darwin.tar.gz/md5/6abf91ca41140499ab280fcea01303e4
24-
LibGit2.v1.4.3+2.x86_64-apple-darwin.tar.gz/sha512/66cba364b542df5f443b6761cc037704cb1e99b883285fe0af17bed644e310b6cfb6ac09a4f7119f9baa5d96b79d2a365fa9a572b40b01210ad325bf1cdcc025
25-
LibGit2.v1.4.3+2.x86_64-linux-gnu.tar.gz/md5/ae8d8f3e916dd528b3f4368bf4a51ac4
26-
LibGit2.v1.4.3+2.x86_64-linux-gnu.tar.gz/sha512/f2235440df3ef9162b14de3d6ff06a7122e2884ef6b81f8493a475d2814dc7b41ec322f18ab11c8d04fccc7028f48b9bf7febf3b75141a43a77c57df25233887
27-
LibGit2.v1.4.3+2.x86_64-linux-musl.tar.gz/md5/98110121f786e127adef201b21e3a4f6
28-
LibGit2.v1.4.3+2.x86_64-linux-musl.tar.gz/sha512/d248d5a1691deb38752a71f768724a31527c2594cd9175411f7d3f5ba6e4248ecb3207859004316993a75668c7d9c35615a3e4578e874745d37cc33a66dddbdf
29-
LibGit2.v1.4.3+2.x86_64-unknown-freebsd.tar.gz/md5/985c14f55e2f9d7c2a00543f97e0195b
30-
LibGit2.v1.4.3+2.x86_64-unknown-freebsd.tar.gz/sha512/a7fd6adae3386ccf409f43c756fe806a1c31f75762e9c422dcc4a6a5ce237a8efa0e7606c88c3f6f684b795e81cd2d58c638043cb3bc9cfac37e29279c5d1705
31-
LibGit2.v1.4.3+2.x86_64-w64-mingw32.tar.gz/md5/d4fba0b0ccefb72b3e78f49a366e7170
32-
LibGit2.v1.4.3+2.x86_64-w64-mingw32.tar.gz/sha512/a0e6cd5ca6b6635f46aa9f565b75b45828dc2d1a7a0f4f00654f41bf293c67f66f213c0854a3ebe0d1f93d114cb26313dbf178ca6353ba2a441b6bf3ab0ca36f
33-
libgit2-465bbf88ea939a965fbcbade72870c61f815e457.tar.gz/md5/b91c544293f15b00acc04315eb38c2b5
34-
libgit2-465bbf88ea939a965fbcbade72870c61f815e457.tar.gz/sha512/ac1d47e6308ad7a7620b683fd56568390be49cd8120b475fd6617aed8e7635036fce7e99a50f2611d0adeff28082aa673292475c1782f4e9dec9fa7dde8f1e77
1+
LibGit2.v1.5.0+0.aarch64-apple-darwin.tar.gz/md5/5f575560537758eaabfed197150522f2
2+
LibGit2.v1.5.0+0.aarch64-apple-darwin.tar.gz/sha512/d45bfcd83b53b070df56651a203af93bffda6fc18648ede3464ee843afef40d0422015a090ce12c368311ced2a6dd97232aa66a67f9f9ecbd7accdc196710b7b
3+
LibGit2.v1.5.0+0.aarch64-linux-gnu.tar.gz/md5/3289b82c7d9630326f31545750b527d3
4+
LibGit2.v1.5.0+0.aarch64-linux-gnu.tar.gz/sha512/a372689a8fb4e4de1e5471de38a575ce6599337b1ef0f2dcd82cc38a96418d137a70bede08cb174ea7bf28bfc2bcce796ead997a16ac202c1cdb4e9d72cb0761
5+
LibGit2.v1.5.0+0.aarch64-linux-musl.tar.gz/md5/0065daae37337a285d386f91111762cb
6+
LibGit2.v1.5.0+0.aarch64-linux-musl.tar.gz/sha512/0a03d87d277ae38cb96e9919ab36d7e84c28f5fbc2a12e78b12f43d644cbfae7d0de16c68793bbbee402427320e33cf4c0991ae94d31744dbdaeb01eaec6e7f8
7+
LibGit2.v1.5.0+0.armv6l-linux-gnueabihf.tar.gz/md5/206b35c12c7b74d889f9921bddc2533f
8+
LibGit2.v1.5.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/77cfe91355ef6b6fba6ecd31a55315775bfc8979a796186589faefa4d633968165182c9f850cc95ad7f430a0315b6f4ff89d8a312ace2e6cbbe78769c79b3d59
9+
LibGit2.v1.5.0+0.armv6l-linux-musleabihf.tar.gz/md5/62d42706729884e725241917638c3cd7
10+
LibGit2.v1.5.0+0.armv6l-linux-musleabihf.tar.gz/sha512/3a755cf63ed2d77a96299c25fb30ca30f1bd4730014dd40e57cafc9fb94398e842bc0a374dbad92b903fc18764728b218a61bd70900f935b434bc1ba1a39f5d7
11+
LibGit2.v1.5.0+0.armv7l-linux-gnueabihf.tar.gz/md5/73be3724b3c5454ecb35b5b97eca0a1e
12+
LibGit2.v1.5.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/6d6997ce814b1a03815d5a88c72a6e245b23bfffc2ef65e1af4e46e08b1334210f0a2fa93f5027692dc304cf2da28dcb13ccf9ec0555d59a0acce528aa8e92e3
13+
LibGit2.v1.5.0+0.armv7l-linux-musleabihf.tar.gz/md5/1079b6442df39d34833e994d6226a19d
14+
LibGit2.v1.5.0+0.armv7l-linux-musleabihf.tar.gz/sha512/22ce4a0a51c62c64d6e13699b1f40444b8e2de27d37941dcd621cb74fab66ff0b7e6c033f9bd322d6f6b3c62ba7167435831cd176f20363989241fc8419d6ab1
15+
LibGit2.v1.5.0+0.i686-linux-gnu.tar.gz/md5/31b884586178e6e6d4e50643bd9f8744
16+
LibGit2.v1.5.0+0.i686-linux-gnu.tar.gz/sha512/ab9e2ec37a873f9e524ea49c4c950d7fe35958c3d57bb31a490342fc9bbe7e0c011988b9ded6f83ef27c43cfe5889d6e71d38f19b93d2a8158f1a73b6ad6216a
17+
LibGit2.v1.5.0+0.i686-linux-musl.tar.gz/md5/e61eab07cf5d62040c3acdbc4c440e11
18+
LibGit2.v1.5.0+0.i686-linux-musl.tar.gz/sha512/4db59ba774924129348516ba003d323eec5682e6551317262c45c001a93884073868095265ec855c6d5a30a3133671f9f98778a241f88afb3497eaf3c2e97207
19+
LibGit2.v1.5.0+0.i686-w64-mingw32.tar.gz/md5/89f30c8921e9824947d3ec9b28de18df
20+
LibGit2.v1.5.0+0.i686-w64-mingw32.tar.gz/sha512/1f2dc875211cca7389a46c2de64a8d1ec9da27abf2db4c29c74ecb77fba87f0b425405bc5a1305b78aa44ae7b69d2dd9d0616b19e466a605d5badd326f1c77b7
21+
LibGit2.v1.5.0+0.powerpc64le-linux-gnu.tar.gz/md5/81236a312ee2038b263af61e73d35f16
22+
LibGit2.v1.5.0+0.powerpc64le-linux-gnu.tar.gz/sha512/1c505bbb6123c11d5290a88067ba5aff9f968b625d2c7fdbdfde1bf266f944944740e3361d52d7bf1a454c1505efafc149d75b3b35a0a2f9fc67a987d4cb56d3
23+
LibGit2.v1.5.0+0.x86_64-apple-darwin.tar.gz/md5/161a85ab99736885d7e5e0b2d3ffb998
24+
LibGit2.v1.5.0+0.x86_64-apple-darwin.tar.gz/sha512/a834c96dd9874a741b0c23fb739bd22baacc738e3781a63ada300ff9152d3ebae8fa14936eba74dcec97e7d3a38a10fcd1d4653bb2e5778377777e941502ac43
25+
LibGit2.v1.5.0+0.x86_64-linux-gnu.tar.gz/md5/3d68f5aba6424f06ae38a801ea55d209
26+
LibGit2.v1.5.0+0.x86_64-linux-gnu.tar.gz/sha512/9192d258c8d53a696d1a4cdc40e5c636f87c3028cf595f53e81058f5f87e79be50a66ed5ee0f9c82702953798e922b4600f89396e3c82ebefe3c977176446d39
27+
LibGit2.v1.5.0+0.x86_64-linux-musl.tar.gz/md5/0d3f098533f8c957b19888f2ab812860
28+
LibGit2.v1.5.0+0.x86_64-linux-musl.tar.gz/sha512/7bca75e710fc7c85eb45b1b0856ca579b3ddf21547bcae7f7e2806cd9858401a5d0e6f42c527aa0662f6d4975f4180eee8d8c21fb902ed75293a10f39886664c
29+
LibGit2.v1.5.0+0.x86_64-unknown-freebsd.tar.gz/md5/048b556cb384247b5fdec1600766a961
30+
LibGit2.v1.5.0+0.x86_64-unknown-freebsd.tar.gz/sha512/ab8d61532f9cc48691a66c27304681ae117a23fb304d71d7b7871cb13f745fa0655571a5e2272a69700a0f891f89db6fb772001adb2ce0ff8e76489adf237431
31+
LibGit2.v1.5.0+0.x86_64-w64-mingw32.tar.gz/md5/6935ad40b3e8da82be37d2cc700931ff
32+
LibGit2.v1.5.0+0.x86_64-w64-mingw32.tar.gz/sha512/b0771866c08b1ecfead9dd7209a7e46d8eda44c55131e347e91f8ebc2b13f918c5c9b70b41c1d1a867ae7168d31fccfc69fdea830b8067f9bc4797282b89b842
33+
libgit2-fbea439d4b6fc91c6b619d01b85ab3b7746e4c19.tar.gz/md5/b76d9e4cd2d5fa636143ce9252a6eb3e
34+
libgit2-fbea439d4b6fc91c6b619d01b85ab3b7746e4c19.tar.gz/sha512/97ce3066cd7de077c3ccf0921a29afb20250b354ab02d3ced4a80ed2a294784e07933072ce8f819c3ef8200249d0a7ea8b500957ace498ef64e9a072c92782fc

‎deps/libgit2.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ $(LIBGIT2_SRC_PATH)/libgit2-hostkey.patch-applied: $(LIBGIT2_SRC_PATH)/libgit2-a
4545
patch -p1 -f < $(SRCDIR)/patches/libgit2-hostkey.patch
4646
echo 1 > $@
4747

48-
$(LIBGIT2_SRC_PATH)/libgit2-win32-ownership.patch-applied: $(LIBGIT2_SRC_PATH)/libgit2-hostkey.patch-applied
48+
$(LIBGIT2_SRC_PATH)/libgit2-lowercase-windows-h.patch-applied: $(LIBGIT2_SRC_PATH)/libgit2-hostkey.patch-applied
4949
cd $(LIBGIT2_SRC_PATH) && \
50-
patch -p1 -f < $(SRCDIR)/patches/libgit2-win32-ownership.patch
50+
patch -p1 -f < $(SRCDIR)/patches/libgit2-lowercase-windows-h.patch
5151
echo 1 > $@
5252

53-
$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/libgit2-win32-ownership.patch-applied
53+
$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/libgit2-lowercase-windows-h.patch-applied
5454

5555
$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/source-extracted
5656
mkdir -p $(dir $@)

‎deps/libgit2.version‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
LIBGIT2_JLL_NAME := LibGit2
44

55
## source build
6-
LIBGIT2_BRANCH=v1.4.3
7-
LIBGIT2_SHA1=465bbf88ea939a965fbcbade72870c61f815e457
6+
LIBGIT2_BRANCH=v1.5.0
7+
LIBGIT2_SHA1=fbea439d4b6fc91c6b619d01b85ab3b7746e4c19
88

99
## Other deps
1010
# Specify the version of the Mozilla CA Certificate Store to obtain.

‎deps/patches/libgit2-agent-nonfatal.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Date: Wed Jul 20 19:59:00 2016 -0400
77
Julia issue: https://github.com/JuliaLang/julia/pull/17459
88
Upstream: https://github.com/libgit2/libgit2/issues/3866
99

10-
diff --git a/src/transports/ssh.c b/src/transports/ssh.c
10+
diff --git a/src/libgit2/transports/ssh.c b/src/libgit2/transports/ssh.c
1111
index cfd5736..82d2c63 100644
12-
--- a/src/transports/ssh.c
13-
+++ b/src/transports/ssh.c
12+
--- a/src/libgit2/transports/ssh.c
13+
+++ b/src/libgit2/transports/ssh.c
1414
@@ -296,8 +296,10 @@ static int ssh_agent_auth(LIBSSH2_SESSION *session, git_cred_ssh_key *c) {
1515

1616
rc = libssh2_agent_connect(agent);

‎deps/patches/libgit2-hostkey.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/src/transports/ssh.c b/src/transports/ssh.c
1+
diff --git a/src/libgit2/transports/ssh.c b/src/libgit2/transports/ssh.c
22
index 89f085230..b8bdca61a 100644
3-
--- a/src/transports/ssh.c
4-
+++ b/src/transports/ssh.c
3+
--- a/src/libgit2/transports/ssh.c
4+
+++ b/src/libgit2/transports/ssh.c
55
@@ -467,6 +467,7 @@ static int _git_ssh_setup_conn(
66
git_credential *cred = NULL;
77
LIBSSH2_SESSION *session=NULL;

‎deps/patches/libgit2-lowercase-windows-h.patch‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From d64f3d0992ec278d843c397b4b52e3434962c197 Mon Sep 17 00:00:00 2001
2+
From: Vinz2008 <[email protected]>
3+
Date: Thu, 11 Aug 2022 00:25:31 +0200
4+
Subject: [PATCH] Fix #6365
5+
6+
---
7+
src/cli/opt.c | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/src/cli/opt.c b/src/cli/opt.c
11+
index 72df5877fbf..62a3430d16e 100644
12+
--- a/src/cli/opt.c
13+
+++ b/src/cli/opt.c
14+
@@ -23,7 +23,7 @@
15+
#include "opt.h"
16+
17+
#ifdef _WIN32
18+
-# include <Windows.h>
19+
+# include <windows.h>
20+
#else
21+
# include <fcntl.h>
22+
# include <sys/ioctl.h>

‎deps/patches/libgit2-win32-ownership.patch‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎stdlib/LibGit2_jll/Project.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "LibGit2_jll"
22
uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
3-
version = "1.4.3+2"
3+
version = "1.5.0+0"
44

55
[deps]
66
MbedTLS_jll = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"

‎stdlib/LibGit2_jll/src/LibGit2_jll.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ libgit2_path = ""
2121
if Sys.iswindows()
2222
const libgit2 = "libgit2.dll"
2323
elseif Sys.isapple()
24-
const libgit2 = "@rpath/libgit2.1.4.dylib"
24+
const libgit2 = "@rpath/libgit2.1.5.dylib"
2525
else
26-
const libgit2 = "libgit2.so.1.4"
26+
const libgit2 = "libgit2.so.1.5"
2727
end
2828

2929
function __init__()

‎stdlib/LibGit2_jll/test/runtests.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ using Test, Libdl, LibGit2_jll
77
minor = Ref{Cint}(0)
88
patch = Ref{Cint}(0)
99
@test ccall((:git_libgit2_version, libgit2), Cint, (Ref{Cint}, Ref{Cint}, Ref{Cint}), major, minor, patch) == 0
10-
@test VersionNumber(major[], minor[], patch[]) == v"1.4.3"
10+
@test VersionNumber(major[], minor[], patch[]) == v"1.5.0"
1111
end

0 commit comments

Comments
 (0)