From eaa77cb9cf58d33b8ccc4fc1fa77f36e3a21228b Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 30 Apr 2024 15:12:52 +0000 Subject: [PATCH] import UBI containernetworking-plugins-1.4.0-2.el9_4 --- .containernetworking-plugins.metadata | 2 +- .gitignore | 2 +- SPECS/containernetworking-plugins.spec | 23 ++++++++++++++--------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.containernetworking-plugins.metadata b/.containernetworking-plugins.metadata index a084005..053646d 100644 --- a/.containernetworking-plugins.metadata +++ b/.containernetworking-plugins.metadata @@ -1 +1 @@ -af940e2272301b20b369e34c9597b96e0007c391 SOURCES/v1.3.0.tar.gz +98f660ef5b47681465ca05a6871345ae397f062c SOURCES/v1.4.0.tar.gz diff --git a/.gitignore b/.gitignore index 81ab3db..eb84e4a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.3.0.tar.gz +SOURCES/v1.4.0.tar.gz diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec index f81af9a..ee76cd3 100644 --- a/SPECS/containernetworking-plugins.spec +++ b/SPECS/containernetworking-plugins.spec @@ -16,15 +16,15 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" - Epoch: 1 Name: containernetworking-plugins -Version: 1.3.0 -Release: 6%{?dist} +Version: 1.4.0 +Release: 2%{?dist} Summary: CNI network plugins License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures ExclusiveArch: %{go_arches} -BuildRequires: golang >= 1.20.10 +BuildRequires: golang >= 1.16.6 BuildRequires: git BuildRequires: /usr/bin/go-md2man BuildRequires: systemd-devel @@ -41,6 +41,7 @@ when the container is deleted. %prep %autosetup -Sgit -n %{repo}-%{version} rm -rf plugins/main/windows +sed -i 's,/opt/cni/bin/,/usr/libexec/cni/,' plugins/ipam/dhcp/systemd/cni-dhcp.service %build export ORG_PATH="%{provider}.%{provider_tld}/%{project}" @@ -122,13 +123,17 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_unitdir}/cni-dhcp.socket %changelog -* Sun Dec 03 2023 Lokesh Mandvekar - 1:1.3.0-6 -- rebuild because of CVE-2023-29409 -- Related: Jira:RHEL-7453 +* Mon Mar 04 2024 Jindrich Novy - 1:1.4.0-2 +- rebuild +- Related: RHEL-18372 -* Mon Sep 11 2023 Jindrich Novy - 1:1.3.0-5 -- rebuild because of CVE-2023-39318 CVE-2023-39319 CVE-2023-39321 CVE-2023-39322 -- Related: #RHEL-2780 +* Tue Jan 02 2024 Jindrich Novy - 1:1.4.0-1 +- update to https://github.com/containernetworking/plugins/releases/tag/v1.4.0 +- Related: RHEL-2112 + +* Thu Sep 14 2023 Jindrich Novy - 1:1.3.0-5 +- fix path to dhcp service +- Resolves: #RHEL-3140 * Fri Aug 11 2023 Jindrich Novy - 1:1.3.0-4 - add Epoch in Provides