From 8211e5ae6700cebfabd1128eb1bd1b548530ee56 Mon Sep 17 00:00:00 2001 From: gaoyukun Date: Tue, 23 Dec 2025 17:53:15 +0800 Subject: [PATCH] Rebuild for golang cves: CVE-2025-61727,CVE-2025-61729 (cherry picked from commit 6710215d66b7b5ad786df0623202e477040cdabc) --- containernetworking-plugins.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/containernetworking-plugins.spec b/containernetworking-plugins.spec index 23d1436..eef557b 100644 --- a/containernetworking-plugins.spec +++ b/containernetworking-plugins.spec @@ -16,13 +16,15 @@ Name: %{project}-%{repo} Version: 1.1.1 -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: 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 + BuildRequires: golang >= 1.16.6 BuildRequires: git BuildRequires: systemd-devel @@ -140,12 +142,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 @@ -331,6 +331,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %changelog +* Tue Dec 23 2025 gaoyukun - 1.1.1-7 +- Rebuild for golang cves: CVE-2025-61727,CVE-2025-61729 + * Mon Jun 24 2024 wangshuo - 1.1.1-6 - change systemd unit file permission to 644 -- Gitee