commit: 6a2ed20f7ded20744b414299aaaa362aaf1c7d10 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Sun Sep 13 20:43:42 2020 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Sun Sep 13 22:12:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2ed20f
sys-cluster/kubeadm: 1.17.11, 1.18.8 and 1.19.1 bump Bug: https://bugs.gentoo.org/741572 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> sys-cluster/kubeadm/Manifest | 5 ++-- ...ubeadm-1.17.3.ebuild => kubeadm-1.17.11.ebuild} | 28 ++++++++++------------ ...kubeadm-1.17.4.ebuild => kubeadm-1.18.8.ebuild} | 28 ++++++++++------------ ...kubeadm-1.17.3.ebuild => kubeadm-1.19.1.ebuild} | 28 ++++++++++------------ 4 files changed, 39 insertions(+), 50 deletions(-) diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest index f9ef447aa84..2e19879ebb4 100644 --- a/sys-cluster/kubeadm/Manifest +++ b/sys-cluster/kubeadm/Manifest @@ -1,2 +1,3 @@ -DIST kubernetes-1.17.3.tar.gz 31762013 BLAKE2B 4470fadf2ec441ed7a5f3a82581af6a0f4d768780048576863b2aae9c13cff543592da73b979c7f9191a4c7c2b5a1ad10d85e0eba04fdcd08ece86884ab1f80d SHA512 09b33377de0bdd7dc8ac2ae81196d15eeb93862cb0aba1256bcfca38d2ce1f15951ad70cf67600fc3d16c1d449e0451707e756ec21ad812c6628ae1f0fdda427 -DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549 +DIST kubeadm-1.17.11.tar.gz 31829687 BLAKE2B 9684536fb19611f7da3889358bfa6044aebba8e5d3be83d7afe47ecd392d2f52011959abb1c1d4edcf3c48c8b499d40cc4e1d7751af3cfeadda16a33f3df67c3 SHA512 13853bd099c110df9f2dcf25e461c3c14aca48d77a3eaa6c040a4358edfa31462d0702e0544a187a17521e520ab7b545a6aeabfbfa2930946e15118e82a12369 +DIST kubeadm-1.18.8.tar.gz 32619514 BLAKE2B cdeff1d4400e69bee3f675a6a8c111ec6c5e79d1a8610d986ad37891b6ffc6b12460503004803373a5e87d6eae5517bfc6278d6a2aced6a3f414a460a0177bec SHA512 04d41c3ce15b7679c7d605659c5c02873338d0d1e48d2b655852a31f897dd0842fc4eb839d132652b4483117b845b739b25cd219f12be0ef4d0058e6ea8f421e +DIST kubeadm-1.19.1.tar.gz 33338722 BLAKE2B ad9b36ec30049b721634f6725cab08f849407c7c1483c62694acdb6726932a212752586eb9849c0063309b52f90da05ef1f36603f292aa86ea1e3b1feb439f73 SHA512 e07f850a5957cb7f48a1720c7cb269df60bacafb7ac86f4b211875e789551681909a2ddcf85a38a880156669f2b73ce1dd379d241238a52bc3cb34b44b706284 diff --git a/sys-cluster/kubeadm/kubeadm-1.17.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.17.11.ebuild similarity index 54% copy from sys-cluster/kubeadm/kubeadm-1.17.3.ebuild copy to sys-cluster/kubeadm/kubeadm-1.17.11.ebuild index a2529fec51c..5de1641ab6f 100644 --- a/sys-cluster/kubeadm/kubeadm-1.17.3.ebuild +++ b/sys-cluster/kubeadm/kubeadm-1.17.11.ebuild @@ -1,37 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit bash-completion-r1 go-module DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster" -HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"; -SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" +HOMEPAGE="https://kubernetes.io"; +SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" -DEPEND=">=dev-lang/go-1.13 - dev-go/go-bindata" +IUSE="hardened" -RESTRICT="test" -S="${WORKDIR}/kubernetes-${PV}" +BDEPEND="=dev-lang/go-1.14*" -src_prepare() { - default - sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" hack/lib/golang.sh || die - sed -i -e "/export PATH/d" hack/generate-bindata.sh || die -} +RESTRICT+=" test" +S="${WORKDIR}/kubernetes-${PV}" src_compile() { - LDFLAGS="" emake -j1 WHAT=cmd/${PN} GOFLAGS=-v - _output/bin/${PN} completion bash > ${PN}.bash || die - _output/bin/${PN} completion zsh > ${PN}.zsh || die + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ + emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} } src_install() { - dobin _output/bin/${PN} + dobin _output/bin/kubeadm + _output/bin/${PN} completion bash > ${PN}.bash || die + _output/bin/${PN} completion zsh > ${PN}.zsh || die newbashcomp ${PN}.bash ${PN} insinto /usr/share/zsh/site-functions newins ${PN}.zsh _${PN} diff --git a/sys-cluster/kubeadm/kubeadm-1.17.4.ebuild b/sys-cluster/kubeadm/kubeadm-1.18.8.ebuild similarity index 54% rename from sys-cluster/kubeadm/kubeadm-1.17.4.ebuild rename to sys-cluster/kubeadm/kubeadm-1.18.8.ebuild index a2529fec51c..5de1641ab6f 100644 --- a/sys-cluster/kubeadm/kubeadm-1.17.4.ebuild +++ b/sys-cluster/kubeadm/kubeadm-1.18.8.ebuild @@ -1,37 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit bash-completion-r1 go-module DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster" -HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"; -SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" +HOMEPAGE="https://kubernetes.io"; +SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" -DEPEND=">=dev-lang/go-1.13 - dev-go/go-bindata" +IUSE="hardened" -RESTRICT="test" -S="${WORKDIR}/kubernetes-${PV}" +BDEPEND="=dev-lang/go-1.14*" -src_prepare() { - default - sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" hack/lib/golang.sh || die - sed -i -e "/export PATH/d" hack/generate-bindata.sh || die -} +RESTRICT+=" test" +S="${WORKDIR}/kubernetes-${PV}" src_compile() { - LDFLAGS="" emake -j1 WHAT=cmd/${PN} GOFLAGS=-v - _output/bin/${PN} completion bash > ${PN}.bash || die - _output/bin/${PN} completion zsh > ${PN}.zsh || die + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ + emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} } src_install() { - dobin _output/bin/${PN} + dobin _output/bin/kubeadm + _output/bin/${PN} completion bash > ${PN}.bash || die + _output/bin/${PN} completion zsh > ${PN}.zsh || die newbashcomp ${PN}.bash ${PN} insinto /usr/share/zsh/site-functions newins ${PN}.zsh _${PN} diff --git a/sys-cluster/kubeadm/kubeadm-1.17.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.19.1.ebuild similarity index 54% rename from sys-cluster/kubeadm/kubeadm-1.17.3.ebuild rename to sys-cluster/kubeadm/kubeadm-1.19.1.ebuild index a2529fec51c..5a0d1c3289f 100644 --- a/sys-cluster/kubeadm/kubeadm-1.17.3.ebuild +++ b/sys-cluster/kubeadm/kubeadm-1.19.1.ebuild @@ -1,37 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit bash-completion-r1 go-module DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster" -HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"; -SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz" +HOMEPAGE="https://kubernetes.io"; +SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" -DEPEND=">=dev-lang/go-1.13 - dev-go/go-bindata" +IUSE="hardened" -RESTRICT="test" -S="${WORKDIR}/kubernetes-${PV}" +# BDEPEND="=dev-lang/go-1.14*" -src_prepare() { - default - sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" hack/lib/golang.sh || die - sed -i -e "/export PATH/d" hack/generate-bindata.sh || die -} +RESTRICT+=" test" +S="${WORKDIR}/kubernetes-${PV}" src_compile() { - LDFLAGS="" emake -j1 WHAT=cmd/${PN} GOFLAGS=-v - _output/bin/${PN} completion bash > ${PN}.bash || die - _output/bin/${PN} completion zsh > ${PN}.zsh || die + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ + emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} } src_install() { - dobin _output/bin/${PN} + dobin _output/bin/kubeadm + _output/bin/${PN} completion bash > ${PN}.bash || die + _output/bin/${PN} completion zsh > ${PN}.zsh || die newbashcomp ${PN}.bash ${PN} insinto /usr/share/zsh/site-functions newins ${PN}.zsh _${PN}
