From ad85a86279679f8a3ac9e0de61087edaebdad258 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2020 23:32:56 +0000
Subject: import containernetworking-plugins-0.8.3-2.el7


---

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 7a043ed..97b94d3 100644
--- a/SPECS/containernetworking-plugins.spec
+++ b/SPECS/containernetworking-plugins.spec
@@ -2,41 +2,38 @@
 %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:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
+%define gobuild(o:) \
+scl enable go-toolset-1.12 -- go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
 %endif
 
-%global provider        github
-%global provider_tld    com
-%global project         containernetworking
-%global repo            plugins
+%global provider github
+%global provider_tld com
+%global project containernetworking
+%global repo plugins
 # https://github.com/containernetworking/plugins
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path     %{provider_prefix}
-%global commit          fe60fcddb897079746ec1523fd1837ab05b1e689
-%global shortcommit     %(c=%{commit}; echo ${c:0:7})
+%global import_path %{provider_prefix}
+%global commit d5efdfe1f6d6e8e9e9494e3f43be54f76c0f8fd6
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name: containernetworking-plugins
-Version: 0.8.1
+Version: 0.8.3
 Release: 2%{?dist}
 Summary: CNI network plugins
 License: ASL 2.0
 URL: https://%{provider_prefix}
 Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 %{ix86}
-
-%if 0%{?fedora}
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-%else
-BuildRequires: go-toolset-1.10
-BuildRequires: openssl-devel
-%endif #fedora
-
+ExcludeArch: %{ix86} s390 ppc ppc64
+BuildRequires: go-toolset-1.12
+BuildRequires: git
+BuildRequires: go-md2man
 Provides: containernetworking-cni = %{version}-%{release}
 
 %description
@@ -46,10 +43,8 @@ containers, along with a number of supported plugins. CNI concerns itself
 only with network connectivity of containers and removing allocated resources
 when the container is deleted.
 
-%{?enable_gotoolset110}
-
 %prep
-%autosetup -Sgit -n %{repo}-%{commit}
+%autosetup -n %{repo}-%{commit} -p1
 rm -rf plugins/main/windows
 
 %build
@@ -57,21 +52,22 @@ export ORG_PATH="%{provider}.%{provider_tld}/%{project}"
 export REPO_PATH="$ORG_PATH/%{repo}"
 
 if [ ! -h gopath/src/${REPO_PATH} ]; then
-   mkdir -p gopath/src/${ORG_PATH}
-   ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
+	mkdir -p gopath/src/${ORG_PATH}
+	ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
 fi
 
 export GOPATH=$(pwd)/gopath
+export GO111MODULE=off
 mkdir -p $(pwd)/bin
 
 echo "Building plugins"
 export PLUGINS="plugins/meta/* plugins/main/* plugins/ipam/* plugins/sample"
 for d in $PLUGINS; do
-        if [ -d "$d" ]; then
-                plugin="$(basename "$d")"
-                echo "  $plugin"
-                %gobuild -o "${PWD}/bin/$plugin" "$@" "$REPO_PATH"/$d
-        fi
+	if [ -d "$d" ]; then
+		plugin="$(basename "$d")"
+		echo "  $plugin"
+		%gobuild -o "${PWD}/bin/$plugin" "$@" "$REPO_PATH"/$d
+	fi
 done
 
 %install
@@ -80,10 +76,13 @@ install -p -m 0755 bin/* %{buildroot}/%{_libexecdir}/cni
 
 %check
 %if 0%{?with_check}
+# Since we aren't packaging up the vendor directory we need to link
+# back to it somehow. Hack it up so that we can add the vendor
+# directory from BUILD dir as a gopath to be searched when executing
+# tests from the BUILDROOT dir.
+ln -s ./ ./vendor/src # ./vendor/src -> ./vendor
 
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
+export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 
 %gotest %{import_path}/libcni
 %gotest %{import_path}/pkg/invoke
@@ -121,6 +120,19 @@ install -p -m 0755 bin/* %{buildroot}/%{_libexecdir}/cni
 %{_libexecdir}/cni/*
 
 %changelog
+* Thu Dec 12 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-2
+- build with no_openssl
+
+* Wed Dec 11 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-1
+- update to 0.8.3
+- compile in FIPS mode
+
+* Thu Oct 17 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.1-4
+- rebuild against go-toolset-1.11
+
+* Thu Oct 17 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.1-3
+- rebuild against extras-rhel-7.8-go-toolset-candidate
+
 * Fri Aug 02 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.1-2
 - use 0.8.1 release for RHEL 7.7