.containernetworking-plugins.metadata

@@ -1 +1 @@
-75d87507a7dc13a3597aad086d21393957442c59 SOURCES/v1.5.1.tar.gz
+78fc72f4a51634078171068805db4e4b245c6af9 SOURCES/plugins-d5efdfe.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/v1.5.1.tar.gz
+SOURCES/plugins-d5efdfe.tar.gz

SPECS/containernetworking-plugins.spec

@@ -1,8 +1,16 @@
+%global with_debug 1
 %global with_check 0
 
+%if 0%{?with_debug}
+%global _find_debuginfo_dwz_opts %{nil}
+%global _dwz_low_mem_die_limit 0
+%else
+%global debug_package   %{nil}
+%endif
+
 %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 %{?**};
+go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
 %define gotest(o:) go test
 %endif
 
@@ -13,23 +21,21 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -
 # https://github.com/containernetworking/plugins
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
+%global commit d5efdfe1f6d6e8e9e9494e3f43be54f76c0f8fd6
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
-Epoch: 1
 Name: containernetworking-plugins
-Version: 1.5.1
+Version: 0.8.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: CNI network plugins
 License: ASL 2.0
 URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz
+Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
+ExcludeArch: ppc64 i686
-ExclusiveArch: %{go_arches}
+BuildRequires: golang >= 1.12.12-4
-BuildRequires: golang >= 1.16.6
 BuildRequires: git
-BuildRequires: /usr/bin/go-md2man
+BuildRequires: go-md2man
-BuildRequires: systemd-devel
+Provides: containernetworking-cni = %{version}-%{release}
-Requires: systemd
-Provides: containernetworking-cni = %{epoch}:%{version}-%{release}
 
 %description
 The CNI (Container Network Interface) project consists of a specification
@@ -39,9 +45,8 @@ only with network connectivity of containers and removing allocated resources
 when the container is deleted.
 
 %prep
-%autosetup -Sgit -n %{repo}-%{version}
+%autosetup -n %{repo}-%{commit} -p1
 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}"
@@ -54,7 +59,6 @@ fi
 
 export GOPATH=$(pwd)/gopath
 export GO111MODULE=off
-export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 mkdir -p $(pwd)/bin
 
 echo "Building plugins"
@@ -71,10 +75,6 @@ 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
@@ -119,141 +119,28 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %doc *.md
 %dir %{_libexecdir}/cni
 %{_libexecdir}/cni/*
-%{_unitdir}/cni-dhcp.service
-%{_unitdir}/cni-dhcp.socket
 
 %changelog
-* Mon Oct 07 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.5.1-3
+* Thu Dec 12 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-4
-- rebuild to fix  CVE-2024-34156
+- compile with no_openssl
-- Resolves: RHEL-57917
+- Related: RHELPLAN-25139
-
+
-* Tue Aug 20 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.5.1-2
+* Wed Dec 11 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-3
-- rebuild for CVE-2024-24791
+- compile in FIPS mode
-- Resolves: RHEL-47166
+- Related: RHELPLAN-25139
-
+
-* Tue Jul 02 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.5.1-1
+* Mon Dec 09 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-2
-- update to https://github.com/containernetworking/plugins/releases/tag/v1.5.1
+- be sure to use golang >= 1.12.12-4
-- Related: RHEL-27608
+- Related: RHELPLAN-25139
-
+
-* Wed May 29 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.5.0-1
+* Thu Dec 05 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-1
-- update to https://github.com/containernetworking/plugins/releases/tag/v1.5.0
+- update to 0.8.3
-- Related: RHEL-27608
+- Related: RHELPLAN-25139
-
+
-* Tue Mar 12 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.4.1-1
+* Thu Aug 01 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.1-2
-- update to https://github.com/containernetworking/plugins/releases/tag/v1.4.1
+- backport https://github.com/coreos/go-iptables/pull/62
-- Resolves: RHEL-28855
+  from Michael Cambria
-
+- Resolves: #1627561
-* 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
-
-* Thu Sep 14 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-5
-- fix path to dhcp service
-- Resolves: #RHEL-3140
-
-* Fri Aug 11 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-4
-- add Epoch in Provides
-- Related: #2176063
-
-* Sat Jul 08 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-3
-- remove no_openssl for FIPS compliance
-- Related: #2176063
-
-* Tue Jun 13 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
-
-* Thu May 11 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
-
-* Tue Jan 17 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
-
-* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-2
-- BuildRequires: /usr/bin/go-md2man
-- Related: #2061316
-
-
-* 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
-
-* Tue Mar 08 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
-
-* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.0.1-4
-- revert back to https://github.com/containernetworking/plugins/releases/tag/v1.0.1
-- Related: #2000051
-
-* 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
-
-* 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
-- 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-2
-- attempt to fix linker error with golang-1.15
-
-* 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
-
-* 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
-- propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization
-- Related: #1821193
 
 * Thu Jun 13 2019 Lokesh Mandvekar <lsm5@redhat.com> - 0.8.1-1
 - Resolves: #1720319 - bump to v0.8.1