diff --git a/community/step-cli/01-fix-tests.patch b/community/step-cli/01-fix-tests.patch deleted file mode 100644 index fc0e43f79e1..00000000000 --- a/community/step-cli/01-fix-tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Dermot Bradley -Date: Sat, 4 Dec 2022 22:37 +0000 -Subject: [PATCH] build gotestsum so tests run - -step-cli 0.23.0 started using gotestsum for tests but didn't actually -build the gotestsum program. - ---- - -diff -aur a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -88,7 +88,8 @@ - ######################################### - - test: -- $Q $(CGO_OVERRIDE) $(GOFLAGS) gotestsum -- -coverprofile=coverage.out -short -covermode=atomic ./... -+ $Q go install gotest.tools/gotestsum@latest -+ $Q $(CGO_OVERRIDE) ~/go/bin/gotestsum -- -coverprofile=coverage.out -short -covermode=atomic ./... - - race: - $Q $(CGO_OVERRIDE) $(GOFLAGS) gotestsum -- -race ./... diff --git a/community/step-cli/02-fix-install-destdir.patch b/community/step-cli/02-fix-install-destdir.patch deleted file mode 100644 index 8aa2a326e88..00000000000 --- a/community/step-cli/02-fix-install-destdir.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Wolfgang Fischer -Date: Sun, 28 Jul 2024 18:05 +0000 -Subject: [PATCH] fix install with DESTDIR - -step-cli 0.27.0 changed the default install path to /ust/local. -Fix the Makefile so that the DESTDIR is used to create the install directory - ---- - -diff --git a/Makefile b/Makefile -index b2fdf70a..623a0b95 100644 ---- a/Makefile -+++ b/Makefile -@@ -128,7 +128,7 @@ govulncheck: - INSTALL_PREFIX?=/usr/local/ - - install: $(PREFIX)bin/$(BINNAME) -- $Q mkdir -p $(INSTALL_PREFIX)bin/ -+ $Q mkdir -p $(DESTDIR)$(INSTALL_PREFIX)bin - $Q install $(PREFIX)bin/$(BINNAME) $(DESTDIR)$(INSTALL_PREFIX)bin/$(BINNAME) - - uninstall: - diff --git a/community/step-cli/APKBUILD b/community/step-cli/APKBUILD index 5e4b50c8cb8..c0fcb6ddc3f 100644 --- a/community/step-cli/APKBUILD +++ b/community/step-cli/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Dermot Bradley # Maintainer: pkgname=step-cli -pkgver=0.27.2 +pkgver=0.27.4 pkgrel=0 pkgdesc="Zero trust swiss army knife that integrates with step-ca for automated certificate management" url="https://github.com/smallstep/cli" @@ -20,8 +20,6 @@ subpackages=" " source=" $pkgname-$pkgver.tar.gz::https://github.com/smallstep/cli/archive/refs/tags/v$pkgver.tar.gz - 01-fix-tests.patch - 02-fix-install-destdir.patch " options="net" builddir="$srcdir/cli-$pkgver" @@ -35,11 +33,11 @@ build() { } check() { - make CGO_OVERRIDE= test + go test -trimpath=false ./... } package() { - make CGO_OVERRIDE= DESTDIR="$pkgdir" INSTALL_PREFIX=/usr/ install + make CGO_OVERRIDE= DESTDIR="$pkgdir"/usr/bin install install -Dm644 autocomplete/bash_autocomplete \ "$pkgdir"/usr/share/bash-completion/completions/step @@ -49,7 +47,5 @@ package() { } sha512sums=" -f2b9c4e4775e9925d430773da15c2b873d3b6d4eb67333a190becf02163db4b9a2b3ed910e050bd669a916f3111b499ecdea38be26836330df42bf37e6116a27 step-cli-0.27.2.tar.gz -3902f18ca36ee379c7d67fa990d505c43fcbdedb3dab5a1a42ea356be45961c57e81f5906eb93b93d92abbe3a6f7ae70d8a92407460886920c1d9a3a58bf81f7 01-fix-tests.patch -f3d63672b5b74dfe5afc0e64135c45187530bf1c630ad97cc3f44c92039d2e6c974bdf0aeca46b79b3759ac19f574267f6b2d2407ecde3bd6b5767f6a549081b 02-fix-install-destdir.patch +80945ee6a159a9d838d2ce1040f7132a51a9bb3c1c72868a24864d2526f33eec2c2ef24119a3b0e778e1316eb3346884af542320d068ed2e4abcaea2f794cfe6 step-cli-0.27.4.tar.gz "