From 5a95f4340ba401dca033976dcecfeb0407f33959 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 7 Nov 2023 11:59:47 +0000 Subject: [PATCH] import UBI containernetworking-plugins-1.3.0-4.el9 --- .containernetworking-plugins.metadata | 2 +- .gitignore | 2 +- SPECS/containernetworking-plugins.spec | 29 ++++++++++++++++++++++---- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.containernetworking-plugins.metadata b/.containernetworking-plugins.metadata index 6baf228..a084005 100644 --- a/.containernetworking-plugins.metadata +++ b/.containernetworking-plugins.metadata @@ -1 +1 @@ -768ed16a77309b8ea99a5cdbd1d011a7e9cba822 SOURCES/v1.2.0.tar.gz +af940e2272301b20b369e34c9597b96e0007c391 SOURCES/v1.3.0.tar.gz diff --git a/.gitignore b/.gitignore index 67e59d9..81ab3db 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.2.0.tar.gz +SOURCES/v1.3.0.tar.gz diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec index 63dde9c..9d0ca57 100644 --- a/SPECS/containernetworking-plugins.spec +++ b/SPECS/containernetworking-plugins.spec @@ -2,7 +2,7 @@ %if ! 0%{?gobuild:1} %define gobuild(o:) \ -go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; +go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; %define gotest(o:) go test %endif @@ -16,8 +16,8 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL Epoch: 1 Name: containernetworking-plugins -Version: 1.2.0 -Release: 1%{?dist} +Version: 1.3.0 +Release: 4%{?dist} Summary: CNI network plugins License: ASL 2.0 URL: https://%{provider_prefix} @@ -29,7 +29,7 @@ BuildRequires: git BuildRequires: /usr/bin/go-md2man BuildRequires: systemd-devel Requires: systemd -Provides: containernetworking-cni = %{version}-%{release} +Provides: containernetworking-cni = %{epoch}:%{version}-%{release} %description The CNI (Container Network Interface) project consists of a specification @@ -122,6 +122,27 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_unitdir}/cni-dhcp.socket %changelog +* Fri Aug 11 2023 Jindrich Novy - 1:1.3.0-4 +- add Epoch in Provides +- Related: #2176063 + +* Sat Jul 08 2023 Jindrich Novy - 1:1.3.0-3 +- remove no_openssl for FIPS compliance +- Related: #2176063 + +* Tue Jun 13 2023 Jindrich Novy - 1:1.3.0-2 +- rebuild for following CVEs: +CVE-2022-41724 CVE-2022-41725 CVE-2023-24538 CVE-2023-24534 CVE-2023-24536 CVE-2022-41723 CVE-2023-24539 CVE-2023-24540 CVE-2023-29400 +- Resolves: #2179960 +- Resolves: #2187333 +- Resolves: #2187376 +- Resolves: #2203705 +- Resolves: #2207519 + +* Thu May 11 2023 Jindrich Novy - 1:1.3.0-1 +- update to https://github.com/containernetworking/plugins/releases/tag/v1.3.0 +- Related: #2176063 + * Tue Jan 17 2023 Jindrich Novy - 1:1.2.0-1 - update to https://github.com/containernetworking/plugins/releases/tag/v1.2.0 - Related: #2124478