[PR PATCH] libgit2: update to 1.6.4

[PR PATCH] libgit2: update to 1.6.4

[zen0bit]

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

There is a new pull request by zen0bit against master on the void-packages repository

https://github.com/oSoWoSo/VUR libgit2
https://github.com/void-linux/void-packages/pull/43471

libgit2: update to 1.6.4
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x64 glibc)

A patch file from https://github.com/void-linux/void-packages/pull/43471.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-43471.patch --]
[-- Type: text/x-diff, Size: 1597 bytes --]

From 8c8b4b268288597ec6d405dfd69a64d25edf46db Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sun, 16 Apr 2023 04:09:41 +0200
Subject: [PATCH] libgit2: update to 1.6.4

---
 common/shlibs            | 2 +-
 srcpkgs/libgit2/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index df30e9a925c0..ada0fb64a3fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1351,7 +1351,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3
 libunwind-setjmp.so.0 libunwind-1.5.0_3
 libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
 libmicrodns.so.1 libmicrodns-0.2.0_1
-libgit2.so.1.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_1
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 6fc1c6641b7c..4c6bd6b1cc14 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
 # Template file for 'libgit2'
 pkgname=libgit2
-version=1.5.1
+version=1.6.4
 revision=1
 build_style=cmake
 configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
 homepage="https://libgit2.org"
 distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTS=ON"

Re: libgit2: update to 1.6.4

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43471#issuecomment-1510025542

Comment:
#43435

Re: [PR PATCH] [Closed]: libgit2: update to 1.6.4

[zen0bit]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There's a closed pull request on the void-packages repository

libgit2: update to 1.6.4
https://github.com/void-linux/void-packages/pull/43471

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x64 glibc)

[PR PATCH] libgit2: update to 1.6.4

[tranzystorek-io]

[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]

There is a new pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages libgit2
https://github.com/void-linux/void-packages/pull/43435

libgit2: update to 1.6.4
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43435.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-43435.patch --]
[-- Type: text/x-diff, Size: 15554 bytes --]

From f392b942c9391d9f92a57c1c4b3513ddc897cb11 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:19:22 +0200
Subject: [PATCH 01/14] libgit2: update to 1.6.4

---
 common/shlibs                                     |  2 +-
 ...clar-remove-ftrunacte-from-libgit2-tests.patch | 15 ---------------
 ...ble-test-validate_current_user_ownership.patch |  8 ++++----
 srcpkgs/libgit2/template                          |  4 ++--
 4 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch

diff --git a/common/shlibs b/common/shlibs
index 605a8249c8e2..c27207f0d898 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1351,7 +1351,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3
 libunwind-setjmp.so.0 libunwind-1.5.0_3
 libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
 libmicrodns.so.1 libmicrodns-0.2.0_1
-libgit2.so.1.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_1
 libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
 libagg.so.2 agg-2.5_1
 libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82bb..000000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
- 
- include(AddClarTest)
- add_clar_test(libgit2_tests offline             -v -xonline)
--add_clar_test(libgit2_tests invasive            -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive            -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online              -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert   -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon           -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489b..3f316543f36b 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
 diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
 --- a/tests/util/path.c
 +++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
  	cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
  #else
  	cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
--	cl_assert_equal_i(is_cur, 0);
-+	//cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+-	cl_assert_equal_i(is_cur, (geteuid() == 0));
++	//cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
  
  	cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
  #endif
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 6fc1c6641b7c..4c6bd6b1cc14 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
 # Template file for 'libgit2'
 pkgname=libgit2
-version=1.5.1
+version=1.6.4
 revision=1
 build_style=cmake
 configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
 homepage="https://libgit2.org"
 distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTS=ON"

From 25a9b63bfc66f4031ea9717138e505689391db4b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:22:58 +0200
Subject: [PATCH 02/14] python3-pygit2: update to 1.12.0

---
 srcpkgs/python3-pygit2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index e95cda9aa1aa..ab0d0be73538 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pygit2'
 pkgname=python3-pygit2
-version=1.10.1
-revision=2
+version=1.12.0
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel python3-setuptools"
 makedepends="python3-devel libgit2-devel python3-cached-property python3-cffi libssh2-devel
@@ -14,4 +14,4 @@ license="LGPL-2.0-only"
 homepage="https://www.pygit2.org/"
 changelog="https://github.com/libgit2/pygit2/blob/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pygit2/pygit2-${version}.tar.gz"
-checksum=354651bf062c02d1f08041d6fbf1a9b4bf7a93afce65979bdc08bdc65653aa2e
+checksum=e9440d08665e35278989939590a53f37a938eada4f9446844930aa2ee30d73be

From 7893a88ee6406134b4f6d5fa7e1c5b92d5a5a7c3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:24:32 +0200
Subject: [PATCH 03/14] calligra: rebuild for libgit2

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index fa2d3a09c3dd..d0bdd2fec265 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=12
+revision=13
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 51e3d7ec691492bbae2fe40628132bfa1c776ded Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:25:19 +0200
Subject: [PATCH 04/14] DarkRadiant: rebuild for libgit2

---
 srcpkgs/DarkRadiant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index ca700fe30810..8830b3a61c06 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
 # Template file for 'DarkRadiant'
 pkgname=DarkRadiant
 version=3.8.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config ruby-asciidoctor"

From 2a87b9164b3de33535614d0692f00aba24355301 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:26:00 +0200
Subject: [PATCH 05/14] Fritzing: rebuild for libgit2

---
 srcpkgs/Fritzing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index f76b51898007..5bdc29d7ff70 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
 # Template file for 'Fritzing'
 pkgname=Fritzing
 version=0.9.3b
-revision=6
+revision=7
 _partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
 create_wrksrc=yes
 build_wrksrc="app"

From bfcc7453d32e4406dff34c5f1d82eb2dba3ac1a9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:28:06 +0200
Subject: [PATCH 06/14] geany-plugins: rebuild for libgit2

---
 srcpkgs/geany-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index c5de461efb17..f0bb0b04ed80 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'geany-plugins'
 pkgname=geany-plugins
 version=1.38.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-all-plugins --disable-devhelp
  --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"

From a721fa5185844b1015d6f09de5dbad8f913654b1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:29:24 +0200
Subject: [PATCH 07/14] horizon: rebuild for libgit2

---
 srcpkgs/horizon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
 # Template file for 'horizon'
 pkgname=horizon
 version=2.4.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="GOLD="
 make_install_target="install install-man"

From 1c03b8fabae9433ef6e6c4c202106b48f4b78401 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:30:27 +0200
Subject: [PATCH 08/14] juCi++: rebuild for libgit2

---
 srcpkgs/juCi++/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 416bde7cc4d0..ad903e98b150 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
 # Template file for 'juCi++'
 pkgname=juCi++
 version=1.7.2
-revision=3
+revision=4
 _libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
 _tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
 create_wrksrc=yes

From 892dd271bd414072a791d9513e51f0cca0d81c4b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:31:24 +0200
Subject: [PATCH 09/14] kup: rebuild for libgit2

---
 srcpkgs/kup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 7ae6c1039399..71ecc3190b68 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
 # Template file for 'kup'
 pkgname=kup
 version=0.9.1
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
  kpackage gettext kconfig"

From e26564ecd92e93a0acfee785ca6a603f46613ffc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:32:19 +0200
Subject: [PATCH 10/14] slcp: rebuild for libgit2

---
 srcpkgs/slcp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 6dd88ee79c66..77982f8185be 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
 # Template file for 'slcp'
 pkgname=slcp
 version=0.2
-revision=13
+revision=14
 build_style=gnu-makefile
 makedepends="libgit2-devel"
 short_desc="Simple shell prompt written in C"

From 32758ba3da1182e46ef4595b78b1593afe38df91 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:33:43 +0200
Subject: [PATCH 11/14] stagit: rebuild for libgit2

---
 srcpkgs/stagit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index af92a2ab9d1c..ee27d04171d8 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
 # Template file for 'stagit'
 pkgname=stagit
 version=1.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
 makedepends="libgit2-devel"

From 57e1c2f37dce10a6801590569eeb21ced38290de Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:34:44 +0200
Subject: [PATCH 12/14] libgit2-glib: rebuild for libgit2

---
 srcpkgs/libgit2-glib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index 7873e51a0b28..f20b53b73211 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'libgit2-glib'
 pkgname=libgit2-glib
 version=1.1.0
-revision=3
+revision=4
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)

From 4660e2cd5e22d75f65d75edb5601576db227702a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:35:25 +0200
Subject: [PATCH 13/14] gnome-builder: rebuild for libgit2

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 4b56136453bd..d4e91ad17997 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
 version=44.1
-revision=2
+revision=3
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"

From a125ca6dbdae7d0e3db6f99e34526df10820296e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:37:29 +0200
Subject: [PATCH 14/14] cargo: rebuild for libgit2

---
 srcpkgs/cargo/patches/libgit2-1.6.patch | 37 +++++++++++++++++++++++++
 srcpkgs/cargo/template                  |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cargo/patches/libgit2-1.6.patch

diff --git a/srcpkgs/cargo/patches/libgit2-1.6.patch b/srcpkgs/cargo/patches/libgit2-1.6.patch
new file mode 100644
index 000000000000..adaaae84a56f
--- /dev/null
+++ b/srcpkgs/cargo/patches/libgit2-1.6.patch
@@ -0,0 +1,37 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index af87b70..99e4f31 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -28,8 +28,8 @@ pretty_env_logger = { version = "0.4", optional = true }
+ anyhow = "1.0.47"
+ filetime = "0.2.9"
+ flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+-git2 = "0.16.0"
+-git2-curl = "0.17.0"
++git2 = "0.17.0"
++git2-curl = "0.18.0"
+ glob = "0.3.0"
+ hex = "0.4"
+ hmac = "0.12.1"
+@@ -46,7 +46,7 @@ libc = "0.2"
+ log = "0.4.6"
+ # Temporarily pin libgit2-sys due to some issues with SSH not working on
+ # Windows.
+-libgit2-sys = "=0.14.1"
++libgit2-sys = "=0.15.0"
+ memchr = "2.1.3"
+ opener = "0.5"
+ os_info = "3.5.0"
+diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml
+index 653c5db..b65b242 100644
+--- a/crates/cargo-test-support/Cargo.toml
++++ b/crates/cargo-test-support/Cargo.toml
+@@ -17,7 +17,7 @@ filetime = "0.2"
+ flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
+ pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
+ time = { version = "0.3", features = ["parsing", "formatting"]}
+-git2 = "0.16.0"
++git2 = "0.17.0"
+ glob = "0.3"
+ itertools = "0.10.0"
+ lazy_static = "1.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 09be821c96ef..cfb070dfde20 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=1.68.2
-revision=1
+revision=2
 _cargo_revision=0.69.1
 build_helper=rust
 hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"