Skip to content

Commit

Permalink
Update to fix Windows issue
Browse files Browse the repository at this point in the history
  • Loading branch information
fxcoudert committed Jun 18, 2022
1 parent 9ba9f93 commit b13d7f8
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 36 deletions.
64 changes: 32 additions & 32 deletions deps/checksums/libgit2
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
LibGit2.v1.4.3+1.aarch64-apple-darwin.tar.gz/md5/160a9b51c7f930a6b2555a7091b08451
LibGit2.v1.4.3+1.aarch64-apple-darwin.tar.gz/sha512/9530d93ca1c2603cfe36dbc2d686d875d86535b693bad63f0302a4782579467217fa1502f3ce45cd080adfb99a8fdc2314bd4891293867cf187fe85f8afd3b76
LibGit2.v1.4.3+1.aarch64-linux-gnu.tar.gz/md5/00952860568ca518fe3676b9707c2a77
LibGit2.v1.4.3+1.aarch64-linux-gnu.tar.gz/sha512/e02a1143a487139ea36d434071bec218fe0320f9c4fb7ccb49a658317d7bad024b7a4d0faca825e8961b5928fec230468c6b9ce9ccc1bb18355feec1df556064
LibGit2.v1.4.3+1.aarch64-linux-musl.tar.gz/md5/c0a568d3466c4a3037305debeb60a4f9
LibGit2.v1.4.3+1.aarch64-linux-musl.tar.gz/sha512/29a8b53ed75ae1ab3fc35bffeeb55e677ebff4952a5b9e08caa39fa633b04f489a06cfe3f1ffda7b2911bf2f9063597359a9c1ac8ed8b1b28fb2b98d32ec41e0
LibGit2.v1.4.3+1.armv6l-linux-gnueabihf.tar.gz/md5/34d08c2d07b67924e75ecbc48c5ae9f6
LibGit2.v1.4.3+1.armv6l-linux-gnueabihf.tar.gz/sha512/d4c2076ae6ef8e63a77117b2ef3c494ef13e69fc8a2c1cc5926ce253d630537c06a717d08ddf752babd4d23ddb7ea458a38f960ac50101263bb1c1202a0220b9
LibGit2.v1.4.3+1.armv6l-linux-musleabihf.tar.gz/md5/2b802dc36f59438566c6f07b59230e71
LibGit2.v1.4.3+1.armv6l-linux-musleabihf.tar.gz/sha512/23e2e835940f64f895112a6581ab6a1b0822760ad0693aed1d33b440e6aa824b35d624ed303e19d307cc671a5de68e56aa33ca27b528c70b6aacbb53924e0b35
LibGit2.v1.4.3+1.armv7l-linux-gnueabihf.tar.gz/md5/b9e8553b94d0c398a9cbd522aa23b62e
LibGit2.v1.4.3+1.armv7l-linux-gnueabihf.tar.gz/sha512/01f8db6fec4273d80b95075b0cc2a0ecffbc1d2e5432ef29f89c54f20bf283d46249b88bfbbe3a60e58b36c2694d981e6a8f29b015cb1cd1f291177e5c924a16
LibGit2.v1.4.3+1.armv7l-linux-musleabihf.tar.gz/md5/7a0d0e022b267e345568560dbf4cbc1e
LibGit2.v1.4.3+1.armv7l-linux-musleabihf.tar.gz/sha512/a3b35467d3586de021533fd9dbe4d5a228c2e69a718b492d7966b9716d008f13191ca7bb079321e75058cff55df4292f675785a6c99d24d4195dbb91d3ce10e7
LibGit2.v1.4.3+1.i686-linux-gnu.tar.gz/md5/4684c5b1dc0acb7f0f97e4a4bd95e308
LibGit2.v1.4.3+1.i686-linux-gnu.tar.gz/sha512/742239b82bd22b92ea786bde66304e18e866c2ced39c8821e66cf521f20cc488b59d9e0900e947f105f30a22c9f5a8fb98923dc9f451fceac5527a81a3767d9f
LibGit2.v1.4.3+1.i686-linux-musl.tar.gz/md5/60f8c5076f44d55e5636a15e84018e07
LibGit2.v1.4.3+1.i686-linux-musl.tar.gz/sha512/fa9789a1534bfb65f02466dbad4221bcd03e2569b225a8553c8032a8ed37b20bacbfe8919d5e450b4acf5e7320699dae07d0e31ca0e404698f57adcb3ec8c029
LibGit2.v1.4.3+1.i686-w64-mingw32.tar.gz/md5/8cbe19beef596bc1e4bb89940f8b1683
LibGit2.v1.4.3+1.i686-w64-mingw32.tar.gz/sha512/afdef43caa0896eac2a75f830f15d925bd62bbe2d368dad201bffe917e477d8493c9c94ab359ff85b23f9ae4b633da76f06030599ef067260a21332dc42e2d09
LibGit2.v1.4.3+1.powerpc64le-linux-gnu.tar.gz/md5/6e71138cc1a4ca463e15a8553c38aa71
LibGit2.v1.4.3+1.powerpc64le-linux-gnu.tar.gz/sha512/6470f7eafa0fd616d738ba10d2fe2851a662a9c641414a06dc38deb779cf9914c804898ee05cd5b4d2d8533d51d53b9b64054997b29c53d34d62ccf64bc29870
LibGit2.v1.4.3+1.x86_64-apple-darwin.tar.gz/md5/a61ef96201f1baa469df3172b23efff8
LibGit2.v1.4.3+1.x86_64-apple-darwin.tar.gz/sha512/806095107871c86d697c19cf4f78ffec64cde962cf3a8bd7d28024ecb8156e8f06ef8bbd3dab153ca99236ee6e84e40dbc94830d979c4a6e20e127efc0e10ba9
LibGit2.v1.4.3+1.x86_64-linux-gnu.tar.gz/md5/8b093fe261d9c637b072e68fd0146340
LibGit2.v1.4.3+1.x86_64-linux-gnu.tar.gz/sha512/70041269540c6c88aeefde690b415e12115014a7fa993fb178af5efe3843adc5eecf73e28eea26ab17769adefd04ff0e3b04063b625af2c977ecdab411e4c747
LibGit2.v1.4.3+1.x86_64-linux-musl.tar.gz/md5/c37f527fbfc616d71b0232b52064018e
LibGit2.v1.4.3+1.x86_64-linux-musl.tar.gz/sha512/11f71842b286eaf5054c39741011879e3025eaba00adfcaec51f102912618d99ee2ef68d8352587b4e1509bdc90598e154ed21d29586b1bfa4fb9ecddfb5aaed
LibGit2.v1.4.3+1.x86_64-unknown-freebsd.tar.gz/md5/ac612a831548f162e26c6fee39f52d53
LibGit2.v1.4.3+1.x86_64-unknown-freebsd.tar.gz/sha512/67cd153ff732b4eb7751ab3ee76f57042d058e73caa27a08bceccf4d4641ea0cbcb28de1296a796b4cc97603e4b561cae1f88376d45c0915af8fd1db63e0da8a
LibGit2.v1.4.3+1.x86_64-w64-mingw32.tar.gz/md5/20682ca0427323b0d61055e8518f59ce
LibGit2.v1.4.3+1.x86_64-w64-mingw32.tar.gz/sha512/88d6bd2f85ca7e9cc279d4fcb8c005017baa087326c237ff963ffc94b9c22b9b065e602751cd525c6b52c8b9433d9b5324643facfc6050cf8701a2d214da9705
LibGit2.v1.4.3+2.aarch64-apple-darwin.tar.gz/md5/df6f108f17778bafe0dec2db18a4a312
LibGit2.v1.4.3+2.aarch64-apple-darwin.tar.gz/sha512/d9ad1f441fd705b8c91a9fbfd39e97a1fe84753a0435af67e19344476c390dd301ed53a138867cc61552a9d4f26e6bac9ddf5284354c5631312893eb828c0b27
LibGit2.v1.4.3+2.aarch64-linux-gnu.tar.gz/md5/044f354966ea77f380eef9ec8093b13e
LibGit2.v1.4.3+2.aarch64-linux-gnu.tar.gz/sha512/e6feef32df7a5ffff48a34afbba5efb02452406de756a411c5675de9434641f4678ba7a0bec849d0f74de0df089a9a3769eb4ce466570b976442ae217ea62509
LibGit2.v1.4.3+2.aarch64-linux-musl.tar.gz/md5/d985b03be81552fff6f5d451319f6a23
LibGit2.v1.4.3+2.aarch64-linux-musl.tar.gz/sha512/0d606b358010839c9ee1a25c557c347f6532f6cafad66b0ce8d28945d2d6c84745b245193765a168e3b0aec93fbd7f3bc1c80afffdc96fb18fbf27c8b340ae8c
LibGit2.v1.4.3+2.armv6l-linux-gnueabihf.tar.gz/md5/b1c839415fcceb2b0c3c75606cbf3494
LibGit2.v1.4.3+2.armv6l-linux-gnueabihf.tar.gz/sha512/92ffd4ad4ab754ddab7be786374a54fed97694714ac99cf93372829821540f78eaa071c974efddbb3bdb9ad7824a95a6b935bb19c222f402a407b7a36e162b94
LibGit2.v1.4.3+2.armv6l-linux-musleabihf.tar.gz/md5/3cada4ec0a62e441169b0247f1b86daf
LibGit2.v1.4.3+2.armv6l-linux-musleabihf.tar.gz/sha512/8ced3cad5b25370348ed68b932f03e0b67974d7a3fa973a954247cd783e9e2647adb4ced66e8dccd3918429dc5df0afbde2a28c979a5c6fe7b5d0b103f88ddb5
LibGit2.v1.4.3+2.armv7l-linux-gnueabihf.tar.gz/md5/dc4b8c69e534beae8a7b31a990cecda7
LibGit2.v1.4.3+2.armv7l-linux-gnueabihf.tar.gz/sha512/05327ba85893ff3aa478c35ea3e12ceddbca7e53d5714474bec640c9d613e362975e89569aa84cc713facdae90a0292b144fbdfd1a4c8a1f21ab6916b467e0a8
LibGit2.v1.4.3+2.armv7l-linux-musleabihf.tar.gz/md5/8f9defcc523bf0a6ae6b1623e250fc8e
LibGit2.v1.4.3+2.armv7l-linux-musleabihf.tar.gz/sha512/2770b6f969d23389724a2f4b14671fa1dcd4b344abd2a7c2a5c5bef7ffd06a95f262066d2541c1df39f1394efa66a1bef07e5a031f05b12397c997ce9d71d17d
LibGit2.v1.4.3+2.i686-linux-gnu.tar.gz/md5/a014ce0eefc4371e77cec90ee073c78e
LibGit2.v1.4.3+2.i686-linux-gnu.tar.gz/sha512/d762404b6554078af5e681a4b766d9586e6b1f40c1f297ec1f7a1f70b00a426dc6429ef781581c757754ee31f14b662a60d7b40fefc1106ff7dc79aeb734a2fd
LibGit2.v1.4.3+2.i686-linux-musl.tar.gz/md5/ceb843d699ed19384c6a11c0cbf37ce5
LibGit2.v1.4.3+2.i686-linux-musl.tar.gz/sha512/ba169256ae760543a5513d06f260a00c27e2907c72d545e74af10341e29a8376dc980d6b19603b8d73354df07a7e8c58fd9473513f93f742a77bcf863519570e
LibGit2.v1.4.3+2.i686-w64-mingw32.tar.gz/md5/98fecb082adac2b6dcaa992c018f6def
LibGit2.v1.4.3+2.i686-w64-mingw32.tar.gz/sha512/566fdd275e01f3756134d998879a8fba15ac779505f4e7524ea3928dbb52d2212579de2896659e497c56292d69f2f3f661c712ed483f09835b80854472c713df
LibGit2.v1.4.3+2.powerpc64le-linux-gnu.tar.gz/md5/324fd370a11e082b5c1e61c9be2fbd01
LibGit2.v1.4.3+2.powerpc64le-linux-gnu.tar.gz/sha512/983bbb9b0922da4120cf61ed62e310ba6b5bdf42c734632e0cb531fd2053ba6c90a5afcbe9c94568a14122ef0a1271e6c654236df903e9fc769e6a65be0ce6a0
LibGit2.v1.4.3+2.x86_64-apple-darwin.tar.gz/md5/6abf91ca41140499ab280fcea01303e4
LibGit2.v1.4.3+2.x86_64-apple-darwin.tar.gz/sha512/66cba364b542df5f443b6761cc037704cb1e99b883285fe0af17bed644e310b6cfb6ac09a4f7119f9baa5d96b79d2a365fa9a572b40b01210ad325bf1cdcc025
LibGit2.v1.4.3+2.x86_64-linux-gnu.tar.gz/md5/ae8d8f3e916dd528b3f4368bf4a51ac4
LibGit2.v1.4.3+2.x86_64-linux-gnu.tar.gz/sha512/f2235440df3ef9162b14de3d6ff06a7122e2884ef6b81f8493a475d2814dc7b41ec322f18ab11c8d04fccc7028f48b9bf7febf3b75141a43a77c57df25233887
LibGit2.v1.4.3+2.x86_64-linux-musl.tar.gz/md5/98110121f786e127adef201b21e3a4f6
LibGit2.v1.4.3+2.x86_64-linux-musl.tar.gz/sha512/d248d5a1691deb38752a71f768724a31527c2594cd9175411f7d3f5ba6e4248ecb3207859004316993a75668c7d9c35615a3e4578e874745d37cc33a66dddbdf
LibGit2.v1.4.3+2.x86_64-unknown-freebsd.tar.gz/md5/985c14f55e2f9d7c2a00543f97e0195b
LibGit2.v1.4.3+2.x86_64-unknown-freebsd.tar.gz/sha512/a7fd6adae3386ccf409f43c756fe806a1c31f75762e9c422dcc4a6a5ce237a8efa0e7606c88c3f6f684b795e81cd2d58c638043cb3bc9cfac37e29279c5d1705
LibGit2.v1.4.3+2.x86_64-w64-mingw32.tar.gz/md5/d4fba0b0ccefb72b3e78f49a366e7170
LibGit2.v1.4.3+2.x86_64-w64-mingw32.tar.gz/sha512/a0e6cd5ca6b6635f46aa9f565b75b45828dc2d1a7a0f4f00654f41bf293c67f66f213c0854a3ebe0d1f93d114cb26313dbf178ca6353ba2a441b6bf3ab0ca36f
libgit2-465bbf88ea939a965fbcbade72870c61f815e457.tar.gz/md5/b91c544293f15b00acc04315eb38c2b5
libgit2-465bbf88ea939a965fbcbade72870c61f815e457.tar.gz/sha512/ac1d47e6308ad7a7620b683fd56568390be49cd8120b475fd6617aed8e7635036fce7e99a50f2611d0adeff28082aa673292475c1782f4e9dec9fa7dde8f1e77
9 changes: 6 additions & 3 deletions deps/libgit2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@ $(LIBGIT2_SRC_PATH)/libgit2-hostkey.patch-applied: $(LIBGIT2_SRC_PATH)/libgit2-a
patch -p1 -f < $(SRCDIR)/patches/libgit2-hostkey.patch
echo 1 > $@

$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: \
$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied \
$(LIBGIT2_SRC_PATH)/libgit2-hostkey.patch-applied
$(LIBGIT2_SRC_PATH)/libgit2-win32-ownership.patch-applied: $(LIBGIT2_SRC_PATH)/libgit2-hostkey.patch-applied
cd $(LIBGIT2_SRC_PATH) && \
patch -p1 -f < $(SRCDIR)/patches/libgit2-win32-ownership.patch
echo 1 > $@

$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/libgit2-win32-ownership.patch-applied

$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: $(LIBGIT2_SRC_PATH)/source-extracted
mkdir -p $(dir $@)
Expand Down
27 changes: 27 additions & 0 deletions deps/patches/libgit2-win32-ownership.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From cdff2f0237f663e0f68155655a8b66d05c1ec716 Mon Sep 17 00:00:00 2001
From: Edward Thomson <[email protected]>
Date: Mon, 13 Jun 2022 21:34:01 -0400
Subject: [PATCH] repo: allow administrator to own the configuration

Update our ownership checks that were introduced in libgit2 v1.4.3
(to combat CVE 2022-24765). These were not compatible with git's; git
itself allows administrators to own the path. Our checks now match
this behavior.
---
src/libgit2/repository.c | 2 +-
tests/libgit2/repo/open.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/repository.c b/src/repository.c
index 48a0b70f519..d2484318f10 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -512,7 +512,7 @@ static int validate_ownership(const char *repo_path)
bool is_safe;
int error;

- if ((error = git_fs_path_owner_is_current_user(&is_safe, repo_path)) < 0) {
+ if ((error = git_fs_path_owner_is_system_or_current_user(&is_safe, repo_path)) < 0) {
if (error == GIT_ENOTFOUND)
error = 0;

2 changes: 1 addition & 1 deletion stdlib/LibGit2_jll/Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "LibGit2_jll"
uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
version = "1.4.3+1"
version = "1.4.3+2"

[deps]
MbedTLS_jll = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
Expand Down

0 comments on commit b13d7f8

Please sign in to comment.