From 00db87927bb0df840e142e5d46d6635cec1e1235 Mon Sep 17 00:00:00 2001
From: RBrownSUSE <>
Date: May 19 2021 15:55:02 +0000
Subject: Update cilium to version 1.8.5 / rev 31 via SR 894256


https://build.opensuse.org/request/show/894256
by user RBrownSUSE + dimstar_suse

---

diff --git a/.files b/.files
index 83744bc..7593b38 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index dce5ac3..6853d51 100644
--- a/.rev
+++ b/.rev
@@ -325,4 +325,12 @@
   * 0001-operator-make-Add-install-target.patch (forwarded request 845099 from mrostecki)</comment>
     <requestid>845100</requestid>
   </revision>
+  <revision rev="31" vrev="2">
+    <srcmd5>addefdd3699d3e738168489b907f9da1</srcmd5>
+    <version>1.8.5</version>
+    <time>1621439325</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>894256</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index ce9c24a..ebf29d0 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-a09f05a878d920e56826af95b7b37f68
+82af5af1455f6a46bb49e6cbd02c0b6c
diff --git a/cilium-no-ineffassign-in-root.patch b/cilium-no-ineffassign-in-root.patch
new file mode 100644
index 0000000..d8ad327
--- /dev/null
+++ b/cilium-no-ineffassign-in-root.patch
@@ -0,0 +1,13 @@
+Index: cilium-1.8.5/Makefile
+===================================================================
+--- cilium-1.8.5.orig/Makefile
++++ cilium-1.8.5/Makefile
+@@ -444,7 +444,7 @@ microk8s: check-microk8s
+ ci-precheck: precheck
+ 	$(QUIET) $(MAKE) $(SUBMAKEOPTS) -C bpf build_all
+ 
+-precheck: ineffassign logging-subsys-field
++precheck: logging-subsys-field
+ ifeq ($(SKIP_K8S_CODE_GEN_CHECK),"false")
+ 	@$(ECHO_CHECK) contrib/scripts/check-k8s-code-gen.sh
+ 	$(QUIET) contrib/scripts/check-k8s-code-gen.sh
diff --git a/cilium.changes b/cilium.changes
index 4f3f1b3..6670bf0 100644
--- a/cilium.changes
+++ b/cilium.changes
@@ -1,4 +1,18 @@
 -------------------------------------------------------------------
+Mon May 17 12:13:09 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add cilium-no-ineffassign-in-root.patch: Do not run ineffassign
+  in the source root, where no go files exist.
+
+-------------------------------------------------------------------
+Thu Apr  1 09:15:23 UTC 2021 - Richard Brown <rbrown@suse.com>
+
+- Set GO111MODULE=auto to build with go1.16+
+  * Default changed to GO111MODULE=on in go1.16
+  * Set temporarily until using upstream release with go.mod
+  * Add BuildRequires: golang(API) >= 1.13 recommended dependency expression
+
+-------------------------------------------------------------------
 Fri Oct 30 16:50:02 UTC 2020 - Michał Rostecki <mrostecki@suse.com>
 
 - Update to 1.8.5
diff --git a/cilium.spec b/cilium.spec
index edb3265..c8f32c9 100644
--- a/cilium.spec
+++ b/cilium.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cilium
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -46,6 +46,8 @@ Source2:        cilium-cni-install
 Source3:        cilium-cni-uninstall
 # PATCH-FIX-UPSTREAM 0001-operator-make-Add-install-target.patch
 Patch0:         0001-operator-make-Add-install-target.patch
+# PATCH-FIX-OPENSUSE cilium-no-ineffassign-in-root.patch dimstar@opensuse.org -- Do not run ineffassing in source root ('inefassign .' without go files present)
+Patch1:         cilium-no-ineffassign-in-root.patch
 # Cilium needs to be aware of the version string of cilium-proxy
 BuildRequires:  cilium-proxy
 BuildRequires:  clang
@@ -60,7 +62,7 @@ BuildRequires:  llvm
 BuildRequires:  protobuf-devel
 BuildRequires:  shadow
 BuildRequires:  unzip
-BuildRequires:  golang(API) = 1.13
+BuildRequires:  golang(API) >= 1.13
 Requires:       awk
 Requires:       binutils
 Requires:       bpftool
@@ -182,6 +184,9 @@ containers in a Kubernetes cluster.
 find bpf/ -type f | grep -v .gitignore | tr "\n" ' ' > BPF_SRCFILES
 
 %build
+# go1.16+ default is GO111MODULE=on set to auto temporarily
+# until using upstream release with go.mod
+export GO111MODULE=auto
 %goprep %{provider_prefix}
 export GOPATH=%{_builddir}/go
 cd $GOPATH/src/%{provider_prefix}
@@ -198,7 +203,6 @@ make -C daemon CILIUM_ENVOY_SHA="${CILIUM_ENVOY_SHA}"
 %if 0%{?suse_version} > 1510 && 0%{?is_opensuse}
 make precheck
 make govet
-make ineffassign
 make logging-subsys-field
 %endif