gentoo resync : 20.03.2022

3 files changed, 58 insertions, 2 deletions

diff --git a/app-containers/flannel/Manifest b/app-containers/flannel/Manifest
index 0bfda6cebbe1..3036f90003dd 100644
--- a/app-containers/flannel/Manifest
+++ b/app-containers/flannel/Manifest
@@ -8,8 +8,10 @@ DIST flannel-0.14.0.tar.gz 8324790 BLAKE2B 47fd65d531f9fa10e602ccf1858549ede97d8
 DIST flannel-0.16.0.tar.gz 8697548 BLAKE2B a307990554a6cf215bef6ac75a544d00d8c6cd702f02e98efaf80b89d0ecf4592c1c338d1f80cf22ee086355ee7edb77492e6af587cbf037f38b6e3dbc4ac252 SHA512 7b80fe1e282c312b8b242d2201ecd164d87b551f4bc02d8375ca856c0dcfad2d31bd1b4041663016130b0bd7ebaf0062afe59c0946e97f10478142ca8ffd94f0
 DIST flannel-0.16.1.tar.gz 8697974 BLAKE2B bff4d5a6fe179129fa9ae494291301b25bc3ff9d6f4049b990f50b01920dfd20d149eb85339e2930b66dd060aca57f269a3b21fa508a3c95f5d152bbfb91631f SHA512 699ba7e7b80dd60a03bb5c6ee384a582201d8167ef21e60816ca9942a9d70ba0fd7633a3d2a44802f9f0a0851a79709afe78bd46f15ca81641ff64d46859f928
 DIST flannel-0.16.3.tar.gz 9531741 BLAKE2B 6a22b3d031dda538a0b64877eda4afbf5e9cbe6d39342325f54bcc5faf1b867c8eef6a9f2800ec9b872ed5c48d17aa23842f273a0fad862bffb99b9905045363 SHA512 965708d99401c4a6a32883181afbc1afccd2211589411272b6b93f225ec84373b95fa2be840d00c39364b8e4c1a8a3763a498523503ecb631156c5c70304a9b9
+DIST flannel-0.17.0.tar.gz 9534647 BLAKE2B 03d6d036d5877641a2fc7b6654995822522d378943e4d7b2531be8197de6e7d6e0509143cd8d4dfd3d2ef11c9355011bfc44c834f966e14fd3aa774350bcab11 SHA512 f0625339e387a6ae81780d21025c282c2e0caf8b32ac778634a877a4e04ebf10d41fc10b50ae477c28815cedaf34af867b651ed5a8c5267177ea925abc6a1253
 EBUILD flannel-0.14.0.ebuild 1418 BLAKE2B 94b7e426dc6e3d769b3564f60e969a28d21628a1f963721a9d78e3f3568bd6ef2a5b481406b6aa93aa072c47209ab1f7eb1c375429d66d8cd11910bacde07c6f SHA512 1dea57abed0dc5dc46b720d046788fc16e3d471d01bc0fe2115b156c3a7888b6d834f0da85eed00b644ed3318817e858126aabacdf40e94e53d06d3736bef43a
 EBUILD flannel-0.16.0.ebuild 1418 BLAKE2B 94b7e426dc6e3d769b3564f60e969a28d21628a1f963721a9d78e3f3568bd6ef2a5b481406b6aa93aa072c47209ab1f7eb1c375429d66d8cd11910bacde07c6f SHA512 1dea57abed0dc5dc46b720d046788fc16e3d471d01bc0fe2115b156c3a7888b6d834f0da85eed00b644ed3318817e858126aabacdf40e94e53d06d3736bef43a
 EBUILD flannel-0.16.1.ebuild 1418 BLAKE2B cf64ef8ca8ccea8838b27dccf750a8497b23876ba68275bb97911770898e17b2c35c917134147ba06493e010ce5b18fd8950678fd992db4feb9fd49066aeb8d8 SHA512 6095d70c1bbe214c6122584f9b307bc93aee73018c20aae8ed0e11e7f6e87dbd9f38edf64dcaf6931d48db35906fa17df03bf983963ae349b3b951bfd3e3d85b
 EBUILD flannel-0.16.3.ebuild 1418 BLAKE2B cf64ef8ca8ccea8838b27dccf750a8497b23876ba68275bb97911770898e17b2c35c917134147ba06493e010ce5b18fd8950678fd992db4feb9fd49066aeb8d8 SHA512 6095d70c1bbe214c6122584f9b307bc93aee73018c20aae8ed0e11e7f6e87dbd9f38edf64dcaf6931d48db35906fa17df03bf983963ae349b3b951bfd3e3d85b
-MISC metadata.xml 306 BLAKE2B 0a81caca08d2e73cb3624f8116c978bd4f752785a2f75953e2d0f9f9a29d64be94b5e73bc2f3697a776c6c0219898f8163b96a084eeba238dbb2c6353c34b618 SHA512 82121996c0eccb06de9a19d660d55ba4314eef903286ad71da9f8286dfafe6d74b58e297638496b2461e793f5c5ee66b0c329d17a500afdaf4cbda03f06901dc
+EBUILD flannel-0.17.0.ebuild 1436 BLAKE2B c0dc753253b6267ffc746294c1cec61bd4647f30ad1b562598dec39de55073bf2cd0a47b1b9a0bb518ec4211f285f00f63a319c009b6c4d83498242d99908083 SHA512 6fbaedd060184774118f8a483ea737fa1ba6eb16996d8b2f7677c9f09ba5aeafc1773182980a98f4185c70442d6a7080ab4903944958197125c26b7e4f13fc8c
+MISC metadata.xml 310 BLAKE2B de0cea7ebb19915abdb06399ba91ff1f3c45b2ca5a24c4c99e59c839bad7a854f702cd5909549bc9ad746ad579b80280fe53be39736117aa5f4fdec184a122e3 SHA512 e2c16506f5baf5911f15a5cadc4d8493b0c8d66dfefef8f789a471dfc4c92411e3a8c5ac3e40490edd3d4c8150a0beb815d497882db83164724093e2fc8aa34d
diff --git a/app-containers/flannel/flannel-0.17.0.ebuild b/app-containers/flannel/flannel-0.17.0.ebuild
new file mode 100644
index 000000000000..18d922d3f1d3
--- /dev/null
+++ b/app-containers/flannel/flannel-0.17.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd tmpfiles
+
+KEYWORDS="~amd64 ~arm64"
+DESCRIPTION="An etcd backed network fabric for containers"
+HOMEPAGE="https://github.com/flannel-io/flannel"
+SRC_URI="https://github.com/flannel-io/flannel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT"
+SLOT="0"
+IUSE="hardened"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
+		-i "${S}/version/version.go" || die
+}
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\
+	go build -o dist/flanneld -ldflags "
+		-X github.com/flannel-io/flannel/version.Version=v${PV}
+		-extldflags \"-static\"" . || die
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" \
+		go test -v -work -x "${EGO_PN}" || die
+}
+
+src_install() {
+	dobin dist/${PN}d
+	exeinto /usr/libexec/flannel
+	doexe dist/mk-docker-opts.sh
+	insinto /etc/systemd/system/docker.service.d
+	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
+	newinitd "${FILESDIR}"/flanneld.initd flanneld
+	newconfd "${FILESDIR}"/flanneld.confd flanneld
+	keepdir /var/log/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/flanneld.logrotated flanneld
+	newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf
+	systemd_dounit "${FILESDIR}/flanneld.service"
+	dodoc README.md
+}
+
+pkg_postinst() {
+	tmpfiles_process flannel.conf
+}
diff --git a/app-containers/flannel/metadata.xml b/app-containers/flannel/metadata.xml
index 4ed5e4e641ed..7e0f71c1df52 100644
--- a/app-containers/flannel/metadata.xml
+++ b/app-containers/flannel/metadata.xml
@@ -5,6 +5,6 @@
     <email>zmedico@gentoo.org</email>
   </maintainer>
   <upstream>
-    <remote-id type="github">coreos/flannel</remote-id>
+    <remote-id type="github">flannel-io/flannel</remote-id>
   </upstream>
 </pkgmetadata>