From b74d188b5fc0d34cec82e216510895c444c7958b Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 1 Apr 2022 12:04:39 -0400
Subject: [PATCH] bump to v1.1.1

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore                       |  1 +
 containernetworking-plugins.spec | 37 +++++++++++++++++++++++++-------
 sources                          |  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2026356..1bd5402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@
 /v1.0.0.tar.gz
 /v1.0.1.tar.gz
 /v1.1.0.tar.gz
+/v1.1.1.tar.gz
diff --git a/containernetworking-plugins.spec b/containernetworking-plugins.spec
index 60f9102..0357b12 100644
--- a/containernetworking-plugins.spec
+++ b/containernetworking-plugins.spec
@@ -1,5 +1,3 @@
-%global with_devel 1
-
 %if 0%{?fedora}
 %global with_debug 1
 %else
@@ -13,10 +11,6 @@
 %global debug_package   %{nil}
 %endif
 
-%if ! 0%{?gobuild:1}
-%define gobuild(o:) GO111MODULE=off 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 %{?**};
-%endif
-
 %global provider github
 %global provider_tld com
 %global project containernetworking
@@ -24,7 +18,7 @@
 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
 %global git0 https://%{import_path}
 
-%global built_tag v1.1.0
+%global built_tag v1.1.1
 %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
 %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
 
@@ -32,7 +26,7 @@ Name: %{project}-%{repo}
 Version: %{gen_version}
 Release: %autorelease
 Summary: Libraries for writing CNI plugin
-License: ASL 2.0
+License: ASL 2.0 and BSD and MIT
 URL: %{git0}
 Source0: %{git0}/archive/%{built_tag}.tar.gz
 BuildRequires: golang >= 1.16.6
@@ -47,6 +41,33 @@ Obsoletes: %{project}-cni < 0.7.1-2
 Provides: %{project}-cni = %{version}-%{release}
 Provides: kubernetes-cni
 Provides: container-network-stack = 1
+# vendored libraries
+# awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d'
+Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.4.17
+Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.20
+Provides: bundled(golang(github.com/alexflint/go_filemutex)) = v1.1.0
+Provides: bundled(golang(github.com/buger/jsonparser)) = v1.1.1
+Provides: bundled(golang(github.com/containerd/cgroups)) = v1.0.1
+Provides: bundled(golang(github.com/containernetworking/cni)) = v1.0.1
+Provides: bundled(golang(github.com/coreos/go_iptables)) = v0.6.0
+Provides: bundled(golang(github.com/coreos/go_systemd/v22)) = v22.3.2
+Provides: bundled(golang(github.com/d2g/dhcp4)) = v0.0.0_20170904100407_a1d1b6c41b1c
+Provides: bundled(golang(github.com/d2g/dhcp4client)) = v1.0.0
+Provides: bundled(golang(github.com/d2g/dhcp4server)) = v0.0.0_20181031114812_7d4a0a7f59a5
+Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.4.9
+Provides: bundled(golang(github.com/godbus/dbus/v5)) = v5.0.4
+Provides: bundled(golang(github.com/gogo/protobuf)) = v1.3.2
+Provides: bundled(golang(github.com/golang/groupcache)) = v0.0.0_20200121045136_8c9f03a8e57e
+Provides: bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12
+Provides: bundled(golang(github.com/networkplumbing/go_nft)) = v0.2.0
+Provides: bundled(golang(github.com/nxadm/tail)) = v1.4.8
+Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.4
+Provides: bundled(golang(github.com/onsi/gomega)) = v1.15.0
+Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1
+Provides: bundled(golang(github.com/safchain/ethtool)) = v0.0.0_20210803160452_9aa261dae9b1
+Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1
+Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.1.1_0.20210330154013_f5de75959ad5
+Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f
 
 %description
 The CNI (Container Network Interface) project consists of a specification
diff --git a/sources b/sources
index 0a88522..df26dc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.1.0.tar.gz) = 43cfcb0225cbc85cc75205cefac75f852fccce1a71b0384fe1f989e64c37508fc3b87cbc05c6dac679aea8950c3cd4d328a616fa79b52474561c624164da0206
+SHA512 (v1.1.1.tar.gz) = 03da31caee5f9595abf65d4a551984b995bc18c5e97409549f08997c5a6a2b41a8950144f8a5b4f810cb401ddbe312232d2be76ec977acf8108eb490786b1817