From f70f2481c77274ec9043b1efc9cf236a093dc37e Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 14 Jan 2020 14:58:08 +0000
Subject: [PATCH] Update tcptracer-bpf version so we don't need manual
 workaround

---
 go.mod                                                          | 2 +-
 go.sum                                                          | 2 ++
 vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/event.go  | 2 +-
 .../weaveworks/tcptracer-bpf/pkg/tracer/offsetguess.go          | 2 +-
 .../weaveworks/tcptracer-bpf/{ => pkg/tracer}/tcptracer-bpf.h   | 0
 vendor/modules.txt                                              | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename vendor/github.com/weaveworks/tcptracer-bpf/{ => pkg/tracer}/tcptracer-bpf.h (100%)

diff --git a/go.mod b/go.mod
index 3d8e24f85..cfd5330ab 100644
--- a/go.mod
+++ b/go.mod
@@ -153,7 +153,7 @@ require (
 	github.com/weaveworks/go-odp v0.0.0-20151030115644-f8c8c40c1889 // indirect
 	github.com/weaveworks/promrus v1.2.0 // indirect
 	github.com/weaveworks/ps v0.0.0-20160725183535-70d17b2d6f76
-	github.com/weaveworks/tcptracer-bpf v0.0.0-20190731111909-cd53e7c84bac
+	github.com/weaveworks/tcptracer-bpf v0.0.0-20200114145059-84a08fc667c0
 	github.com/weaveworks/weave v2.3.1-0.20180427133448-4da998ab4507+incompatible
 	github.com/willdonnelly/passwd v0.0.0-20141013001024-7935dab3074c
 	go.uber.org/atomic v1.3.2 // indirect
diff --git a/go.sum b/go.sum
index 3ea077cda..0183ac906 100644
--- a/go.sum
+++ b/go.sum
@@ -318,6 +318,8 @@ github.com/weaveworks/ps v0.0.0-20160725183535-70d17b2d6f76 h1:lX3A5prmpe4MT9iaT
 github.com/weaveworks/ps v0.0.0-20160725183535-70d17b2d6f76/go.mod h1:6YfgZlj+cWgxFlwYrm3aPt1rS1xDTD1SEqL0Ms3Zxks=
 github.com/weaveworks/tcptracer-bpf v0.0.0-20190731111909-cd53e7c84bac h1:bE6+keem2eUQT2HcRwocyA9HtQs9o2ZU6mwEvA5AVeo=
 github.com/weaveworks/tcptracer-bpf v0.0.0-20190731111909-cd53e7c84bac/go.mod h1:vIed/thLU28ufcvDlpI1X5u+pPoI30rpjIbvvDWKjMk=
+github.com/weaveworks/tcptracer-bpf v0.0.0-20200114145059-84a08fc667c0 h1:qWN6ahq9adX+BOGk6+8vKmZsZuzRgtyEWcHC+7Z5axo=
+github.com/weaveworks/tcptracer-bpf v0.0.0-20200114145059-84a08fc667c0/go.mod h1:vIed/thLU28ufcvDlpI1X5u+pPoI30rpjIbvvDWKjMk=
 github.com/weaveworks/weave v2.3.1-0.20180427133448-4da998ab4507+incompatible h1:TEQBiNDB429+6mICzJfnNXxdFl3SE6tmJf7Y3a0Yhso=
 github.com/weaveworks/weave v2.3.1-0.20180427133448-4da998ab4507+incompatible/go.mod h1:5ht5Uktjg++tIOqmWI2VvRzbNM7i+RhtqDQPumydP1U=
 github.com/willdonnelly/passwd v0.0.0-20141013001024-7935dab3074c h1:4+NVyrLUuEmvE3r3Xst7gPuKhAP6X04ACpMmPvtK0M0=
diff --git a/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/event.go b/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/event.go
index 2ee9a2507..5457efeaa 100644
--- a/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/event.go
+++ b/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/event.go
@@ -9,7 +9,7 @@ import (
 )
 
 /*
-#include "../../tcptracer-bpf.h"
+#include "tcptracer-bpf.h"
 */
 import "C"
 
diff --git a/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/offsetguess.go b/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/offsetguess.go
index 7112f46e7..91a376a29 100644
--- a/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/offsetguess.go
+++ b/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/offsetguess.go
@@ -19,7 +19,7 @@ import (
 )
 
 /*
-#include "../../tcptracer-bpf.h"
+#include "tcptracer-bpf.h"
 */
 import "C"
 
diff --git a/vendor/github.com/weaveworks/tcptracer-bpf/tcptracer-bpf.h b/vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/tcptracer-bpf.h
similarity index 100%
rename from vendor/github.com/weaveworks/tcptracer-bpf/tcptracer-bpf.h
rename to vendor/github.com/weaveworks/tcptracer-bpf/pkg/tracer/tcptracer-bpf.h
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 677390c41..6b69c65ff 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -330,7 +330,7 @@ github.com/weaveworks/go-checkpoint
 github.com/weaveworks/promrus
 # github.com/weaveworks/ps v0.0.0-20160725183535-70d17b2d6f76
 github.com/weaveworks/ps
-# github.com/weaveworks/tcptracer-bpf v0.0.0-20190731111909-cd53e7c84bac
+# github.com/weaveworks/tcptracer-bpf v0.0.0-20200114145059-84a08fc667c0
 github.com/weaveworks/tcptracer-bpf/pkg/tracer
 # github.com/weaveworks/weave v2.3.1-0.20180427133448-4da998ab4507+incompatible
 github.com/weaveworks/weave/common