public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-containers/cosign/, app-containers/cosign/files/
@ 2022-07-18 21:18 William Hubbs
  0 siblings, 0 replies; 2+ messages in thread
From: William Hubbs @ 2022-07-18 21:18 UTC (permalink / raw
  To: gentoo-commits

commit:     122554606fbd45982deea10318d6dae677ec572f
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 21:16:21 2022 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 21:17:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12255460

app-containers/cosign-1.8.0: drop unneeded patch

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-containers/cosign/cosign-1.8.0.ebuild                   |  6 +-----
 app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch | 13 -------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/app-containers/cosign/cosign-1.8.0.ebuild b/app-containers/cosign/cosign-1.8.0.ebuild
index 3728305931f0..d70505278ce2 100644
--- a/app-containers/cosign/cosign-1.8.0.ebuild
+++ b/app-containers/cosign/cosign-1.8.0.ebuild
@@ -14,15 +14,11 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-fix-makefile.patch
-)
-
 RESTRICT="test"
 
 src_compile() {
 	emake \
-		GIT_HASH=${GIT_HASH}
+		GIT_HASH=${GIT_HASH} \
 		GIT_VERSION=v${PV} \
 		GIT_TREESTATE=clean
 }

diff --git a/app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch b/app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch
deleted file mode 100644
index 15cdc7511136..000000000000
--- a/app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile	2022-01-22 16:06:02.000000000 -0500
-+++ b/Makefile	2022-01-27 15:06:43.986094208 -0500
-@@ -71,8 +71,8 @@
- checkfmt: SHELL := /usr/bin/env bash
- checkfmt: ## Check formatting of all go files
- 	@ $(MAKE) --no-print-directory log-$@
-- 	$(shell test -z "$(shell gofmt -l $(GOFILES) | tee /dev/stderr)")
-- 	$(shell test -z "$(shell goimports -l $(GOFILES) | tee /dev/stderr)")
-+	$(shell test -z "$(shell gofmt -l $(GOFILES) | tee /dev/stderr)")
-+	$(shell test -z "$(shell goimports -l $(GOFILES) | tee /dev/stderr)")
- 
- .PHONY: fmt
- fmt: ## Format all go files


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-containers/cosign/, app-containers/cosign/files/
@ 2022-10-17 14:39 William Hubbs
  0 siblings, 0 replies; 2+ messages in thread
From: William Hubbs @ 2022-10-17 14:39 UTC (permalink / raw
  To: gentoo-commits

commit:     1d6cb09ba0620b498bac7aea3f8830301b51e403
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 14:38:12 2022 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 14:39:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d6cb09b

app-containers/cosign: drop 1.10.0, 1.12.1

Bug: https://bugs.gentoo.org/864436
Bug: https://bugs.gentoo.org/870160
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-containers/cosign/Manifest                     |  4 ---
 app-containers/cosign/cosign-1.10.0.ebuild         | 33 ------------------
 app-containers/cosign/cosign-1.12.1.ebuild         | 29 ----------------
 .../cosign/files/cosign-1.10.0-fix-makefile.patch  | 40 ----------------------
 4 files changed, 106 deletions(-)

diff --git a/app-containers/cosign/Manifest b/app-containers/cosign/Manifest
index e6e6ee07ff1d..1d7e2d82d660 100644
--- a/app-containers/cosign/Manifest
+++ b/app-containers/cosign/Manifest
@@ -1,6 +1,2 @@
-DIST cosign-1.10.0-deps.tar.xz 393342088 BLAKE2B 527a143a1a81b86c8d2d2186c6e18111aa46a7cd908c77bf8f6cc7ebd53a4a8461168dacf46d97dc7e2a14d9e7fe1d7cc59cd81a4fd695177863ec5893577ba3 SHA512 9b764f7d642fd2b7ad3210d7b0fe16b1d5d24ea581266e4f43b0039cb63b1dfbac8fa6826d0359ac3a85575fb03562938ced72e6673fe9a5a4fe85601001adba
-DIST cosign-1.10.0.tar.gz 7140596 BLAKE2B 796ada75ce24ba8d2c7ad8702b9abeb82fd3ae75decac58c8e95f41bda7420056659cf76b4d79a1eaf3e3752c91ebb5da7bbb8bfbcfc0e99bea335ee7566183d SHA512 8ce41349737835945b0a5fe66d9b87b8747301c4e067db305ad7fc573bb8e86b2c6ae787944e01f8490a6db7aba72c33e285f098d0b7c710f1e54814a9cb2cdd
-DIST cosign-1.12.1-deps.tar.xz 383293220 BLAKE2B d409b64f47c780afcb5e500520c798cdc3035ea773b5f121d1269755edefe43f8a7445072b565accc20507e7e536cc7dab8ea250076a0652127e123b3d1809d2 SHA512 ed0e040f392178ddc954f1e38f4d5562c9840fcfa22a24024c8f20857b4b7f281ba525bbb28286cb883fbd82e11ce74c642d6261c79375f35dcd98da4332ef51
-DIST cosign-1.12.1.tar.gz 6638172 BLAKE2B f748e993cc2c37a67c42255b8c08ca6471c31fb02251ca7d42b8c7e85003aa879907421fc2df2bd8e0e4080865b33ceeafd47fd7b538969bd80f3b566e6aecf8 SHA512 ed53561a37a308481f158acf91e8cdb0dea8d348eb3cc30b3f882717fd18defc6cac330131c5b93609b587c2b8cefa000b1e1a9de5d0a070534f05aa09c55bd9
 DIST cosign-1.13.0-deps.tar.xz 381161148 BLAKE2B 63d4423c441fbf933ac7614ba5c2b0611b274be58f7e1c65528d02777a0da6ffc224e093135c0ec56b6a067dfc8f1a80216a75cac9fd31467c815519fdc48ae4 SHA512 03950de39b324708aefb0d5be44a04ebab913bd06c4ecc9dff8a15c9c044c40e4330c924e1b79d91a954bc711d96d5ce92705d85c148e67a5d6239f1b4a1d526
 DIST cosign-1.13.0.tar.gz 6645872 BLAKE2B e909f87cac45dce155eb0185f3bb94dadad4aeea94b04937f288fa8d1a426028659f0277b8c4ab2c34778b7a948968fca040486257c357ef38dedfee400df792 SHA512 341928ecd7416cb4fd3023176e1f8a96f16b536810b9ea1b91d91051bfc42bc04d1fd4d03b765e39539c33ac1f94da8204f2e65f6858bc4bf7607ea78bc033c9

diff --git a/app-containers/cosign/cosign-1.10.0.ebuild b/app-containers/cosign/cosign-1.10.0.ebuild
deleted file mode 100644
index 7adb2e5ed8d1..000000000000
--- a/app-containers/cosign/cosign-1.10.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GIT_HASH=3a6088d03d7c053f9b3bd61ed07fba92133579cf
-inherit go-module
-
-DESCRIPTION="container signing utility"
-HOMEPAGE="https://sigstore.dev"
-SRC_URI="https://github.com/sigstore/cosign/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-makefile.patch
-)
-
-src_compile() {
-	emake \
-		GIT_HASH=${GIT_HASH} \
-		GIT_VERSION=v${PV} \
-		GIT_TREESTATE=clean
-}
-
-src_install() {
-	dobin cosign
-	einstalldocs
-}

diff --git a/app-containers/cosign/cosign-1.12.1.ebuild b/app-containers/cosign/cosign-1.12.1.ebuild
deleted file mode 100644
index 694db96d6a32..000000000000
--- a/app-containers/cosign/cosign-1.12.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GIT_HASH=0baa044bea61e7c16d56023be20ead3d9204b24a
-inherit go-module
-
-DESCRIPTION="container signing utility"
-HOMEPAGE="https://sigstore.dev"
-SRC_URI="https://github.com/sigstore/cosign/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-src_compile() {
-	emake \
-		GIT_HASH=${GIT_HASH} \
-		GIT_VERSION=v${PV} \
-		GIT_TREESTATE=clean
-}
-
-src_install() {
-	dobin cosign
-	einstalldocs
-}

diff --git a/app-containers/cosign/files/cosign-1.10.0-fix-makefile.patch b/app-containers/cosign/files/cosign-1.10.0-fix-makefile.patch
deleted file mode 100644
index 5699bca5732c..000000000000
--- a/app-containers/cosign/files/cosign-1.10.0-fix-makefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 3b6dcb5..8981549 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,8 +20,6 @@ else
- GOBIN=$(shell go env GOBIN)
- endif
- 
--GOFILES ?= $(shell find . -type f -name '*.go' -not -path "./vendor/*")
--
- # Set version variables for LDFLAGS
- PROJECT_ID ?= projectsigstore
- RUNTIME_IMAGE ?= gcr.io/distroless/static
-@@ -72,18 +70,6 @@ log-%:
- 				printf "\033[36m==> %s\033[0m\n", $$2 \
- 			}'
- 
--.PHONY: checkfmt
--checkfmt: SHELL := /usr/bin/env bash
--checkfmt: ## Check formatting of all go files
--	@ $(MAKE) --no-print-directory log-$@
-- 	$(shell test -z "$(shell gofmt -l $(GOFILES) | tee /dev/stderr)")
-- 	$(shell test -z "$(shell goimports -l $(GOFILES) | tee /dev/stderr)")
--
--.PHONY: fmt
--fmt: ## Format all go files
--	@ $(MAKE) --no-print-directory log-$@
--	goimports -w $(GOFILES)
--
- cosign: $(SRCS)
- 	CGO_ENABLED=0 go build -trimpath -ldflags "$(LDFLAGS)" -o $@ ./cmd/cosign
- 
-@@ -121,7 +107,6 @@ clean:
- 	rm -rf sget
- 	rm -rf dist/
- 
--
- KOCACHE_PATH=/tmp/ko
- ARTIFACT_HUB_LABELS=--image-label io.artifacthub.package.readme-url="https://raw.githubusercontent.com/sigstore/cosign/main/README.md" \
-                     --image-label io.artifacthub.package.logo-url=https://raw.githubusercontent.com/sigstore/cosign/main/images/logo.svg \


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-10-17 14:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-17 14:39 [gentoo-commits] repo/gentoo:master commit in: app-containers/cosign/, app-containers/cosign/files/ William Hubbs
  -- strict thread matches above, loose matches on Subject: below --
2022-07-18 21:18 William Hubbs

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox