commit:     8764dac69d2df5a1244962d02e28e9482445db0c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 14 16:24:17 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 14 16:24:59 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8764dac6

app-containers/cni-plugins: add 1.6.2, fix license, fix plugin docs

Closes: https://bugs.gentoo.org/695284
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-containers/cni-plugins/Manifest                |  1 +
 .../cni-plugins/cni-plugins-1.6.2.ebuild           | 49 ++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/app-containers/cni-plugins/Manifest 
b/app-containers/cni-plugins/Manifest
index 8e5fc315f512..05dc72369569 100644
--- a/app-containers/cni-plugins/Manifest
+++ b/app-containers/cni-plugins/Manifest
@@ -1,3 +1,4 @@
 DIST cni-plugins-1.3.0.tar.gz 3684138 BLAKE2B 
c5599f1d8ac3bffb802877ae8c49024a9dea1940923316e534397a8dc7e467f6fe3ceef514a41522611a8f06c4f4ba0788105081e68a4712e2eefade33226c7b
 SHA512 
87e186b3cd64f66280f5b2293dcdd1fc22cb8f51a248124fb622adc48a893348419ba4c29c4769dede4d9e60f2e9fea5d4198f10badb4ecd20a1551e0b344e10
 DIST cni-plugins-1.5.1.tar.gz 3808203 BLAKE2B 
481e6c3e929d9169c643596ba48e008151aef10ff670cac9fa00294a3fe98bc5d7c9ee9f83394becb4c127290abb3b082c4124d332b32c8d97f44fcb01b7e3cf
 SHA512 
d2e01958dd8328407164cb6be9d962321742dae7011ce7cd7b2342f5e4b4bbcd992d8249c53d3d81250a60c27f049969bbf329a75440524f52c1f1466b6e7132
 DIST cni-plugins-1.6.1.tar.gz 3940454 BLAKE2B 
eaeb9d48645efe680f259c3b6d295134459a79a8890cb8645dd4e0e32215decb44f6f72d8b8f575daedc34f0a55a517e213f505639c0a203b0479ca1067b5e38
 SHA512 
62b4e2c5c4bf6a9b21880e7b145547bec153f591926419d9960345cc7fb7d499ae44b0236928bbfeb46e383f38018d7504e58da1dd8a6ad39ef4ae3122b3be56
+DIST cni-plugins-1.6.2.tar.gz 3940423 BLAKE2B 
b53061312cf96f0e4a385a63433e76695f4c8b419e18a14296644cc435cf49be5f76021cadc4186955c99af74cf0b06c46c344b0368355f47e4fe9fd6773d8c3
 SHA512 
ee577e3fe39558d6a6296754c97de6608f95152805c01b8053e2958d16634ab57d147eea7c950fcc4d1a98d6733a85717adf7078ee2dffff007ec3b063386c24

diff --git a/app-containers/cni-plugins/cni-plugins-1.6.2.ebuild 
b/app-containers/cni-plugins/cni-plugins-1.6.2.ebuild
new file mode 100644
index 000000000000..02e8de2698bc
--- /dev/null
+++ b/app-containers/cni-plugins/cni-plugins-1.6.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info systemd
+
+DESCRIPTION="Standard networking plugins for container networking"
+HOMEPAGE="https://github.com/containernetworking/plugins";
+SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+S=${WORKDIR}/plugins-${PV}
+
+LICENSE="Apache-2.0"
+# Dependent licenses
+LICENSE+=" Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="hardened"
+
+RDEPEND="net-firewall/iptables"
+
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING ~NETFILTER_XT_MATCH_COMMENT
+       ~NETFILTER_XT_MATCH_MULTIPORT"
+
+src_compile() {
+       local -x CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+       local f
+       for f in plugins/{meta,main,ipam}/*; do
+               [[ ${f} == *windows* ]] && continue
+               einfo "Building ${f}"
+               ego build -mod=vendor -o "bin/${f##*/}" "./${f}"
+       done
+}
+
+src_install() {
+       exeinto /opt/cni/bin
+       doexe bin/*
+
+       dodoc README.md
+       local f
+       for f in plugins/{meta,main,ipam}/*/README.md; do
+               [[ ${f} == *windows* ]] && continue
+               f=${f%/*}
+               newdoc "${f}/README.md" "${f##*/}.README.md"
+       done
+
+       systemd_dounit plugins/ipam/dhcp/systemd/cni-dhcp.{service,socket}
+       newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
+}

Reply via email to