From 6915685e6bfff32f77d573283662ca9b1af2bebf Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 8 Nov 2022 01:37:06 -0500
Subject: [PATCH] import
 containernetworking-plugins-1.1.1-2.module+el8.7.0+16520+2db5507d

---
 .containernetworking-plugins.metadata  |  2 +-
 .gitignore                             |  2 +-
 SPECS/containernetworking-plugins.spec | 32 ++++++++++++++++++++------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.containernetworking-plugins.metadata b/.containernetworking-plugins.metadata
index 6476418..85b0be9 100644
--- a/.containernetworking-plugins.metadata
+++ b/.containernetworking-plugins.metadata
@@ -1 +1 @@
-cf2c04ffedd0c5bec21c152533b1ebe2135d81a0 SOURCES/v1.0.1.tar.gz
+a28313c49d8c7a6c002dbd2a3c51b25540f6809f SOURCES/v1.1.1.tar.gz
diff --git a/.gitignore b/.gitignore
index a0faec2..f779712 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v1.0.1.tar.gz
+SOURCES/v1.1.1.tar.gz
diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec
index a4f63ae..58d01cb 100644
--- a/SPECS/containernetworking-plugins.spec
+++ b/SPECS/containernetworking-plugins.spec
@@ -17,21 +17,21 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 
+Epoch: 1
 Name: containernetworking-plugins
-Version: 1.0.1
-Release: 1%{?dist}
+Version: 1.1.1
+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}
-# still use arch exclude as the macro above still refers %%{ix86} in RHEL8.4:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1905383
-ExcludeArch: %{ix86}
-BuildRequires: golang >= 1.12.12-4
+ExclusiveArch: %{go_arches}
+BuildRequires: golang >= 1.17.7
 BuildRequires: git
 BuildRequires: go-md2man
+BuildRequires: systemd-devel
+Requires: systemd
 Provides: containernetworking-cni = %{version}-%{release}
 
 %description
@@ -73,6 +73,10 @@ done
 install -d -p %{buildroot}%{_libexecdir}/cni/
 install -p -m 0755 bin/* %{buildroot}/%{_libexecdir}/cni
 
+install -dp %{buildroot}%{_unitdir}
+install -p plugins/ipam/dhcp/systemd/cni-dhcp.service %{buildroot}%{_unitdir}
+install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
+
 %check
 %if 0%{?with_check}
 # Since we aren't packaging up the vendor directory we need to link
@@ -117,8 +121,22 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %doc *.md
 %dir %{_libexecdir}/cni
 %{_libexecdir}/cni/*
+%{_unitdir}/cni-dhcp.service
+%{_unitdir}/cni-dhcp.socket
 
 %changelog
+* Fri Apr 08 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-2
+- bump golang BR to 1.17.7
+- Related: #2061390
+
+* Fri Mar 11 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-1
+- update to https://github.com/containernetworking/plugins/releases/tag/v1.1.1
+- Related: #2061390
+
+* Mon Mar 07 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.0.1-2
+- revert back to https://github.com/containernetworking/plugins/releases/tag/v1.0.1
+- Related: #2061390
+
 * Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 1.0.1-1
 - update to https://github.com/containernetworking/plugins/releases/tag/v1.0.1
 - Related: #2001445