[PR PATCH] libgit2: update to 1.5.1

[PR PATCH] libgit2: update to 1.5.1

[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/41873

libgit2: update to 1.5.1
<!-- 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/41873.patch is attached

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

From 6ed8745cc08060e22a4599ac2a9a55e12e353a7c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 25 Jan 2023 23:13:37 +0100
Subject: [PATCH] libgit2: update to 1.5.1

---
 ...lar-remove-ftrunacte-from-libgit2-tests.patch | 16 ++--------------
 srcpkgs/libgit2/template                         |  6 +++---
 2 files changed, 5 insertions(+), 17 deletions(-)

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
index b084896b4e65..842900fcf418 100644
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
@@ -1,14 +1,5 @@
-From 12d73c418253a5c396465079c2808e07de17a1db Mon Sep 17 00:00:00 2001
-From: Peter Pettersson <boretrk@hotmail.com>
-Date: Thu, 14 Jul 2022 18:28:58 +0200
-Subject: [PATCH] clar: remove ftrunacte from libgit2 tests
-
----
- tests/libgit2/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
-index 27f421ad6..7f6fafe77 100644
+index 280b9a8..631fea8 100644
 --- a/tests/libgit2/CMakeLists.txt
 +++ b/tests/libgit2/CMakeLists.txt
 @@ -65,7 +65,7 @@ endif()
@@ -17,9 +8,6 @@ index 27f421ad6..7f6fafe77 100644
  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)
+ 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)
--- 
-2.38.0
-
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 0253f5c9c727..d8040d3be1c5 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
 # Template file for 'libgit2'
 pkgname=libgit2
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -10,8 +10,8 @@ short_desc="Git linkable library"
 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/v${version}.tar.gz"
-checksum=8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e
+distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
+checksum=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTS=ON"

Re: [PR REVIEW] libgit2: update to 1.5.1

[kruceter]

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/41873#discussion_r1093880497

Comment:
```suggestion
Backported from:
https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db

diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
```

I see nothing wrong in removing the commit header, but it is better to indicate that you backported the patch from the "main" branch to clear confusion.

Re: [PR REVIEW] libgit2: update to 1.5.1

[kruceter]

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/41873#discussion_r1093890139

Comment:
Either remove them too or revert changes applied to the last selected line.

Re: [PR REVIEW] libgit2: update to 1.5.1

[kruceter]

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

New review comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/41873#discussion_r1093890139

Comment:
Either remove them too or revert the change applied to the last selected line.

Re: [PR PATCH] [Updated] libgit2: update to 1.5.1

[tranzystorek-io]

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

There is an updated 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/41873

libgit2: update to 1.5.1
<!-- 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/41873.patch is attached

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

From 751989369a54bfce9de3328ed642b38d6cfc649b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 25 Jan 2023 23:13:37 +0100
Subject: [PATCH] libgit2: update to 1.5.1

---
 ...lar-remove-ftrunacte-from-libgit2-tests.patch | 16 +++-------------
 srcpkgs/libgit2/template                         |  6 +++---
 2 files changed, 6 insertions(+), 16 deletions(-)

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
index b084896b4e65..4fb8488f82bb 100644
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
@@ -1,14 +1,7 @@
-From 12d73c418253a5c396465079c2808e07de17a1db Mon Sep 17 00:00:00 2001
-From: Peter Pettersson <boretrk@hotmail.com>
-Date: Thu, 14 Jul 2022 18:28:58 +0200
-Subject: [PATCH] clar: remove ftrunacte from libgit2 tests
-
----
- tests/libgit2/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Backported from:
+https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
 
 diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
-index 27f421ad6..7f6fafe77 100644
 --- a/tests/libgit2/CMakeLists.txt
 +++ b/tests/libgit2/CMakeLists.txt
 @@ -65,7 +65,7 @@ endif()
@@ -17,9 +10,6 @@ index 27f421ad6..7f6fafe77 100644
  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)
+ 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)
--- 
-2.38.0
-
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 0253f5c9c727..d8040d3be1c5 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
 # Template file for 'libgit2'
 pkgname=libgit2
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=cmake
 configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -10,8 +10,8 @@ short_desc="Git linkable library"
 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/v${version}.tar.gz"
-checksum=8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e
+distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
+checksum=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTS=ON"

Re: [PR REVIEW] libgit2: update to 1.5.1

[tranzystorek-io]

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

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/41873#discussion_r1093899515

Comment:
Done

Re: [PR REVIEW] libgit2: update to 1.5.1

[tranzystorek-io]

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

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/41873#discussion_r1093899770

Comment:
Done

Re: libgit2: update to 1.5.1

[kruceter]

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/41873#issuecomment-1413009840

Comment:
@Vaelatern, if you may?

Re: [PR PATCH] [Merged]: libgit2: update to 1.5.1

[Vaelatern]

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

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

libgit2: update to 1.5.1
https://github.com/void-linux/void-packages/pull/41873

Description:
<!-- 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
-->