aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOphestra <cat@gensokyo.uk>2026-05-18 22:42:43 +0900
committerOphestra <cat@gensokyo.uk>2026-05-18 22:42:43 +0900
commit0e95573f187f64de1a46f27af67325e57037b9a9 (patch)
tree0a3f41b9757824a12043a7217e14b16131b0b09d
parenteb2b53307a195cfdb46187771f137eef93b8c4ba (diff)
internal/rosa/package: migrate acl
Signed-off-by: Ophestra <cat@gensokyo.uk>
-rw-r--r--internal/rosa/acl.go110
-rw-r--r--internal/rosa/package/acl/libgen-basename.patch26
-rw-r--r--internal/rosa/package/acl/musl-errno.patch13
-rw-r--r--internal/rosa/package/acl/package.az47
4 files changed, 86 insertions, 110 deletions
diff --git a/internal/rosa/acl.go b/internal/rosa/acl.go
deleted file mode 100644
index 89a01cff..00000000
--- a/internal/rosa/acl.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package rosa
-
-import "hakurei.app/internal/pkg"
-
-func (t Toolchain) newAttr() (pkg.Artifact, string) {
- const (
- version = "2.5.2"
- checksum = "YWEphrz6vg1sUMmHHVr1CRo53pFXRhq_pjN-AlG8UgwZK1y6m7zuDhxqJhD0SV0l"
- )
- return t.NewPackage("attr", version, newTar(
- "https://download.savannah.nongnu.org/releases/attr/"+
- "attr-"+version+".tar.gz",
- checksum,
- pkg.TarGzip,
- ), &PackageAttr{
- Patches: []KV{
- {"libgen-basename", `From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Sat, 30 Mar 2024 10:17:10 +0100
-Subject: tools/attr.c: Add missing libgen.h include for basename(3)
-
-Fixes compilation issue with musl and modern C99 compilers.
-
-See: https://bugs.gentoo.org/926294
----
- tools/attr.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/attr.c b/tools/attr.c
-index f12e4af..6a3c1e9 100644
---- a/tools/attr.c
-+++ b/tools/attr.c
-@@ -28,6 +28,7 @@
- #include <errno.h>
- #include <string.h>
- #include <locale.h>
-+#include <libgen.h>
-
- #include <attr/attributes.h>
-
---
-cgit v1.1`},
-
- {"musl-errno", `diff --git a/test/attr.test b/test/attr.test
-index 6ce2f9b..e9bde92 100644
---- a/test/attr.test
-+++ b/test/attr.test
-@@ -11,7 +11,7 @@ Try various valid and invalid names
-
- $ touch f
- $ setfattr -n user -v value f
-- > setfattr: f: Operation not supported
-+ > setfattr: f: Not supported
-
- $ setfattr -n user. -v value f
- > setfattr: f: Invalid argument
-`},
- },
-
- ScriptEarly: `
-ln -s ../../system/bin/perl /usr/bin
-`,
- }, (*MakeHelper)(nil),
- Perl,
- ), version
-}
-func init() {
- native.MustRegister(&Artifact{
- f: Toolchain.newAttr,
-
- Name: "attr",
- Description: "Commands for Manipulating Filesystem Extended Attributes",
- Website: "https://savannah.nongnu.org/projects/attr/",
-
- ID: 137,
- })
-}
-
-func (t Toolchain) newACL() (pkg.Artifact, string) {
- const (
- version = "2.3.2"
- checksum = "-fY5nwH4K8ZHBCRXrzLdguPkqjKI6WIiGu4dBtrZ1o0t6AIU73w8wwJz_UyjIS0P"
- )
- return t.NewPackage("acl", version, newTar(
- "https://download.savannah.nongnu.org/releases/acl/"+
- "acl-"+version+".tar.gz",
- checksum,
- pkg.TarGzip,
- ), nil, &MakeHelper{
- // makes assumptions about uid_map/gid_map
- SkipCheck: true,
- },
- Attr,
- ), version
-}
-func init() {
- native.MustRegister(&Artifact{
- f: Toolchain.newACL,
-
- Name: "acl",
- Description: "Commands for Manipulating POSIX Access Control Lists",
- Website: "https://savannah.nongnu.org/projects/acl/",
-
- Dependencies: P{
- Attr,
- },
-
- ID: 16,
- })
-}
diff --git a/internal/rosa/package/acl/libgen-basename.patch b/internal/rosa/package/acl/libgen-basename.patch
new file mode 100644
index 00000000..ed1e8459
--- /dev/null
+++ b/internal/rosa/package/acl/libgen-basename.patch
@@ -0,0 +1,26 @@
+From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Sat, 30 Mar 2024 10:17:10 +0100
+Subject: tools/attr.c: Add missing libgen.h include for basename(3)
+
+Fixes compilation issue with musl and modern C99 compilers.
+
+See: https://bugs.gentoo.org/926294
+---
+ tools/attr.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/attr.c b/tools/attr.c
+index f12e4af..6a3c1e9 100644
+--- a/tools/attr.c
++++ b/tools/attr.c
+@@ -28,6 +28,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <locale.h>
++#include <libgen.h>
+
+ #include <attr/attributes.h>
+
+--
+cgit v1.1 \ No newline at end of file
diff --git a/internal/rosa/package/acl/musl-errno.patch b/internal/rosa/package/acl/musl-errno.patch
new file mode 100644
index 00000000..7ac0d071
--- /dev/null
+++ b/internal/rosa/package/acl/musl-errno.patch
@@ -0,0 +1,13 @@
+diff --git a/test/attr.test b/test/attr.test
+index 6ce2f9b..e9bde92 100644
+--- a/test/attr.test
++++ b/test/attr.test
+@@ -11,7 +11,7 @@ Try various valid and invalid names
+
+ $ touch f
+ $ setfattr -n user -v value f
+- > setfattr: f: Operation not supported
++ > setfattr: f: Not supported
+
+ $ setfattr -n user. -v value f
+ > setfattr: f: Invalid argument
diff --git a/internal/rosa/package/acl/package.az b/internal/rosa/package/acl/package.az
new file mode 100644
index 00000000..cdf9d649
--- /dev/null
+++ b/internal/rosa/package/acl/package.az
@@ -0,0 +1,47 @@
+package attr {
+ description = "Commands for Manipulating Filesystem Extended Attributes";
+ website = "https://savannah.nongnu.org/projects/attr";
+ anitya = 137;
+
+ version* = "2.5.2";
+ source = remoteTar {
+ url = "https://download.savannah.nongnu.org/releases/attr/"+
+ "attr-"+version+".tar.gz";
+ checksum = "YWEphrz6vg1sUMmHHVr1CRo53pFXRhq_pjN-AlG8UgwZK1y6m7zuDhxqJhD0SV0l";
+ compress = gzip;
+ };
+ patches = [
+ "libgen-basename.patch",
+ "musl-errno.patch",
+ ];
+
+ early = `
+ln -s ../../system/bin/perl /usr/bin
+`;
+
+ exec = make {};
+
+ inputs = [ perl ];
+}
+
+package acl {
+ description = "Commands for Manipulating POSIX Access Control Lists";
+ website = "https://savannah.nongnu.org/projects/acl";
+ anitya = 16;
+
+ version* = "2.3.2";
+ source = remoteTar {
+ url = "https://download.savannah.nongnu.org/releases/acl/"+
+ "acl-"+version+".tar.gz";
+ checksum = "-fY5nwH4K8ZHBCRXrzLdguPkqjKI6WIiGu4dBtrZ1o0t6AIU73w8wwJz_UyjIS0P";
+ compress = gzip;
+ };
+
+ exec = make {
+ // makes assumptions about uid_map/gid_map
+ skipCheck = true;
+ };
+
+ inputs = [ attr ];
+ runtime = [ attr ];
+}