Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-misc/spire
diff options
context:
space:
mode:
Diffstat (limited to 'app-misc/spire')
-rw-r--r--app-misc/spire/Manifest8
-rw-r--r--app-misc/spire/metadata.xml5
-rw-r--r--app-misc/spire/spire-1.3.3.ebuild (renamed from app-misc/spire/spire-0.8.1.ebuild)53
-rw-r--r--app-misc/spire/spire-1.7.1.ebuild56
-rw-r--r--app-misc/spire/spire-1.8.7.ebuild57
5 files changed, 146 insertions, 33 deletions
diff --git a/app-misc/spire/Manifest b/app-misc/spire/Manifest
index abc65fce4f9a..d7d034e92078 100644
--- a/app-misc/spire/Manifest
+++ b/app-misc/spire/Manifest
@@ -1,2 +1,6 @@
-DIST spire-0.8.1-vendor.tar.gz 10550551 BLAKE2B 4ab04c0e4de231097620a015f523ed9d7e0d6872425826e4bc3572f920a4d3de5174cb78f4ed61340ffc1abe3e25d42e8735228b142b424c85ef24fac52740ca SHA512 879cba4eaa681814858fa7965b28d0217d4ae806c979d348cb6d5f413dca7f03f99c34b8dcdbc0dad8e5253990a473962b9c1438ba79bef5fe757df11c7f4ee7
-DIST spire-0.8.1.tar.gz 1070262 BLAKE2B 7e30ac233759f2fed7476a82d072c4ec7815346cb50419b10ac7c5ce566aae6e783a51284a39847d63c04b0e398aab7ad15d94ea4e05569b43e762abfadaf550 SHA512 aa864f3f1d0faa8b7bfa527effde244957f9b30c6f115e49819777b6f3a5ea751ed751ac19b94a45d02aa22e719e6bd6e33355f9b561bbc5458d5997d95a1437
+DIST spire-1.3.3-deps.tar.xz 248328956 BLAKE2B 3d07927bad4490c6c87af97cd1c70350c3534993bd907a42b8bd06e31b446f930939e7530d76f771961c07d67f513f2d4f43b1608226701feb21ae18508663e1 SHA512 2d32b2705013f3148a0c26aa77bdf2234233c060b449bcbd73df417e7a9aef254a3fc066cf95b21a03f41cbcf918f23c5d56ad1c83859e8a1360c5a2208bb470
+DIST spire-1.3.3.tar.gz 2426257 BLAKE2B 743a497f37edacd11e21dbd2f89b565b7133d3a098cca9c6fbc0ffd3019b00ac0adac90c68d487fd20aee599a4030aeb03496bb78cd01a5c162cad5087cd8646 SHA512 9417aa53725a893b8b3da59fe8ae15bcbdb650a05dd94065b3ad5d6621a2d2225ef211ed67397094d1b61465d34c1731e4c0d88edd93f6db5ce11f76fad342d6
+DIST spire-1.7.1-deps.tar.xz 435155484 BLAKE2B 90398480e1222960c42cdf0153625f7478ad6c840623dcd40556e0a26c98f5bf24e47af2d47b61f682508c07b9b8d5288499107777efaeb747826bc82a077aae SHA512 da8219000399562770c8c004f0588ada40c45f2d576516e67c958b6c6b4a30b5bbea03986233f5103e66ab1bbe4b9bfb5fb8ef00898b18d4d49ae29f54a7a7a5
+DIST spire-1.7.1.tar.gz 2576518 BLAKE2B af749dd0c26cadfc616658a89a08c99341f527fa090d5c5df76a2a0c258524ede4efc977e2f805cc7be433de0131c69e12c31a6fd2a1b4c5d2d7d3ea43b720d9 SHA512 87979d20074aab358c304de476a6a83aa8f92b0eb8107ab034333934e9bf7067d8015f86fc0b7ff15a015ebe155d74848b6a5ec190e3d72360c45348351f4a10
+DIST spire-1.8.7-deps.tar.xz 393031212 BLAKE2B 474f17eb65063b059f08ed297c9382aa5c257ed0bf20ae2834bd49bade6c6eba9fc8be75ebf4dc011f8357c8ca223811352fadbd5310fdb28b442aed52425d9f SHA512 78a207b4a1349a8c95c90f4f97404a2484f681c834204f89679377ade2c5b133173bb5faea69099f081e963ea2f7ce11d7c56523ea9ef5569e0b9827d2b3ee95
+DIST spire-1.8.7.tar.gz 2628189 BLAKE2B d3aac37fedf0035191dfef58a947b3da7551ba223b351ce575d07e3ff82266be7413b12759d9d2aa238fbd66b30c75922c7e9b341c8c31c7b9b7f6ccef038a2f SHA512 0cf4ea63765cde51356623f365e4d9544fbb2437de846cfb05ad33d9507d4a70379dd9cb0e6e98820deba9cacd2bb6a51af5dff09901fe73c5296a0828269044
diff --git a/app-misc/spire/metadata.xml b/app-misc/spire/metadata.xml
index c36c37139fad..55969a3d8a87 100644
--- a/app-misc/spire/metadata.xml
+++ b/app-misc/spire/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">spiffe/spire</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-misc/spire/spire-0.8.1.ebuild b/app-misc/spire/spire-1.3.3.ebuild
index 552104b1bd85..78c6cff9bd21 100644
--- a/app-misc/spire/spire-0.8.1.ebuild
+++ b/app-misc/spire/spire-1.3.3.ebuild
@@ -1,52 +1,44 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-VENDOR_URI="https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz"
+EAPI=8
+inherit go-module
DESCRIPTION="the spiffe runtime environment"
HOMEPAGE="https://github.com/spiffe/spire"
-SRC_URI="https://github.com/spiffe/spire/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${VENDOR_URI}"
+SRC_URI="https://github.com/spiffe/spire/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"
-IUSE=""
COMMON_DEPEND="acct-group/spire
acct-user/spire"
-DEPEND="${COMMON_DEPEND}
- dev-lang/go"
+DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
-RESTRICT="strip"
-
-src_prepare() {
- default
- mv ../vendor . || die "Unable to move ../vendor directory"
+src_compile() {
+ local targets v
+ targets=(
+ bin/spire-server
+ bin/spire-agent
+ bin/k8s-workload-registrar
+ bin/oidc-discovery-provider
+ )
+ v=$(go version | cut -d ' ' -f 3) || die
+ v=${v#go}
+ emake go_version_full="${v}" "${targets[@]}"
}
-do_cmd() {
- if [[ -z "$@" ]]; then
- die "No arguments passed to do_cmd"
- fi
- echo $@
- $@ || die
-}
-
-src_compile() {
-do_cmd cd cmd/spire-agent
- do_cmd go build -mod vendor -o ../../spire-agent
-do_cmd cd ../../cmd/spire-server
- do_cmd go build -mod vendor -o ../../spire-server
+src_test() {
+ go test ./... || die "tests failed"
}
src_install() {
exeinto /opt/spire
- doexe spire-agent spire-server
+ doexe bin/*
keepdir /opt/spire/.data
- fowners spire:spire /opt/spire/.data
insinto /etc/spire
doins -r conf/*
dosym ../../etc/spire /opt/spire/conf
@@ -56,6 +48,7 @@ src_install() {
newinitd "${FILESDIR}"/spire-agent.initd spire-agent
newconfd "${FILESDIR}"/spire-server.confd spire-server
newinitd "${FILESDIR}"/spire-server.initd spire-server
-keepdir /var/log/spire
-fowners spire:spire /var/log/spire
+ keepdir /var/log/spire
+ fowners spire:spire /opt/spire/.data
+ fowners spire:spire /var/log/spire
}
diff --git a/app-misc/spire/spire-1.7.1.ebuild b/app-misc/spire/spire-1.7.1.ebuild
new file mode 100644
index 000000000000..43c7a6704c24
--- /dev/null
+++ b/app-misc/spire/spire-1.7.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+git_tag=${PV}
+git_hash=1b775d5
+inherit go-module
+
+DESCRIPTION="the spiffe runtime environment"
+HOMEPAGE="https://github.com/spiffe/spire"
+SRC_URI="https://github.com/spiffe/spire/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"
+
+COMMON_DEPEND="acct-group/spire
+ acct-user/spire"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+src_compile() {
+ local go_ldflags+="
+ -X github.com/spiffe/spire/pkg/common/version.gittag=${PV}
+ -X github.com/spiffe/spire/pkg/common/version.githash=${git_hash}"
+ ego build -ldflags "${go_ldflags}" \
+ -o bin/spire-agent ./cmd/spire-agent
+ ego build -ldflags "${go_ldflags}" \
+ -o bin/spire-server ./cmd/spire-server
+}
+
+src_test() {
+ go test ./... || die "tests failed"
+}
+
+src_install() {
+ exeinto /opt/spire
+ doexe bin/*
+ keepdir /opt/spire/.data
+ insinto /etc/spire
+ doins -r conf/*
+ dosym ../../etc/spire /opt/spire/conf
+ dosym ../../opt/spire/spire-agent /usr/bin/spire-agent
+ dosym ../../opt/spire/spire-server /usr/bin/spire-server
+dodoc -r doc/*
+ newconfd "${FILESDIR}"/spire-agent.confd spire-agent
+ newinitd "${FILESDIR}"/spire-agent.initd spire-agent
+ newconfd "${FILESDIR}"/spire-server.confd spire-server
+ newinitd "${FILESDIR}"/spire-server.initd spire-server
+ keepdir /var/log/spire
+ fowners spire:spire /opt/spire/.data
+ fowners spire:spire /var/log/spire
+}
diff --git a/app-misc/spire/spire-1.8.7.ebuild b/app-misc/spire/spire-1.8.7.ebuild
new file mode 100644
index 000000000000..ddcde826f9ad
--- /dev/null
+++ b/app-misc/spire/spire-1.8.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+git_tag=${PV}
+git_hash=50dd676
+
+DESCRIPTION="the spiffe runtime environment"
+HOMEPAGE="https://github.com/spiffe/spire"
+SRC_URI="https://github.com/spiffe/spire/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"
+
+COMMON_DEPEND="acct-group/spire
+ acct-user/spire"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+src_compile() {
+ local go_ldflags+="
+ -X github.com/spiffe/spire/pkg/common/version.gittag=${PV}
+ -X github.com/spiffe/spire/pkg/common/version.githash=${git_hash}"
+ ego build -ldflags "${go_ldflags}" \
+ -o bin/spire-agent ./cmd/spire-agent
+ ego build -ldflags "${go_ldflags}" \
+ -o bin/spire-server ./cmd/spire-server
+}
+
+src_test() {
+ go test ./... || die "tests failed"
+}
+
+src_install() {
+ exeinto /opt/spire
+ doexe bin/*
+ keepdir /opt/spire/.data
+ insinto /etc/spire
+ doins -r conf/*
+ dosym ../../etc/spire /opt/spire/conf
+ dosym ../../opt/spire/spire-agent /usr/bin/spire-agent
+ dosym ../../opt/spire/spire-server /usr/bin/spire-server
+dodoc -r doc/*
+ newconfd "${FILESDIR}"/spire-agent.confd spire-agent
+ newinitd "${FILESDIR}"/spire-agent.initd spire-agent
+ newconfd "${FILESDIR}"/spire-server.confd spire-server
+ newinitd "${FILESDIR}"/spire-server.initd spire-server
+ keepdir /var/log/spire
+ fowners spire:spire /opt/spire/.data
+ fowners spire:spire /var/log/spire
+}