Re: [PR PATCH] [Updated] New package: clevis-20

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

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

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

https://github.com/jhe2/void-packages clevis
https://github.com/void-linux/void-packages/pull/51359

New package: clevis-20
<!-- 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**

<!-- 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, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-glibc
  - aarch64-musl
  - i686-glibc
  - x86_64-musl


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

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

From 786f2c2583f85fbc8236b8557af2e9f6a9c95372 Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Sun, 21 Jul 2024 17:20:37 +0200
Subject: [PATCH 1/4] common/shlibs: add libjose.so.0 and libluksmeta.so.0

---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 8a716ff962395e..a59e105bb1c85f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4518,3 +4518,5 @@ libKPim6MimeTreeParserWidgets.so.6 mimetreeparser-24.02.0_1
 libopenrazer.so.0 libopenrazer-0.2.0_1
 libstaroffice-0.0.so.0 libstaroffice-0.0.7_1
 libbox2d.so.2 box2d-2.4.1_1
+libjose.so.0 jose-14_1
+libluksmeta.so.0 luksmeta-9_1

From c76b7df8c8a5b4a6b62abe407a4e664d8c082675 Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Mon, 5 Aug 2024 18:45:52 +0200
Subject: [PATCH 2/4] New package: jose-14

---
 srcpkgs/jose-devel    |  1 +
 srcpkgs/jose/template | 66 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 120000 srcpkgs/jose-devel
 create mode 100644 srcpkgs/jose/template

diff --git a/srcpkgs/jose-devel b/srcpkgs/jose-devel
new file mode 120000
index 00000000000000..a6611ea027c865
--- /dev/null
+++ b/srcpkgs/jose-devel
@@ -0,0 +1 @@
+jose
\ No newline at end of file
diff --git a/srcpkgs/jose/template b/srcpkgs/jose/template
new file mode 100644
index 00000000000000..911e39ecb0e2c1
--- /dev/null
+++ b/srcpkgs/jose/template
@@ -0,0 +1,66 @@
+# Template file for 'jose'
+pkgname=jose
+version=14
+revision=1
+build_style=meson
+configure_args="-Dwerror=false"
+hostmakedepends="asciidoc pkg-config"
+makedepends="jansson-devel openssl-devel zlib-devel"
+short_desc="C-language implementation of Javascript Object Signing and Encryption"
+maintainer="Johannes Heimansberg <git@jhe.dedyn.io>"
+license="Apache-2.0"
+homepage="https://github.com/latchset/jose"
+distfiles="https://github.com/latchset/jose/releases/download/v$version/jose-$version.tar.xz"
+checksum=cee329ef9fce97c4c025604a8d237092f619aaa9f6d35fdf9d8c9052bc1ff95b
+
+# The -Db_lto=true flag from the default meson do_configure causes a test to fail,
+# so we configure the project without it.
+do_configure() {
+        : ${meson_cmd:=meson}
+        : ${meson_builddir:=build}
+        : ${meson_crossfile:="${XBPS_WRAPPERDIR}/meson/xbps_meson.cross"}
+
+        if [ "$CROSS_BUILD" ]; then
+                configure_args+=" --cross-file=${meson_crossfile}"
+        fi
+
+        # binutils ar needs a plugin when LTO is used on static libraries, so we
+        # have to use the gcc-ar wrapper that calls the correct plugin.
+        # As seen in https://github.com/mesonbuild/meson/issues/1646 (and its
+        # solution, https://github.com/mesonbuild/meson/pull/1649), meson fixed
+        # issues with static libraries + LTO by defaulting to gcc-ar themselves.
+        # We also force gcc-ar usage in the crossfile above.
+        export AR="gcc-ar"
+
+        # unbuffered output for continuous logging
+        PYTHONUNBUFFERED=1 ${meson_cmd} setup \
+                --prefix=/usr \
+                --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \
+                --libexecdir=/usr/libexec \
+                --bindir=/usr/bin \
+                --sbindir=/usr/bin \
+                --includedir=/usr/include \
+                --datadir=/usr/share \
+                --mandir=/usr/share/man \
+                --infodir=/usr/share/info \
+                --localedir=/usr/share/locale \
+                --sysconfdir=/etc \
+                --localstatedir=/var \
+                --sharedstatedir=/var/lib \
+                --buildtype=plain \
+                --auto-features=auto \
+                --wrap-mode=nodownload \
+                -Db_lto=true \
+                -Db_staticpic=true \
+                ${configure_args} . ${meson_builddir}
+}
+
+jose-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 72546e6856cea042247582616a2d7beded6a1577 Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Mon, 5 Aug 2024 18:46:11 +0200
Subject: [PATCH 3/4] New package: luksmeta-9

---
 srcpkgs/luksmeta-devel    |  1 +
 srcpkgs/luksmeta/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/luksmeta-devel
 create mode 100644 srcpkgs/luksmeta/template

diff --git a/srcpkgs/luksmeta-devel b/srcpkgs/luksmeta-devel
new file mode 120000
index 00000000000000..7022d555a5bd01
--- /dev/null
+++ b/srcpkgs/luksmeta-devel
@@ -0,0 +1 @@
+luksmeta
\ No newline at end of file
diff --git a/srcpkgs/luksmeta/template b/srcpkgs/luksmeta/template
new file mode 100644
index 00000000000000..31c5da5e5389b5
--- /dev/null
+++ b/srcpkgs/luksmeta/template
@@ -0,0 +1,28 @@
+# Template file for 'luksmeta'
+pkgname=luksmeta
+version=9
+revision=1
+build_style=gnu-configure
+hostmakedepends="asciidoc automake cryptsetup libtool pkg-config"
+makedepends="cryptsetup-devel"
+short_desc="Library for storing metadata in the LUKSv1 header"
+maintainer="Johannes Heimansberg <git@jhe.dedyn.io>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/latchset/luksmeta"
+distfiles="https://github.com/latchset/luksmeta/archive/v$version/luksmeta-$version.tar.gz"
+checksum=0eea7d50a0411e0c1e383fd47073806ed7d435b27410504e33bfbc792a1688fc
+make_check="no" # fails on some architectures
+
+pre_configure() {
+	autoreconf -fi
+}
+
+luksmeta-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 89b59d71bb98629f9c3927ecda090933a5fbbdfe Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Mon, 5 Aug 2024 18:46:23 +0200
Subject: [PATCH 4/4] New package: clevis-20

---
 srcpkgs/clevis/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/clevis/template

diff --git a/srcpkgs/clevis/template b/srcpkgs/clevis/template
new file mode 100644
index 00000000000000..483320f63b96f1
--- /dev/null
+++ b/srcpkgs/clevis/template
@@ -0,0 +1,20 @@
+# Template file for 'clevis'
+pkgname=clevis
+version=20
+revision=1
+build_style=meson
+hostmakedepends="asciidoc bash-completion cryptsetup curl jq keyutils pkg-config tpm2-tools"
+makedepends="bash-completion cryptsetup-devel dracut jansson-devel
+ jose-devel libaudit-devel luksmeta-devel udisks2-devel"
+depends="bash cryptsetup curl libpwquality tpm2-tools"
+short_desc="Pluggable framework for automated decryption"
+maintainer="Johannes Heimansberg <git@jhe.dedyn.io>"
+license="GPL-3.0-or-later WITH custom:OpenSSL-Exception"
+homepage="https://github.com/latchset/clevis"
+distfiles="https://github.com/latchset/clevis/archive/v$version/clevis-$version.tar.gz"
+checksum=67eb9cbbb9c90f9802cae76503f74f23d0046ee6570553407035e9fae3b4b4dd
+make_check="ci-skip" # LUKS tests fail in CI pipeline
+
+post_install() {
+	vlicense COPYING.openssl
+}