From 0e51a5a6f4585f1a23405d067a11402388ba9ee0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Jan 2020 17:25:41 -0500 Subject: [PATCH] import containernetworking-plugins-0.8.3-5.module+el8.2.0+5201+6b31f0d9 --- .containernetworking-plugins.metadata | 2 +- .gitignore | 2 +- SPECS/containernetworking-plugins.spec | 39 +++++++++++++++++++++----- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/.containernetworking-plugins.metadata b/.containernetworking-plugins.metadata index 049b7c4..6b9039c 100644 --- a/.containernetworking-plugins.metadata +++ b/.containernetworking-plugins.metadata @@ -1 +1 @@ -b574080f86ef426a169014f5fc6008b280514de0 SOURCES/plugins-fe60fcd.tar.gz +78fc72f4a51634078171068805db4e4b245c6af9 SOURCES/plugins-d5efdfe.tar.gz diff --git a/.gitignore b/.gitignore index 9848234..84edb48 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/plugins-fe60fcd.tar.gz +SOURCES/plugins-d5efdfe.tar.gz diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec index acab1e8..91e14b2 100644 --- a/SPECS/containernetworking-plugins.spec +++ b/SPECS/containernetworking-plugins.spec @@ -10,7 +10,7 @@ %if ! 0%{?gobuild:1} %define gobuild(o:) \ -go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${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:-} -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 @@ -21,19 +21,18 @@ 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 fe60fcddb897079746ec1523fd1837ab05b1e689 +%global commit d5efdfe1f6d6e8e9e9494e3f43be54f76c0f8fd6 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: containernetworking-plugins -Version: 0.8.1 -Release: 1%{?dist} +Version: 0.8.3 +Release: 5%{?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} +BuildRequires: golang >= 1.12.12-4 BuildRequires: git BuildRequires: go-md2man Provides: containernetworking-cni = %{version}-%{release} @@ -46,7 +45,7 @@ only with network connectivity of containers and removing allocated resources when the container is deleted. %prep -%autosetup -Sgit -n %{repo}-%{commit} +%autosetup -n %{repo}-%{commit} -p1 rm -rf plugins/main/windows %build @@ -59,6 +58,7 @@ if [ ! -h gopath/src/${REPO_PATH} ]; then fi export GOPATH=$(pwd)/gopath +export GO111MODULE=off mkdir -p $(pwd)/bin echo "Building plugins" @@ -121,6 +121,31 @@ 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