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: 7273 bytes --]

From 68a7369d6b68625fa0d2b97f4ee3f5326dd8d2bc 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 1/2] 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 d01d74977cbecfb1e43b57506ff99f2543dc5d59 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 2/2] New package: sequoia-git-0.1.0

---
 ...mpletion-artifacts-to-reasonable-dir.patch | 60 ++++++++++++++++
 ...-to-allow-for-older-libgit2-versions.patch | 70 +++++++++++++++++++
 srcpkgs/sequoia-git/template                  | 25 +++++++
 3 files changed, 155 insertions(+)
 create mode 100644 srcpkgs/sequoia-git/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
 create mode 100644 srcpkgs/sequoia-git/patches/0002-downgrade-git2-to-allow-for-older-libgit2-versions.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..353bbe4aa477b
--- /dev/null
+++ b/srcpkgs/sequoia-git/patches/0001-write-man-and-completion-artifacts-to-reasonable-dir.patch
@@ -0,0 +1,60 @@
+From de4d124faa3e01d6d58f907eeb31c5942061d853 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 1/2] write man and completion artifacts to reasonable
+ directories
+
+---
+ .gitignore |  2 ++
+ build.rs   | 19 ++-----------------
+ 2 files changed, 4 insertions(+), 17 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index ea8c4bf..dfe6e54 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1 +1,3 @@
+ /target
++/man
++/completions
+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/patches/0002-downgrade-git2-to-allow-for-older-libgit2-versions.patch b/srcpkgs/sequoia-git/patches/0002-downgrade-git2-to-allow-for-older-libgit2-versions.patch
new file mode 100644
index 0000000000000..05d484491dfc6
--- /dev/null
+++ b/srcpkgs/sequoia-git/patches/0002-downgrade-git2-to-allow-for-older-libgit2-versions.patch
@@ -0,0 +1,70 @@
+From 49c34e60cdea812cc8df11db0f5a397b154a8cee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Mon, 11 Dec 2023 10:17:56 +0100
+Subject: [PATCH 2/2] downgrade git2 to allow for older libgit2 versions
+
+---
+ Cargo.lock | 14 +++++++-------
+ Cargo.toml |  2 +-
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index da54f2e..fa78be6 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -782,11 +782,11 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+ 
+ [[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.4.0",
++ "bitflags 1.3.2",
+  "libc",
+  "libgit2-sys",
+  "log",
+@@ -1111,9 +1111,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",
+@@ -2452,9 +2452,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+ 
+ [[package]]
+ name = "vergen"
+-version = "8.2.5"
++version = "8.2.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "85e7dc29b3c54a2ea67ef4f953d5ec0c4085035c0ae2d325be1c0d2144bd9f16"
++checksum = "bbc5ad0d9d26b2c49a5ab7da76c3e79d3ee37e7821799f8223fcb8f2f391a2e7"
+ dependencies = [
+  "anyhow",
+  "git2",
+diff --git a/Cargo.toml b/Cargo.toml
+index a175848..80aca7c 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -23,7 +23,7 @@ anyhow = "1"
+ buffered-reader = "1"
+ clap = { version = "4.0", features = [ "cargo", "derive", "env", "string", "wrap_help" ] }
+ dirs = "5"
+-git2 = "0.18"
++git2 = "=0.17.2"
+ once_cell = "1"
+ toml = "0.8"
+ serde = { version = "1.0", features = ["derive"] }
+-- 
+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
+}