From 2a13212463e881cbfc5794236a12674e28221757 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 21 2020 15:07:51 +0000 Subject: import containernetworking-plugins-0.8.6-1.module+el8.2.1+6626+598993b4 --- diff --git a/.containernetworking-plugins.metadata b/.containernetworking-plugins.metadata index 6b9039c..c4e3f51 100644 --- a/.containernetworking-plugins.metadata +++ b/.containernetworking-plugins.metadata @@ -1 +1 @@ -78fc72f4a51634078171068805db4e4b245c6af9 SOURCES/plugins-d5efdfe.tar.gz +90e6339a94b210443a08a3f6ded99e7913cf6a78 SOURCES/v0.8.6.tar.gz diff --git a/.gitignore b/.gitignore index 84edb48..88af467 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/plugins-d5efdfe.tar.gz +SOURCES/v0.8.6.tar.gz diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec index 91e14b2..af2a117 100644 --- a/SPECS/containernetworking-plugins.spec +++ b/SPECS/containernetworking-plugins.spec @@ -21,16 +21,14 @@ 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 d5efdfe1f6d6e8e9e9494e3f43be54f76c0f8fd6 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: containernetworking-plugins -Version: 0.8.3 -Release: 5%{?dist} +Version: 0.8.6 +Release: 1%{?dist} Summary: CNI network plugins License: ASL 2.0 URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz ExcludeArch: ppc64 i686 BuildRequires: golang >= 1.12.12-4 BuildRequires: git @@ -45,7 +43,7 @@ only with network connectivity of containers and removing allocated resources when the container is deleted. %prep -%autosetup -n %{repo}-%{commit} -p1 +%autosetup -Sgit -n %{repo}-%{version} rm -rf plugins/main/windows %build @@ -121,118 +119,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_libexecdir}/cni/* %changelog -* Thu Dec 12 2019 Jindrich Novy - 0.8.3-5 -- compile with no_openssl -- Related: RHELPLAN-25139 - -* Wed Dec 11 2019 Jindrich Novy - 0.8.3-4 -- compile in FIPS mode -- Related: RHELPLAN-25139 - -* Mon Dec 09 2019 Jindrich Novy - 0.8.3-3 -- be sure to use golang >= 1.12.12-4 -- Related: RHELPLAN-25139 - -* Wed Dec 04 2019 Jindrich Novy - 0.8.3-2 -- build with GO111MODULE=off -- Related: RHELPLAN-25139 - -* Wed Dec 04 2019 Jindrich Novy - 0.8.3-1 -- update to 0.8.3 -- Related: RHELPLAN-25139 - -* Thu Aug 01 2019 Jindrich Novy - 0.8.1-2 -- backport https://github.com/coreos/go-iptables/pull/62 - from Michael Cambria -- Resolves: #1627561 - -* Thu Jun 13 2019 Lokesh Mandvekar - 0.8.1-1 -- Resolves: #1720319 - bump to v0.8.1 - -* Sat Jun 01 2019 Lokesh Mandvekar - 0.7.5-1 -- Resolves: #1616063 -- bump to v0.7.5 - -* Tue Dec 18 2018 Frantisek Kluknavsky - 0.7.4-3.git9ebe139 -- re-enable debuginfo - -* Mon Dec 17 2018 Frantisek Kluknavsky - 0.7.4-2.git9ebe139 -- rebase, removed patch that is already upstream - -* Mon Dec 17 2018 Frantisek Kluknavsky - 0.7.3-7.git19f2f28 -- go tools not in scl anymore - -* Mon Aug 27 2018 Lokesh Mandvekar - 0.7.3-6.git19f2f28 -- correct tag specification format in %%gobuild macro - -* Fri Aug 24 2018 Lokesh Mandvekar - 0.7.3-5.git19f2f28 -- Resolves: #1616062 - patch to revert coreos/go-iptables bump - -* Wed Aug 08 2018 Frantisek Kluknavsky - 0.7.3-4.git19f2f28 -- Resolves:#1603012 -- fix versioning, upstream got it wrong at 7.2 - -* Tue Aug 07 2018 Lokesh Mandvekar - 0.7.2-3.git19f2f28 -- disable i686 temporarily for appstream builds -- update golang deps and gobuild definition - -* Mon Aug 06 2018 Frantisek Kluknavsky - 0.7.2-2.git19f2f28 -- rebase - -* Thu Jul 12 2018 Frantisek Kluknavsky - 0.7.0-103.gitdd8ff8a -- enable scl with the toolset - -* Tue Jul 03 2018 Lokesh Mandvekar - 0.7.0-102.gitdd8ff8a -- remove devel and unittest subpackages -- use new go-toolset deps - -* Thu May 10 2018 Frantisek Kluknavsky - 0.7.0-101 -- rebase -- patches already upstream, removed - -* Thu Apr 26 2018 Frantisek Kluknavsky - 0.6.0-6 -- Imported from Fedora -- Renamed CNI -> plugins - -* Mon Apr 2 2018 Peter Robinson 0.6.0-4 -- Own the libexec cni directory - -* Wed Feb 07 2018 Fedora Release Engineering - 0.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Dan Williams - 0.6.0-2 -- skip settling IPv4 addresses - -* Mon Jan 08 2018 Frantisek Kluknavsky - 0.6.0-1 -- rebased to 7480240de9749f9a0a5c8614b17f1f03e0c06ab9 - -* Fri Oct 13 2017 Lokesh Mandvekar - 0.5.2-7 -- do not install to /opt (against Fedora Guidelines) - -* Thu Aug 24 2017 Jan Chaloupka - 0.5.2-6 -- Enable devel subpackage - -* Wed Aug 02 2017 Fedora Release Engineering - 0.5.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.5.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jul 13 2017 Lokesh Mandvekar - 0.5.2-3 -- excludearch: ppc64 as it's not in goarches anymore -- re-enable s390x - -* Fri Jun 30 2017 Lokesh Mandvekar - 0.5.2-2 -- upstream moved to github.com/containernetworking/plugins -- built commit dcf7368 -- provides: containernetworking-plugins -- use vendored deps because they're a lot less of a PITA -- excludearch: s390x for now (rhbz#1466865) - -* Mon Jun 12 2017 Timothy St. Clair - 0.5.2-1 -- Update to 0.5.2 -- Softlink to default /opt/cni/bin directories - -* Sun May 07 2017 Timothy St. Clair - 0.5.1-1 -- Initial package +* Thu May 14 2020 Jindrich Novy - 0.8.6-1 +- update to https://github.com/containernetworking/plugins/releases/tag/v0.8.6 +- Related: RHELPLAN-39206 +* Fri Apr 10 2020 Jindrich Novy - 0.8.5-1 +- update to https://github.com/containernetworking/plugins/archive/v0.8.5.tar.gz +- Related: RHELPLAN-39206