From 3ca9d84ed4b1c723faf42e7b6731448c719e1210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E7=85=9C=E5=9D=A4?= Date: Tue, 23 Dec 2025 20:07:01 +0800 Subject: [PATCH] Rebuild for golang cves: CVE-2025-61727,CVE-2025-61729 (cherry picked from commit 5167a39a0723b83ee5f8707dff91cb1799f820db) --- containernetworking-plugins.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/containernetworking-plugins.spec b/containernetworking-plugins.spec index 71f439f..d549b5f 100644 --- a/containernetworking-plugins.spec +++ b/containernetworking-plugins.spec @@ -16,13 +16,14 @@ Name: %{project}-%{repo} Version: 1.2.0 -Release: 5 +Release: 6 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: 0001-k3s-cni-adaptation.patch -Source2: https://github.com/zchee/reexec/archive/refs/heads/master.zip +Source1: https://github.com/zchee/reexec/archive/refs/heads/master.zip + +Patch0: 0001-k3s-cni-adaptation.patch Patch1: 0002-containernetworking-plugins-add-sw64-support.patch BuildRequires: golang >= 1.16.6 @@ -135,12 +136,10 @@ 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/ %{SOURCE2} +unzip -d $WORKDIR/vendor/github.com/docker/docker/pkg/ %{SOURCE1} 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 @@ -323,6 +322,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %changelog +* Tue Dec 23 2025 gaoyukun - 1.2.0-6 +- Rebuild for golang cves: CVE-2025-61727,CVE-2025-61729 + * Wed Mar 12 2025 mahailiang - 1.2.0-5 - add sw_64 support -- Gitee