From f3b21f90c6430613300bde75c57514c48a5a4980 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Wed, 26 Feb 2020 22:34:23 +0100 Subject: [PATCH] deps: latest upper.io/db and pin probe-engine (#116) We're specifically pinning a commit of probe-engine that is using MK v0.10.11, so that we address the following issues: 1. we use db-ip.com for the country database as opposed to using the increasingly stale MaxMind database (see https://github.com/ooni/probe-engine/issues/334) 2. we're using an implementation of WhatsApp that does not suffer from the super-old CIDR bug (see https://github.com/ooni/probe-engine/issues/341) 3. we're not linking to libcurl anymore on Windows and Linux, thanks to this new version of MK where we can optionally disable libcurl; we are still linking to libcurl on macOS, but that has no impact on the binary size since on macOS libcurl is part of the system This should be enough, from my side to bless a new release of the probe-cli (see https://github.com/ooni/probe/issues/1028). --- .dockerignore | 2 ++ Dockerfile | 2 +- build.sh | 4 ++-- go.mod | 4 ++-- go.sum | 8 ++++---- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.dockerignore b/.dockerignore index f16335c..b91a3ae 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,4 @@ /dist +/ooniprobe +/ooniprobe.exe /testdata/gotmp diff --git a/Dockerfile b/Dockerfile index 4e4b5d7..c6add3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ -FROM openobservatory/mk-alpine:latest +FROM openobservatory/mk-alpine:20200226 RUN apk add --no-progress git go diff --git a/build.sh b/build.sh index 4a6310f..76c9a9e 100755 --- a/build.sh +++ b/build.sh @@ -22,7 +22,7 @@ fi if [ "$1" = "windows" ]; then set -x CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ \ - CGO_ENABLED=1 GOOS=windows GOARCH=amd64 \ + CGO_LDFLAGS_ALLOW='-fstack-.*' CGO_ENABLED=1 GOOS=windows GOARCH=amd64 \ go build $buildtags -ldflags="$ldflags" \ -o dist/windows/amd64/ooniprobe.exe -v ./cmd/ooniprobe @@ -48,7 +48,7 @@ elif [ "$1" = "release" ]; then -C ./dist/macos/amd64 ooniprobe shasum -a 256 ooniprobe_${v}_darwin_amd64.tar.gz >> ooniprobe_checksums.txt $0 windows - tar -czf ooniprobe_${v}_windows_amd64.tar.gz ./dist/windows/amd64 \ + tar -czf ooniprobe_${v}_windows_amd64.tar.gz LICENSE.md Readme.md \ -C dist/windows/amd64 ooniprobe.exe shasum -a 256 ooniprobe_${v}_windows_amd64.tar.gz >> ooniprobe_checksums.txt echo "" diff --git a/go.mod b/go.mod index a879580..3bdbf63 100644 --- a/go.mod +++ b/go.mod @@ -9,10 +9,10 @@ require ( github.com/fatih/color v1.9.0 github.com/getsentry/raven-go v0.0.0-20190419175539-919484f041ea github.com/mattn/go-colorable v0.1.4 - github.com/ooni/probe-engine v0.7.0 + github.com/ooni/probe-engine v0.7.1-0.20200226205256-ae59c0578995 github.com/pkg/errors v0.9.1 github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3 gopkg.in/AlecAivazis/survey.v1 v1.8.8 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect - upper.io/db.v3 v3.6.3+incompatible + upper.io/db.v3 v3.6.4+incompatible ) diff --git a/go.sum b/go.sum index 4c145a7..a5b518f 100644 --- a/go.sum +++ b/go.sum @@ -327,8 +327,8 @@ github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/ooni/netx v0.0.0-20200211124352-4f8d645bce64 h1:rLXhIycJB+yGJPMRY1tP4KzYqd/EvhrP8x7CjbeKmJc= github.com/ooni/netx v0.0.0-20200211124352-4f8d645bce64/go.mod h1:vTJ7nYH2j51lX8yvhdLaHscvwz1GvWoiB26jYKEmqyA= -github.com/ooni/probe-engine v0.7.0 h1:itumj5yq69Me07NdVVrk5y9PbNv3LfYJm0G8z489ByM= -github.com/ooni/probe-engine v0.7.0/go.mod h1:CIO14bnj3sIRI3MG+7HYQo2EgLSVpHh5/E2YVNjXRhA= +github.com/ooni/probe-engine v0.7.1-0.20200226205256-ae59c0578995 h1:8CuuBzP7V4tjJ8nRTI5WkvkKzITSnSHom7MVxBZDnTA= +github.com/ooni/probe-engine v0.7.1-0.20200226205256-ae59c0578995/go.mod h1:CIO14bnj3sIRI3MG+7HYQo2EgLSVpHh5/E2YVNjXRhA= github.com/openconfig/gnmi v0.0.0-20190823184014-89b2bf29312c/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc= github.com/openconfig/reference v0.0.0-20190727015836-8dfd928c9696/go.mod h1:ym2A+zigScwkSEb/cVQB0/ZMpU3rqiH6X7WRRsxgOGw= github.com/oschwald/geoip2-golang v1.4.0 h1:5RlrjCgRyIGDz/mBmPfnAF4h8k0IAcRv9PvrpOfz+Ug= @@ -655,5 +655,5 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -upper.io/db.v3 v3.6.3+incompatible h1:SJLWd7H56Vwm4rYa+cHAQDYWcvvOt1C/5PD/IIBZPW8= -upper.io/db.v3 v3.6.3+incompatible/go.mod h1:FgTdD24eBjJAbPKsQSiHUNgXjOR4Lub3u1UMHSIh82Y= +upper.io/db.v3 v3.6.4+incompatible h1:ZWpoGpfyvRDxMW1lYLBwwSurzodIvAUP4aYBsH/ePiY= +upper.io/db.v3 v3.6.4+incompatible/go.mod h1:FgTdD24eBjJAbPKsQSiHUNgXjOR4Lub3u1UMHSIh82Y=