From 963f3a632609e96e27550d33ee632201b095f8a7 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Mon, 16 Oct 2023 09:19:20 +0000
Subject: [PATCH] import CS
 containernetworking-plugins-1.3.0-4.module_el8+644+cb8a8b65

---
 .containernetworking-plugins.metadata  |  2 +-
 .gitignore                             |  2 +-
 SPECS/containernetworking-plugins.spec | 33 +++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 8 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 67b64ae..ac397a2 100644
--- a/SPECS/containernetworking-plugins.spec
+++ b/SPECS/containernetworking-plugins.spec
@@ -5,7 +5,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
 
@@ -19,8 +19,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}
@@ -32,7 +32,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
@@ -125,9 +125,30 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_unitdir}/cni-dhcp.socket
 
 %changelog
-* Tue Jan 17 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-1
+* Fri Aug 11 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-4
+- add Epoch in Provides
+- Related: #2176055
+
+* Sat Jul 08 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-3
+- remove no_openssl for FIPS compliance
+- Related: #2176055
+
+* Thu Jun 15 2023 Jindrich Novy <jnovy@redhat.com> - 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: #2179944
+- Resolves: #2187342
+- Resolves: #2187360
+- Resolves: #2203693
+- Resolves: #2207506
+
+* Fri May 12 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-1
+- update to https://github.com/containernetworking/plugins/releases/tag/v1.3.0
+- Related: #2176055
+
+* Thu Mar 09 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-1
 - update to https://github.com/containernetworking/plugins/releases/tag/v1.2.0
-- Related: #2123641
+- Related: #2176055
 
 * Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-3
 - BuildRequires: /usr/bin/go-md2man