From b6cbd49d8cb56c0918eda2b676744a31e4142d58 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 1 Apr 2026 16:26:21 +0900 Subject: [PATCH] internal/rosa: p11-kit artifact Another package distributed in xz only. This is fetched from the git remote directly to avoid XZ Utils. Signed-off-by: Ophestra --- internal/rosa/all.go | 1 + internal/rosa/git.go | 8 ++++++-- internal/rosa/p11.go | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 internal/rosa/p11.go diff --git a/internal/rosa/all.go b/internal/rosa/all.go index 560fb2cf..f0d0716d 100644 --- a/internal/rosa/all.go +++ b/internal/rosa/all.go @@ -101,6 +101,7 @@ const ( Nettle Ninja OpenSSL + P11Kit PCRE2 Parallel Patch diff --git a/internal/rosa/git.go b/internal/rosa/git.go index 142cd341..65ebd97b 100644 --- a/internal/rosa/git.go +++ b/internal/rosa/git.go @@ -1,6 +1,10 @@ package rosa -import "hakurei.app/internal/pkg" +import ( + "path" + + "hakurei.app/internal/pkg" +) func (t Toolchain) newGit() (pkg.Artifact, string) { const ( @@ -90,7 +94,7 @@ func (t Toolchain) NewViaGit( name, url, rev string, checksum pkg.Checksum, ) pkg.Artifact { - return t.New(name+"-"+rev, 0, t.AppendPresets(nil, + return t.New(name+"-"+path.Base(rev), 0, t.AppendPresets(nil, NSSCACert, Git, ), &checksum, nil, ` diff --git a/internal/rosa/p11.go b/internal/rosa/p11.go new file mode 100644 index 00000000..7e491dc0 --- /dev/null +++ b/internal/rosa/p11.go @@ -0,0 +1,32 @@ +package rosa + +import "hakurei.app/internal/pkg" + +func (t Toolchain) newP11Kit() (pkg.Artifact, string) { + const ( + version = "0.26.2" + checksum = "3ei-6DUVtYzrRVe-SubtNgRlweXd6H2qHmUu-_5qVyIn6gSTvZbGS2u79Y8IFb2N" + ) + return t.NewPackage("p11-kit", version, t.NewViaGit( + "p11-kit-src", "https://github.com/p11-glue/p11-kit.git", + "refs/tags/"+version, mustDecode(checksum), + ), nil, &MesonHelper{ + Setup: []KV{ + {"Dsystemd", "disabled"}, + }, + }, + Coreutils, + Diffutils, + ), version +} +func init() { + artifactsM[P11Kit] = Metadata{ + f: Toolchain.newP11Kit, + + Name: "p11-kit", + Description: "provides a way to load and enumerate PKCS#11 modules", + Website: "https://p11-glue.freedesktop.org/p11-kit.html", + + ID: 2582, + } +}