From e6f39706eec820d12dbb5c1ca8d46d076433289b Mon Sep 17 00:00:00 2001 From: gaoyukun Date: Mon, 29 Dec 2025 12:53:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D/usr/libexec/cni/bridge?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8B=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit ce601c633f6854f4b9edc2ff096f60b528ca9409) --- containernetworking-plugins.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/containernetworking-plugins.spec b/containernetworking-plugins.spec index d549b5f..0a48dbd 100644 --- a/containernetworking-plugins.spec +++ b/containernetworking-plugins.spec @@ -16,14 +16,13 @@ Name: %{project}-%{repo} Version: 1.2.0 -Release: 6 +Release: 7 Summary: Libraries for use by writing CNI plugin License: ASL 2.0 URL: https://github.com/containernetworking/plugins Source0: https://github.com/containernetworking/plugins/archive/%{built_tag}.tar.gz -Source1: https://github.com/zchee/reexec/archive/refs/heads/master.zip - -Patch0: 0001-k3s-cni-adaptation.patch +Source1: 0001-k3s-cni-adaptation.patch +Source2: https://github.com/zchee/reexec/archive/refs/heads/master.zip Patch1: 0002-containernetworking-plugins-add-sw64-support.patch BuildRequires: golang >= 1.16.6 @@ -136,10 +135,12 @@ mkdir -p $WORKDIR cd .. cp -r plugins-%{version}/* $WORKDIR mkdir -p $WORKDIR/vendor/github.com/docker/docker/pkg -unzip -d $WORKDIR/vendor/github.com/docker/docker/pkg/ %{SOURCE1} +unzip -d $WORKDIR/vendor/github.com/docker/docker/pkg/ %{SOURCE2} mv $WORKDIR/vendor/github.com/docker/docker/pkg/reexec-master $WORKDIR/vendor/github.com/docker/docker/pkg/reexec cd $WORKDIR +cp %{SOURCE1} ./ +patch -p1 < 0001-k3s-cni-adaptation.patch cat > main.go << EOF package main @@ -322,6 +323,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %changelog +* Mon Dec 29 2025 gaoyukun - 1.2.0-7 +- Fix incorrect file types in/usr/libexec/cni/bridge + * Tue Dec 23 2025 gaoyukun - 1.2.0-6 - Rebuild for golang cves: CVE-2025-61727,CVE-2025-61729 -- Gitee