Re: [PR PATCH] [Updated] New package: sequoia-git-0.1.0

[jcgruenhage <jcgruenhage@users.noreply.github.com>]

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

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages sequoia-git-0.1.0_1
https://github.com/void-linux/void-packages/pull/47663

New package: sequoia-git-0.1.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/47663.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sequoia-git-0.1.0_1-47663.patch --]
[-- Type: text/x-diff, Size: 10702 bytes --]

From 0f6e47a829f45dc9e6001fa1f75362186729bb01 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 22 Aug 2023 15:00:53 +0200
Subject: [PATCH 1/4] libgit2: update to 1.7.1

---
 common/shlibs                                 |  2 +-
 .../patches/fix-missing-oid-type.patch        | 24 -------------------
 srcpkgs/libgit2/template                      |  8 +++----
 3 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch

diff --git a/common/shlibs b/common/shlibs
index 863776568fb91..7a8890d385146 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1341,7 +1341,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.6 libgit2-1.6.4_1
+libgit2.so.1.7 libgit2-1.7.1_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/fix-missing-oid-type.patch b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
deleted file mode 100644
index 8d24809f244a1..0000000000000
--- a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 47ebf589250159d6a98bd91625aefd2e1383ec26 Mon Sep 17 00:00:00 2001
-From: Oliver Reiche <oliver.reiche@gmail.com>
-Date: Wed, 3 May 2023 12:57:06 +0200
-Subject: [PATCH] Fix missing oid type for "fake" repositories
-
-... otherwise git_tree__parse_raw() will fail to obtain
-the correct oid size, which causes the entire parse to fail.
----
- src/libgit2/repository.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libgit2/repository.c b/src/libgit2/repository.c
-index 804e436abeb..c45c5855058 100644
---- a/src/libgit2/repository.c
-+++ b/src/libgit2/repository.c
-@@ -1152,6 +1152,8 @@ int git_repository_wrap_odb(git_repository **repo_out, git_odb *odb)
- 	repo = repository_alloc();
- 	GIT_ERROR_CHECK_ALLOC(repo);
- 
-+	repo->oid_type = GIT_OID_DEFAULT;
-+
- 	git_repository_set_odb(repo, odb);
- 	*repo_out = repo;
- 
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 035b2cebae821..c73d550f11321 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,9 +1,9 @@
 # Template file for 'libgit2'
 pkgname=libgit2
-version=1.6.4
-revision=2
+version=1.7.1
+revision=1
 build_style=cmake
-configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
 hostmakedepends="python3 pkg-config"
 makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
 short_desc="Git linkable library"
@@ -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=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
+checksum=17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTS=ON"

From d85e0d4122b8099403d16c10ad1fefb3b77b3de8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 22 Aug 2023 16:46:36 +0200
Subject: [PATCH 2/4] common/build-helper/rust.sh: force using system libgit2
 library

---
 common/build-helper/rust.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 460aad6a12e12..c906a89f99547 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -67,3 +67,6 @@ export RUSTONIG_SYSTEM_LIBONIG=1
 
 # libsqlite3-sys
 export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1

From e10bf811937a5c377eb88ed1c5c3bec40d5f8e95 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 3/4] cargo: rebuild for libgit2-1.7

---
 srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
 srcpkgs/cargo/template                     |  2 +-
 2 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch

diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index ace10e7702981..0000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index cc0cb9a..f6de424 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1006,11 +1006,11 @@ dependencies = [
- 
- [[package]]
- name = "git2"
--version = "0.18.0"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.3.3",
-+ "bitflags 1.3.2",
-  "libc",
-  "libgit2-sys",
-  "log",
-@@ -1021,9 +1021,9 @@ dependencies = [
- 
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
-  "curl",
-  "git2",
-@@ -2003,9 +2003,9 @@ checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
- 
- [[package]]
- name = "libgit2-sys"
--version = "0.16.1+1.7.1"
-+version = "0.15.2+1.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
-+checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa"
- dependencies = [
-  "cc",
-  "libc",
-diff --git a/Cargo.toml b/Cargo.toml
-index 4403044..1d50590 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.68"
- filetime = "0.2.22"
- flate2 = { version = "1.0.27", default-features = false, features = ["zlib"] }
--git2 = "0.18.0"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.54.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.10.0"
- jobserver = "0.1.26"
- lazycell = "1.3.0"
- libc = "0.2.148"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.0"
- memchr = "2.6.2"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 208c18818d570..b6b1154e2d8bd 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo'
 pkgname=cargo
 version=1.74.0
-revision=1
+revision=2
 _cargo_revision=0.75.0
 build_helper=rust
 hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"

From e77770afa161ef97ef71e48c0ccae10afcc6657b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 9 Dec 2023 18:20:30 +0100
Subject: [PATCH 4/4] New package: sequoia-git-0.1.0

---
 ...mpletion-artifacts-to-reasonable-dir.patch | 50 +++++++++++++++++++
 srcpkgs/sequoia-git/template                  | 25 ++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 srcpkgs/sequoia-git/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
 create mode 100644 srcpkgs/sequoia-git/template

diff --git a/srcpkgs/sequoia-git/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch b/srcpkgs/sequoia-git/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
new file mode 100644
index 0000000000000..90de0c91131af
--- /dev/null
+++ b/srcpkgs/sequoia-git/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
@@ -0,0 +1,50 @@
+From 54d7807a275d544b42ca509786c32e458c4307ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Sat, 9 Dec 2023 15:05:01 +0100
+Subject: [PATCH] write man and completion artifacts to reasonable directories
+
+---
+ build.rs | 19 ++-----------------
+ 1 file changed, 2 insertions(+), 17 deletions(-)
+
+diff --git a/build.rs b/build.rs
+index 1b950a6..a501d3d 100644
+--- a/build.rs
++++ b/build.rs
+@@ -49,14 +49,7 @@ fn git_version() {
+ 
+ fn completions() {
+     // Generate shell completions
+-    let outdir = match std::env::var_os("CARGO_TARGET_DIR") {
+-        None => {
+-            println!("cargo:warning=Not generating completion files, \
+-                      environment variable CARGO_TARGET_DIR not set");
+-            return;
+-        }
+-        Some(outdir) => outdir,
+-    };
++    let outdir = PathBuf::from("completions");
+ 
+     std::fs::create_dir_all(&outdir).unwrap();
+ 
+@@ -72,15 +65,7 @@ fn completions() {
+ 
+ fn man_pages() {
+     // Man page support.
+-    let outdir = match std::env::var_os("CARGO_TARGET_DIR") {
+-        None => {
+-            println!("cargo:warning=Not generating man pages, \
+-                      environment variable CARGO_TARGET_DIR not set");
+-            return;
+-        }
+-        Some(outdir) => PathBuf::from(outdir),
+-    };
+-
++    let outdir = PathBuf::from("man");
+     std::fs::create_dir_all(&outdir).unwrap();
+ 
+     let cli = cli::Cli::command();
+-- 
+2.43.0
+
diff --git a/srcpkgs/sequoia-git/template b/srcpkgs/sequoia-git/template
new file mode 100644
index 0000000000000..3667e25451e98
--- /dev/null
+++ b/srcpkgs/sequoia-git/template
@@ -0,0 +1,25 @@
+# Template file for 'sequoia-git'
+pkgname=sequoia-git
+version=0.1.0
+revision=1
+build_style=cargo
+build_helper=qemu
+_deps="nettle-devel openssl-devel sqlite-devel libgit2-devel bzip2-devel"
+hostmakedepends="pkg-config llvm clang ${_deps}"
+makedepends="${_deps}"
+checkdepends="git gnupg"
+short_desc="Tool to verify git commit signatures based on a policy"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="LGPL-2.0-or-later"
+homepage="https://gitlab.com/sequoia-pgp/sequoia-git"
+distfiles="https://gitlab.com/sequoia-pgp/sequoia-git/-/archive/v${version}/sequoia-git-v${version}.tar.gz"
+checksum=c1f7d2647538f3335dab8862a9c4b78bac8c41bb22a3917ec45989849fd035dd
+
+post_install() {
+	for page in man/*; do
+		vman ${page}
+	done
+	vcompletion completions/sq-git.bash bash
+	vcompletion completions/sq-git.fish fish
+	vcompletion completions/_sq-git zsh
+}