diff --git a/containernetworking-plugins.spec b/containernetworking-plugins.spec index d549b5f1b89125fe5f07ff2d5a8cde79fa22d981..0a48dbd11babd277b07dd5fd78e24ddc7339dea8 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