From 0594e8e94c6c719fb5a8e106fd8b8c36939e9b69 Mon Sep 17 00:00:00 2001 From: DWwanghao Date: Fri, 25 Jul 2025 11:31:57 +0800 Subject: [PATCH] testing/plakar: enable on all architectures --- testing/plakar/APKBUILD | 12 ++++--- testing/plakar/update-go-mod.patch | 36 +++++++++++++++++++ .../plakar/update-syscall-Dup2-to-Dup3.patch | 16 +++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 testing/plakar/update-go-mod.patch create mode 100644 testing/plakar/update-syscall-Dup2-to-Dup3.patch diff --git a/testing/plakar/APKBUILD b/testing/plakar/APKBUILD index 1b89f27b3e4..54425ef2132 100644 --- a/testing/plakar/APKBUILD +++ b/testing/plakar/APKBUILD @@ -2,16 +2,16 @@ # Maintainer: Guy Godfroy pkgname=plakar pkgver=1.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="backup solution powered by Kloset and ptar" url="https://plakar.io/" -# aarch64 and riskv64: build fails (undefined syscall.Dup2) -# loongarch64: build fails (undefined _C_uint abd _C_int) -arch="all !aarch64 !riscv64 !loongarch64" +arch="all" license="ISC" makedepends="go" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/PlakarKorp/plakar/archive/refs/tags/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/PlakarKorp/plakar/archive/refs/tags/v$pkgver.tar.gz + update-go-mod.patch + update-syscall-Dup2-to-Dup3.patch" options="net" #go deps build() { @@ -31,4 +31,6 @@ package() { sha512sums=" 8c7f7f044fa9d10c03dd8905f5311ee5c2a9e5378fac376c86b704ebe1b4bd864918f8236418ef16ab6eb331dede682931873f6645b096eda804e9de3ff21c7f plakar-1.0.2.tar.gz +d9205c4a39e0c3a10c0de6031eb505a69184bb85149c371388888745eab9c7851fa71302e9fbffa27cceac475e48153827ba0e16a9a6bba0ed17416b93b48ad4 update-go-mod.patch +0c313be07cc49182d2be66931a3ea709440022c98ac19fec04a18ee3f0c2e2872c335ad2727c97216b9a4e4f1ad0a21228c6bf39d26de0108f5794d947fab161 update-syscall-Dup2-to-Dup3.patch " diff --git a/testing/plakar/update-go-mod.patch b/testing/plakar/update-go-mod.patch new file mode 100644 index 00000000000..4799434b9ab --- /dev/null +++ b/testing/plakar/update-go-mod.patch @@ -0,0 +1,36 @@ +diff --git a/go.mod b/go.mod +index 09d45a8..14dfcf1 100644 +--- a/go.mod ++++ b/go.mod +@@ -11,7 +11,7 @@ require ( + github.com/charmbracelet/lipgloss v1.1.0 + github.com/charmbracelet/log v0.4.1 + github.com/cockroachdb/pebble/v2 v2.0.3 +- github.com/creack/pty v1.1.9 ++ github.com/creack/pty v1.1.24 + github.com/denisbrodbeck/machineid v1.0.1 + github.com/dustin/go-humanize v1.0.1 + github.com/gabriel-vasile/mimetype v1.4.8 +@@ -40,7 +40,6 @@ require ( + go.omarpolo.com/ttlmap v0.0.0-20231012080932-0154c95c7516 + golang.org/x/crypto v0.36.0 + golang.org/x/mod v0.24.0 +- golang.org/x/oauth2 v0.25.0 + golang.org/x/sync v0.12.0 + golang.org/x/term v0.30.0 + golang.org/x/tools v0.31.0 +diff --git a/go.sum b/go.sum +index 3559121..7ba28cb 100644 +--- a/go.sum ++++ b/go.sum +@@ -76,8 +76,9 @@ github.com/cockroachdb/swiss v0.0.0-20250327203710-2932b022f6df h1:GUJ4KuZtbOcIf + github.com/cockroachdb/swiss v0.0.0-20250327203710-2932b022f6df/go.mod h1:yBRu/cnL4ks9bgy4vAASdjIW+/xMlFwuHKqtmh3GZQg= + github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= + github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= +-github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= + github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= ++github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s= ++github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= + github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= diff --git a/testing/plakar/update-syscall-Dup2-to-Dup3.patch b/testing/plakar/update-syscall-Dup2-to-Dup3.patch new file mode 100644 index 00000000000..560221294ae --- /dev/null +++ b/testing/plakar/update-syscall-Dup2-to-Dup3.patch @@ -0,0 +1,16 @@ +diff --git a/cmd/plakar/subcommands/create/create_test.go b/cmd/plakar/subcommands/create/create_test.go +index 289f76c..bf0e92e 100644 +--- a/cmd/plakar/subcommands/create/create_test.go ++++ b/cmd/plakar/subcommands/create/create_test.go +@@ -117,9 +117,9 @@ func TestExecuteCmdCreateDefaultWeakPassword(t *testing.T) { + // Duplicate the tty file descriptor to syscall.Stdin (fd 0) + originalStdin, err := syscall.Dup(syscall.Stdin) + require.NoError(t, err) +- defer syscall.Dup2(originalStdin, syscall.Stdin) ++ defer syscall.Dup3(originalStdin, syscall.Stdin,0) + +- err = syscall.Dup2(int(tty.Fd()), syscall.Stdin) ++ err = syscall.Dup3(int(tty.Fd()), syscall.Stdin,0) + require.NoError(t, err) + + ctx := appcontext.NewAppContext()