From 5d22a86f04c6326dd86bad42b2ca4ad7742e1134 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sat, 20 Mar 2021 12:33:00 +0000 Subject: [PATCH 1/8] freebsd build --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8a3147e..0f5af10 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,8 +36,9 @@ steps: - name: cache path: /go commands: - - GOOS=linux GOARCH=amd64 go build -o linux_amd64 - - GOOS=linux GOARCH=arm GOARM=7 go build -o linux_arm_v7 + - GOOS=linux GOARCH=amd64 go build -o linux_amd64 + - GOOS=linux GOARCH=arm GOARM=7 go build -o linux_arm_v7 + - GOOS=freebsd GOARCH=arm go build -o freebsd_arm_v8a - name: upload image: minio/mc From 3605cb32ba03c5e136a5a74f548164d1685b47cf Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sat, 20 Mar 2021 12:36:18 +0000 Subject: [PATCH 2/8] updated goproxy --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0f5af10..9ad8ec6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: - name: install image: golang:1.15 environment: - GOPROXY: http://10.20.0.25:3142|direct + GOPROXY: http://containers.internal.hillion.co.uk:3142,direct volumes: - name: cache path: /go From 902a9aed61c2d4c259a23607cf50b880594850e0 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sat, 20 Mar 2021 12:37:49 +0000 Subject: [PATCH 3/8] bumped go version --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9ad8ec6..179f128 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,12 +5,12 @@ name: default steps: - name: format - image: golang:1.15 + image: golang:1.16 commands: - bash -c "gofmt -l . | wc -l | cmp -s <(echo 0) || (gofmt -l . && exit 1)" - name: install - image: golang:1.15 + image: golang:1.16 environment: GOPROXY: http://containers.internal.hillion.co.uk:3142,direct volumes: @@ -20,7 +20,7 @@ steps: - go test -i ./... - name: test - image: golang:1.15 + image: golang:1.16 volumes: - name: cache path: /go @@ -28,7 +28,7 @@ steps: - go test ./... - name: build (debian) - image: golang:1.15-buster + image: golang:1.16-buster when: event: - push From 2dcf821a6fc016617a5ddca4f5979b24c1ac9a0a Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sat, 20 Mar 2021 12:39:18 +0000 Subject: [PATCH 4/8] updated s3 --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 179f128..8ff5c2f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -50,9 +50,10 @@ steps: SECRET_KEY: from_secret: s3_secret_key commands: - - mc alias set s3 http://10.20.0.25:3900 $${ACCESS_KEY} $${SECRET_KEY} + - mc alias set s3 https://s3.us-west-001.backblazeb2.com $${ACCESS_KEY} $${SECRET_KEY} - mc cp linux_amd64 s3/dissertation/binaries/debian/${DRONE_BRANCH}_linux_amd64 - mc cp linux_arm_v7 s3/dissertation/binaries/debian/${DRONE_BRANCH}_linux_arm_v7 + - mc cp freebsd_arm_v8a s3/dissertation/binaries/debian/${DRONE_BRANCH}_freebsd_arm_v8a volumes: - name: cache From 546e7eca0bec6ec409c793646ce499b2cbe90d64 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sat, 20 Mar 2021 13:38:12 +0000 Subject: [PATCH 5/8] freebsd arm64 --- .drone.yml | 8 ++++---- go.mod | 2 +- go.sum | 6 ++++-- tun/tun.go | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8ff5c2f..bccbe38 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,9 +36,9 @@ steps: - name: cache path: /go commands: - - GOOS=linux GOARCH=amd64 go build -o linux_amd64 - - GOOS=linux GOARCH=arm GOARM=7 go build -o linux_arm_v7 - - GOOS=freebsd GOARCH=arm go build -o freebsd_arm_v8a + - GOOS=linux GOARCH=amd64 go build -o linux_amd64 + - GOOS=linux GOARCH=arm GOARM=7 go build -o linux_arm_v7 + - GOOS=freebsd GOARCH=arm64 GOARM=8 go build -o freebsd_arm64_v8a - name: upload image: minio/mc @@ -53,7 +53,7 @@ steps: - mc alias set s3 https://s3.us-west-001.backblazeb2.com $${ACCESS_KEY} $${SECRET_KEY} - mc cp linux_amd64 s3/dissertation/binaries/debian/${DRONE_BRANCH}_linux_amd64 - mc cp linux_arm_v7 s3/dissertation/binaries/debian/${DRONE_BRANCH}_linux_arm_v7 - - mc cp freebsd_arm_v8a s3/dissertation/binaries/debian/${DRONE_BRANCH}_freebsd_arm_v8a + - mc cp freebsd_arm64_v8a s3/dissertation/binaries/debian/${DRONE_BRANCH}_freebsd_arm64_v8a volumes: - name: cache diff --git a/go.mod b/go.mod index ad76837..999cca7 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module mpbl3p go 1.15 require ( + github.com/JakeHillion/taptun v0.0.0-20210320133200-cf0ef75b1bff // indirect github.com/go-playground/validator/v10 v10.4.1 - github.com/pkg/taptun v0.0.0-20160424131934-bbbd335672ab github.com/smartystreets/goconvey v1.6.4 // indirect github.com/stretchr/testify v1.4.0 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 diff --git a/go.sum b/go.sum index 2c6ebc9..cc4beb1 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,7 @@ +github.com/JakeHillion/taptun v0.0.0-20160424131934-bbbd335672ab h1:/UB98lLA11PJZOqhdzqeITMTMz6eiTjti9Z9kYq1SWQ= +github.com/JakeHillion/taptun v0.0.0-20160424131934-bbbd335672ab/go.mod h1:8WBFCKR7ZdT+WVtgyiSPJf6gqXiNZUvfglN8vwkoyBE= +github.com/JakeHillion/taptun v0.0.0-20210320133200-cf0ef75b1bff h1:O+wiKpOHS2BidwDz6ZuR3dVQNsrD55raE9mY4yub6Wc= +github.com/JakeHillion/taptun v0.0.0-20210320133200-cf0ef75b1bff/go.mod h1:8WBFCKR7ZdT+WVtgyiSPJf6gqXiNZUvfglN8vwkoyBE= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= @@ -14,8 +18,6 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/pkg/taptun v0.0.0-20160424131934-bbbd335672ab h1:dAXDRtXYxj4sTR5WeRuTFJGH18QMT6AUpUgRwedI6es= -github.com/pkg/taptun v0.0.0-20160424131934-bbbd335672ab/go.mod h1:N5a/Ll2ZNk5wjiLNW9LIiNtO9RNYcaYmcXSYKMYrlDg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= diff --git a/tun/tun.go b/tun/tun.go index b4141f2..d76fabb 100644 --- a/tun/tun.go +++ b/tun/tun.go @@ -1,7 +1,7 @@ package tun import ( - "github.com/pkg/taptun" + "github.com/JakeHillion/taptun" "io" "log" "mpbl3p/proxy" From 233460a5de924feabea169515db9ad0af06815f2 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sat, 20 Mar 2021 13:39:42 +0000 Subject: [PATCH 6/8] removed goarm --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index bccbe38..911a7d7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -38,7 +38,7 @@ steps: commands: - GOOS=linux GOARCH=amd64 go build -o linux_amd64 - GOOS=linux GOARCH=arm GOARM=7 go build -o linux_arm_v7 - - GOOS=freebsd GOARCH=arm64 GOARM=8 go build -o freebsd_arm64_v8a + - GOOS=freebsd GOARCH=arm64 go build -o freebsd_arm64_v8a - name: upload image: minio/mc From bd52357f85ce5febe4d1f744c16a5d8cd9cdba59 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sat, 20 Mar 2021 13:52:44 +0000 Subject: [PATCH 7/8] signed dronefile --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 911a7d7..8c66333 100644 --- a/.drone.yml +++ b/.drone.yml @@ -61,6 +61,6 @@ volumes: --- kind: signature -hmac: a7c498332fbf43f422a68475c53daa0a65b7801004f09300e40275007dec9bee +hmac: de07a3ab113028b48c590c406f7ab8f74aeae49679287862168d912ec10e9920 ... From 9f14c9af8c5a4c2eaf8a8438b15ee0bd606a2c0c Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sat, 20 Mar 2021 14:25:19 +0000 Subject: [PATCH 8/8] removed incorrect indirect --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 999cca7..edfdcc1 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module mpbl3p go 1.15 require ( - github.com/JakeHillion/taptun v0.0.0-20210320133200-cf0ef75b1bff // indirect + github.com/JakeHillion/taptun v0.0.0-20210320133200-cf0ef75b1bff github.com/go-playground/validator/v10 v10.4.1 github.com/smartystreets/goconvey v1.6.4 // indirect github.com/stretchr/testify v1.4.0