From 9a23a61ea57693b5ff947d5977507edbe41209fd Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 05 2019 19:39:03 +0000
Subject: import containernetworking-plugins-0.8.1-2.module+el8.1.0+4081+b29780af


---

diff --git a/.containernetworking-plugins.metadata b/.containernetworking-plugins.metadata
index 4e47661..049b7c4 100644
--- a/.containernetworking-plugins.metadata
+++ b/.containernetworking-plugins.metadata
@@ -1 +1 @@
-97ba3a594cae5771913218e3a4a9722ccc88e2e3 SOURCES/plugins-9ebe139.tar.gz
+b574080f86ef426a169014f5fc6008b280514de0 SOURCES/plugins-fe60fcd.tar.gz
diff --git a/.gitignore b/.gitignore
index a8ad5ff..9848234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/plugins-9ebe139.tar.gz
+SOURCES/plugins-fe60fcd.tar.gz
diff --git a/SOURCES/remove-existsErr-workaround.patch b/SOURCES/remove-existsErr-workaround.patch
new file mode 100644
index 0000000..55e8670
--- /dev/null
+++ b/SOURCES/remove-existsErr-workaround.patch
@@ -0,0 +1,32 @@
+commit a5f18ede385f8f348d876635c8483640d6446d65
+Author: Michael Cambria <mcambria@redhat.com>
+Date:   Mon Jun 24 16:11:51 2019 -0400
+
+    Remove iptables mode dependent existsErr code work-around.
+    iptables fixed in iptables-1.8.1
+    commit c19fa5833a0bc0eb787799634bd26dea91fcdca1
+
+diff -up plugins-fe60fcddb897079746ec1523fd1837ab05b1e689/vendor/github.com/coreos/go-iptables/iptables/iptables.go.orig plugins-fe60fcddb897079746ec1523fd1837ab05b1e689/vendor/github.com/coreos/go-iptables/iptables/iptables.go
+--- plugins-fe60fcddb897079746ec1523fd1837ab05b1e689/vendor/github.com/coreos/go-iptables/iptables/iptables.go.orig	2019-05-29 18:30:15.000000000 +0200
++++ plugins-fe60fcddb897079746ec1523fd1837ab05b1e689/vendor/github.com/coreos/go-iptables/iptables/iptables.go	2019-07-31 09:24:30.070738570 +0200
+@@ -302,18 +302,13 @@ func (ipt *IPTables) NewChain(table, cha
+ 	return ipt.run("-t", table, "-N", chain)
+ }
+ 
++const existsErr = 1
++
+ // ClearChain flushed (deletes all rules) in the specified table/chain.
+ // If the chain does not exist, a new one will be created
+ func (ipt *IPTables) ClearChain(table, chain string) error {
+ 	err := ipt.NewChain(table, chain)
+ 
+-	// the exit code for "this table already exists" is different for
+-	// different iptables modes
+-	existsErr := 1
+-	if ipt.mode == "nf_tables" {
+-		existsErr = 4
+-	}
+-
+ 	eerr, eok := err.(*Error)
+ 	switch {
+ 	case err == nil:
diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec
index 9d0650a..0faadac 100644
--- a/SPECS/containernetworking-plugins.spec
+++ b/SPECS/containernetworking-plugins.spec
@@ -8,9 +8,11 @@
 %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 ${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
 
 %global provider github
 %global provider_tld com
@@ -19,16 +21,19 @@ 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 commit fe60fcddb897079746ec1523fd1837ab05b1e689
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name: containernetworking-plugins
-Version: 0.7.4
-Release: 3.git%{shortcommit}%{?dist}
-Summary: Some CNI network plugins, maintained by the containernetworking team.
+Version: 0.8.1
+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
+# https://github.com/coreos/go-iptables/pull/62/commits/a5f18ede385f8f348d876635c8483640d6446d65
+# resolves https://bugzilla.redhat.com/show_bug.cgi?id=1627561
+Patch0: remove-existsErr-workaround.patch
 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}
@@ -44,7 +49,8 @@ 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
 export ORG_PATH="%{provider}.%{provider_tld}/%{project}"
@@ -118,6 +124,18 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_libexecdir}/cni/*
 
 %changelog
+* Thu Aug 01 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.1-2
+- backport https://github.com/coreos/go-iptables/pull/62
+  from Michael Cambria
+- Resolves: #1627561
+
+* 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