From bf7e72e649aabb9509bd8f2248784b685961b82e Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 16 Jan 2025 03:56:04 +0000
Subject: [PATCH] cni-plugins: update to v1.6.1

Bumping cni-plugins.git to version v1.1.0-345-gabfac4a9, which comprises the following commits:

    abfac4a9 Remove scripts/release.sh because of no longer used (#1137)
    eded0afc build(deps): bump the golang group across 1 directory with 3 updates
    41d54859 build(deps): bump alpine in /.github/actions/retest-action
    e8c7d9b9 test: enable unpriv user namespaces
    ba8bc7d0 Bump Go version to 1.23 in scripts/release.sh (#1123)
    7f756b41 portmap: fix iptables conditions detection
    3ffc42cd build(deps): bump the golang group across 1 directory with 7 updates
    6de8a985 ipmasq: fix nftables backend
    9296c5f8 portmap: fix nftables backend
    fec2d626 Pass status along ipam update
    a4fc6f93 feat(dhcp): Cancel backoff retry on stop
    d61e7e5e fix(dhcp): can not renew an ip address
    e4950728 build(deps): bump golang.org/x/sys in the golang group
    93d197c4 VRF: Wait for the local/host routes to be added
    c52e02bc add problem hint
    24b0bf96 make test working again
    d44bbf28 Revert "Merge pull request #921 from oOraph/dev/exclude_subnets_from_traffic_shapping2"
    8ad03619 resolve merge conflicts
    8324a2e5 build(deps): bump the golang group across 1 directory with 2 updates
    a4b80cc6 host-device: use temp network namespace for rename
    3a49cff1 Fix txqueuelen being accidentally set to zero
    c11ed487 Ignore link-local routes in SBR tests
    fa737f82 build(deps): bump the golang group with 3 updates
    e5df283a ci, go.mod: bump to go 1.23 (#1094)
    cc8b1bd8 dhcp: Add priority option to dhcp.
    03712a57 .github: add check to verify vendor directory
    01a94e17 Add nftables backend to portmap
    3d1968c1 Fix portmap unit tests
    a3ccebc6 Add a backend abstraction to the portmap plugin
    61d07864 Add nftables implementation of ipmasq
    729dd23c Vendor nftables library, add utils.SupportsIPTables and utils.SupportsNFTables
    a6d6efa5 Use of Scope for routes in IPAM
    01b3db8e SBR: option to pass the table id (#1088)

Bumping flannel-cni-plugin.git to version v1.6.0-flannel1-19-gcc21427, which comprises the following commits:

    eca5d1d Bump alpine from 20240923 to 20250108
    055b015 Bump github.com/containernetworking/plugins from 1.6.1 to 1.6.2
    2f6a5c2 Bump github.com/onsi/gomega from 1.36.0 to 1.36.1
    7838b98 Bump alpine from 20240807 to 20240923
    9b7cc09 Bump github.com/containernetworking/plugins from 1.6.0 to 1.6.1
    773a5f0 Bump github.com/onsi/gomega from 1.35.1 to 1.36.0
    4a32784 Call Unmountns in addition to calling ns.Close()
    1da6802 Bump to 1.23.3 and cni-plugins 1.6.0
    8453685 Bump github.com/onsi/ginkgo/v2 from 2.21.0 to 2.22.0
    5ee8096 Bump github.com/onsi/ginkgo/v2 from 2.20.2 to 2.21.0
    d3a492d Bump github.com/onsi/gomega from 1.34.2 to 1.35.1
    d3c964a Bump github.com/containernetworking/plugins from 1.5.1 to 1.6.0
    b691133 Bump github.com/onsi/gomega from 1.34.1 to 1.34.2

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 recipes-networking/cni/cni_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index 0ba70746..3de84291 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -10,8 +10,8 @@ is simple to implement. \
 "
 
 SRCREV_cni = "4c9ae43c0eaa85ec1ab27781e9b258f13e7fd0ca"
-SRCREV_plugins = "01b3db8e01e491864db3e088a5db401d2f413b00"
-SRCREV_flannel_plugin = "a3f52e86452cdcdd2d970bb0f89eef248aed0e7c"
+SRCREV_plugins = "abfac4a938866b6184441d02ad49544d10931fe1"
+SRCREV_flannel_plugin = "cc21427ce5b2c606ba5ececa0a488452e80d73f8"
 SRCREV_FORMAT = "cni_plugins"
 SRC_URI = "\
 	git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
@@ -35,7 +35,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464
 GO_IMPORT = "import"
 S = "${WORKDIR}/git"
 
-PV = "v1.2.3+git${SRCREV_cni}"
+PV = "v1.2.3+git"
 CNI_VERSION = "v1.2.3"
 
 inherit go
@@ -110,4 +110,4 @@ INSANE_SKIP:${PN} += "ldflags already-stripped"
 deltask compile_ptest_base
 
 RDEPENDS:${PN} += " ca-certificates"
-RRECOMMENDS:${PN} += "iptables iproute2"
\ No newline at end of file
+RRECOMMENDS:${PN} += "iptables iproute2"