.containernetworking-plugins.metadata

@@ -1 +1 @@
-97ba3a594cae5771913218e3a4a9722ccc88e2e3 SOURCES/plugins-9ebe139.tar.gz
+65f581afbc32317421a47a3b69952d900c2a9f00 SOURCES/v1.0.0.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/plugins-9ebe139.tar.gz
+SOURCES/v1.0.0.tar.gz

SPECS/containernetworking-plugins.spec

@@ -1,16 +1,16 @@
-%global with_debug 1
 %global with_check 0
 
-%if 0%{?with_debug}
+# https://bugzilla.redhat.com/show_bug.cgi?id=1904567
+%global _lto_cflags %%{nil}
+
 %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 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 %{?**};
+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 %{?**};
 %define gotest(o:) go test
+%endif
 
 %global provider github
 %global provider_tld com
@@ -19,21 +19,21 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL
 # https://github.com/containernetworking/plugins
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
-%global commit 9ebe139e77e82afb122e335328007bca86905ae4
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name: containernetworking-plugins
-Version: 0.7.4
-Release: 4.git%{shortcommit}%{?dist}
-Summary: Some CNI network plugins, maintained by the containernetworking team.
+Version: 1.0.0
+Release: 3%{?dist}
+Summary: CNI network plugins
 License: ASL 2.0
 URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-ExcludeArch: ppc64 i686
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+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: git
 BuildRequires: go-md2man
+BuildRequires: systemd-devel
+Requires: systemd
 Provides: containernetworking-cni = %{version}-%{release}
 
 %description
@@ -44,7 +44,8 @@ only with network connectivity of containers and removing allocated resources
 when the container is deleted.
 
 %prep
-%autosetup -Sgit -n %{repo}-%{commit}
+%autosetup -Sgit -n %{repo}-%{version}
+rm -rf plugins/main/windows
 
 %build
 export ORG_PATH="%{provider}.%{provider_tld}/%{project}"
@@ -56,6 +57,8 @@ if [ ! -h gopath/src/${REPO_PATH} ]; then
 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"
@@ -72,6 +75,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
@@ -116,12 +123,56 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %doc *.md
 %dir %{_libexecdir}/cni
 %{_libexecdir}/cni/*
+%{_unitdir}/cni-dhcp.service
+%{_unitdir}/cni-dhcp.socket
 
 %changelog
-* Fri Jun 26 2020 Jindrich Novy <jnovy@redhat.com> - 0.7.4-4.git9ebe139
-- bump release to preserve upgrade path
+* Wed Sep 01 2021 Jindrich Novy <jnovy@redhat.com> - 1.0.0-3
+- add systemd dependencies
+- Related: # 2000208
+
+* Tue Aug 31 2021 Jindrich Novy <jnovy@redhat.com> - 1.0.0-2
+- include cni-dhcp units
+- Related: #1970747
+
+* Fri Aug 20 2021 Lokesh Mandvekar <lsm5@redhat.com> - 1.0.0-1
+- update to v1.0.0
+- Related: #1970747
+
+* 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
+
+* Sat Jun 01 2019 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.5-1
+- Resolves: #1616063
+- bump to v0.7.5
+
 * Tue Dec 18 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.7.4-3.git9ebe139
 - re-enable debuginfo