3 changed files with 84 additions and 87 deletions
--- a/.containernetworking-plugins.metadata
+++ b/.containernetworking-plugins.metadata
@ -1 +1 @@
-75d87507a7dc13a3597aad086d21393957442c59 SOURCES/v1.5.1.tar.gz
+98f660ef5b47681465ca05a6871345ae397f062c SOURCES/v1.4.0.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/v1.5.1.tar.gz
+SOURCES/v1.4.0.tar.gz
--- a/SPECS/containernetworking-plugins.spec
+++ b/SPECS/containernetworking-plugins.spec
@ -1,5 +1,8 @@
 %global with_check 0

+%global _find_debuginfo_dwz_opts %{nil}
+%global _dwz_low_mem_die_limit 0
+
 %if ! 0%{?gobuild:1}
 %define gobuild(o:) \
 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 %{?**};
@ -16,15 +19,15 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -

 Epoch: 1
 Name: containernetworking-plugins
-Version: 1.5.1
-Release: 3%{?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.16.6
+BuildRequires: golang >= 1.17.7
 BuildRequires: git
 BuildRequires: /usr/bin/go-md2man
 BuildRequires: systemd-devel
@ -123,138 +126,132 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_unitdir}/cni-dhcp.socket

 %changelog
-* Mon Oct 07 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.5.1-3
- rebuild to fix  CVE-2024-34156
- Resolves: RHEL-57917
-
-* Tue Aug 20 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.5.1-2
- rebuild for CVE-2024-24791
- Resolves: RHEL-47166
-
-* Tue Jul 02 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.5.1-1
- update to https://github.com/containernetworking/plugins/releases/tag/v1.5.1
- Related: RHEL-27608
-
-* Wed May 29 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.5.0-1
- update to https://github.com/containernetworking/plugins/releases/tag/v1.5.0
- Related: RHEL-27608
-
-* Tue Mar 12 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-1
- update to https://github.com/containernetworking/plugins/releases/tag/v1.4.1
- Resolves: RHEL-28855
+* Fri Feb 23 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-2
+- rebuild
+- Resolves: RHEL-18390

 * Tue Jan 02 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-1
 - update to https://github.com/containernetworking/plugins/releases/tag/v1.4.0
- Related: RHEL-2112
+- Related: Jira:RHEL-2110

 * Thu Sep 14 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-5
 - fix path to dhcp service
- Resolves: #RHEL-3140
+- Resolves: #RHEL-3789

 * Fri Aug 11 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-4
 - add Epoch in Provides
- Related: #2176063
+- Related: #2176055

 * Sat Jul 08 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-3
 - remove no_openssl for FIPS compliance
- Related: #2176063
+- Related: #2176055

-* Tue Jun 13 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-2
+* 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: #2179960
- Resolves: #2187333
- Resolves: #2187376
- Resolves: #2203705
- Resolves: #2207519
+- Resolves: #2179944
+- Resolves: #2187342
+- Resolves: #2187360
+- Resolves: #2203693
+- Resolves: #2207506

-* Thu May 11 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-1
+* 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: #2176063
+- Related: #2176055

-* Tue Jan 17 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-1
+* 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: #2124478
-
-* Fri May 13 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-3
- Re-enable LTO and debuginfo
- Related: #2061316
+- Related: #2176055

-* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-2
+* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-3
 - BuildRequires: /usr/bin/go-md2man
- Related: #2061316
+- Related: #2061390

+* Fri Apr 08 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-2
+- bump golang BR to 1.17.7
+- Related: #2061390

 * Thu Mar 10 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-1
 - update to https://github.com/containernetworking/plugins/releases/tag/v1.1.1
- Related: #2061316
+- Related: #2061390

-* Tue Mar 08 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.0-1
+* Mon Mar 07 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.0-1
 - update to https://github.com/containernetworking/plugins/releases/tag/v1.1.0
- Related: #2061316
+- Related: #2061390

-* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.0.1-4
+* Mon Feb 28 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: #2000051
+- Related: #2001445

 * Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.0-1
 - update to https://github.com/containernetworking/plugins/releases/tag/v1.1.0
- Related: #2000051
+- Related: #2001445

-* Fri Oct 01 2021 Jindrich Novy <jnovy@redhat.com> - 1.0.1-3
- perform only sanity/installability tests for now
- Related: #2000051
-
-* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 1.0.1-2
- add gating.yaml
- Related: #2000051
-
-* Wed Sep 08 2021 Jindrich Novy <jnovy@redhat.com> - 1.0.1-1
+* 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: #2000051
-
-* Fri Sep 03 2021 Jindrich Novy <jnovy@redhat.com> - 1.0.0-1
- add systemd dependencies
- Related: #2000051
+- Related: #2001445

-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.1-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.1-3
- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.1-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Thu Aug 12 2021 Jindrich Novy <jnovy@redhat.com> - 1.0.0-1
+- update to https://github.com/containernetworking/plugins/releases/tag/v1.0.0
+- Related: #1934415

 * Sat Feb 06 2021 Jindrich Novy <jnovy@redhat.com> - 0.9.1-1
 - update to https://github.com/containernetworking/plugins/releases/tag/v0.9.1
+- Related: #1883490

 * Thu Dec 10 2020 Jindrich Novy <jnovy@redhat.com> - 0.9.0-1
 - update to https://github.com/containernetworking/plugins/releases/tag/v0.9.0
+- Related: #1883490

-* Wed Dec 09 2020 Petr Šabata <contyk@redhat.com> - 0.8.7-3.1
- Bumping for the gcc-11 rebuild
-
-* Mon Dec 07 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-3
- use dedicated macro to build only on supported arches
- make build logs more readable
- always compile with debuginfo enabled
+* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-3
+- use ExcludeArch: i686 again as the go_arches macro is broken
+- Related: #1883490

 * Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-2
 - attempt to fix linker error with golang-1.15
+- Related: #1883490

-* Fri Sep 18 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-1
- update to https://github.com/containernetworking/plugins/releases/tag/v0.8.7
+* Wed Oct 21 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-1
+- synchronize with stream-container-tools-rhel8
+- Related: #1883490

-* Thu Sep 17 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.6-2
- sync with rhel8-8.3.0
-
-* Thu Sep 17 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.6-1
+* Tue Aug 11 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.6-2
 - propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization
 - Related: #1821193

+* Thu May 14 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.6-1
+- update to https://github.com/containernetworking/plugins/releases/tag/v0.8.6
+- Related: #1821193
+
+* Tue May 12 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.5-1
+- synchronize containter-tools 8.3.0 with 8.2.1
+- Related: #1821193
+
+* Thu Dec 12 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-5
+- compile with no_openssl
+- Related: RHELPLAN-25139
+
+* Wed Dec 11 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-4
+- compile in FIPS mode
+- Related: RHELPLAN-25139
+
+* Mon Dec 09 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-3
+- be sure to use golang >= 1.12.12-4
+- Related: RHELPLAN-25139
+
+* Wed Dec 04 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-2
+- build with GO111MODULE=off
+- Related: RHELPLAN-25139
+
+* Wed Dec 04 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-1
+- update to 0.8.3
+- Related: RHELPLAN-25139
+
+* Thu Aug 01 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.1-2
+- backport https://github.com/coreos/go-iptables/pull/62
+  from Michael Cambria
+- Resolves: #1627561
+
 * Thu Jun 13 2019 Lokesh Mandvekar <lsm5@redhat.com> - 0.8.1-1
 - Resolves: #1720319 - bump to v0.8.1