internal/rosa/acl: use patch helper

This is significantly less ugly.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 29 insertions, 22 deletions

diff --git a/internal/rosa/acl.go b/internal/rosa/acl.go
index ce03b1fb..7cd78af7 100644
--- a/internal/rosa/acl.go
+++ b/internal/rosa/acl.go
@@ -11,10 +11,23 @@ func (t Toolchain) newAttr() pkg.Artifact {
 		t.Load(Make),
 		t.Load(Perl),
 	}, nil, nil, `
-cd /usr/src/attr
-chmod +w tools
-patch -p 1 << EOF
-From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001
+ln -s ../../system/bin/perl /usr/bin
+
+cd "$(mktemp -d)"
+/usr/src/attr/configure \
+	--prefix=/system \
+	--build="${ROSA_TRIPLE}" \
+	--enable-static
+make "-j$(nproc)" check
+make DESTDIR=/work install
+`, pkg.Path(AbsUsrSrc.Append("attr"), true, t.NewPatchedSource(
+		"attr", version, pkg.NewHTTPGetTar(
+			nil,
+			"https://download.savannah.nongnu.org/releases/attr/"+
+				"attr-"+version+".tar.gz",
+			mustDecode(checksum),
+			pkg.TarGzip,
+		), true, [2]string{"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)
@@ -39,26 +52,20 @@ index f12e4af..6a3c1e9 100644
  #include <attr/attributes.h>
  
 -- 
-cgit v1.1
-EOF
+cgit v1.1`}, [2]string{"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
 
-chmod +w test
-sed -i 's/Operation not supported/Not supported/' test/attr.test
-ln -s ../../system/bin/perl /usr/bin
+        $ touch f
+        $ setfattr -n user -v value f
+-       > setfattr: f: Operation not supported
++       > setfattr: f: Not supported
 
-cd "$(mktemp -d)"
-/usr/src/attr/configure \
-	--prefix=/system \
-	--build="${ROSA_TRIPLE}" \
-	--enable-static
-make "-j$(nproc)" check
-make DESTDIR=/work install
-`, pkg.Path(AbsUsrSrc.Append("attr"), true, pkg.NewHTTPGetTar(
-		nil,
-		"https://download.savannah.nongnu.org/releases/attr/"+
-			"attr-"+version+".tar.gz",
-		mustDecode(checksum),
-		pkg.TarGzip,
+        $ setfattr -n user. -v value f
+        > setfattr: f: Invalid argument
+`},
 	)))
 }
 func init() { artifactsF[Attr] = Toolchain.newAttr }