chore: prepare release 3.21.0 (#1528)

* chore(MOBILE/android/ensure): update * chore: go generate ./... * chore: use go1.20.14 * chore: update the user agent * chore: use 2024-03 geoip database See ooni/probe#2690
ooni · Mar 22, 2024 · 08a87df · 08a87df
1 parent dc3a53a
commit 08a87df
Show file tree

Hide file tree

Showing 19 changed files with 74 additions and 27 deletions.
diff --git a/Dockerfile.oonith b/Dockerfile.oonith
@@ -3,7 +3,7 @@
 #
 # Note: The Dockerfile needs to reside in the root of the repo, so that we can
 # copy files into the docker build context.
-FROM golang:1.20.12-bullseye as builder
+FROM golang:1.20.14-bullseye as builder
 ARG BRANCH_NAME=master
 
 WORKDIR /build
@@ -13,7 +13,7 @@ COPY . .
 RUN go run ./internal/cmd/buildtool oohelperd build
 
 ## Image running on the host
-FROM golang:1.20.12-bullseye as runner
+FROM golang:1.20.14-bullseye as runner
 
 WORKDIR /app
 

diff --git a/GOVERSION b/GOVERSION
@@ -1 +1 @@
-1.20.12
+1.20.14
diff --git a/MOBILE/android/ensure b/MOBILE/android/ensure
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-__install_extra="build-tools;34.0.0 platforms;android-33"
+__install_extra="build-tools;34.0.0 platforms;android-34"
 
 __ndk_version=$(cat ./NDKVERSION)
 

diff --git a/Readme.md b/Readme.md
@@ -72,7 +72,7 @@ builds use the latest commit of the `master` branch.
 To setup development for this repository you need Go >= 1.15. The
 `./script/go.bash` script will automatically download the expected
 version of Go mentioned in the [GOVERSION](GOVERSION) file (i.e.,
-go1.20.12) and use it for building.
+go1.20.14) and use it for building.
 
 You can also bypass `./script/go.bash` and build ooniprobe manually using
 `go build ...` but, in such a case, note that:
@@ -146,9 +146,9 @@ using the correct version of Go. Running this script as follows:
 Is equivalent to running these commands:
 
 ```bash
-go install -v golang.org/dl/go1.20.12@latest
-$HOME/go/bin/go1.20.12 download
-$HOME/sdk/go1.20.12/bin/go build -v -ldflags '-s -w' ./internal/cmd/miniooni
+go install -v golang.org/dl/go1.20.14@latest
+$HOME/go/bin/go1.20.14 download
+$HOME/sdk/go1.20.14/bin/go build -v -ldflags '-s -w' ./internal/cmd/miniooni
 ```
 
 ### Common build targets

diff --git a/go.mod b/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8
 	github.com/ooni/oocrypto v0.5.8
 	github.com/ooni/oohttp v0.6.8
-	github.com/ooni/probe-assets v0.21.0
+	github.com/ooni/probe-assets v0.22.0
 	github.com/pborman/getopt/v2 v2.1.0
 	github.com/pion/stun v0.6.1
 	github.com/pkg/errors v0.9.1

diff --git a/go.sum b/go.sum
@@ -362,8 +362,8 @@ github.com/ooni/oocrypto v0.5.8 h1:eoixlF81pQFGAD6LR5IWz5aIwgnolyYnkPti7eQh5n8=
 github.com/ooni/oocrypto v0.5.8/go.mod h1:3CMXIpx7vpoZp73fzUuLvuZApfFlKmdrkKJu3QC4hhs=
 github.com/ooni/oohttp v0.6.8 h1:yqLXhYO0VXSo56impKOSlVVY+r7TbirJNiash3kkeeg=
 github.com/ooni/oohttp v0.6.8/go.mod h1:2IGLODw3KeJozKrwhGLVHWC7Ocihi8l5+HbhqLmxt6I=
-github.com/ooni/probe-assets v0.21.0 h1:ggr/CpAHqBuNoYS5T6B27HV82P8poQ5ipEM3a8fXSGA=
-github.com/ooni/probe-assets v0.21.0/go.mod h1:m0k2FFzcLfFm7dhgyYkLCUR3R0CoRPr0jcjctDS2+gU=
+github.com/ooni/probe-assets v0.22.0 h1:Nxl7X+HdTamGKKzA4g0OKZY7zOPTY8IcHe/G9A/zrcc=
+github.com/ooni/probe-assets v0.22.0/go.mod h1:m0k2FFzcLfFm7dhgyYkLCUR3R0CoRPr0jcjctDS2+gU=
 github.com/oschwald/geoip2-golang v1.9.0 h1:uvD3O6fXAXs+usU+UGExshpdP13GAqp4GBrzN7IgKZc=
 github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
 github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=

diff --git a/internal/model/http.go b/internal/model/http.go
@@ -13,9 +13,9 @@ const (
 	HTTPHeaderAcceptLanguage = "en-US,en;q=0.9"
 
 	// HTTPHeaderUserAgent is the User-Agent header used for measuring. The current header
-	// is 17.34% of the browser population as of 2023-12-13 according to the
+	// is 28.39% of the browser population as of 2023-12-13 according to the
 	// https://www.useragents.me/ webpage.
-	HTTPHeaderUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.3"
+	HTTPHeaderUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.3"
 )
 
 // Additional strings used to report HTTP errors. They're currently only used by

diff --git a/internal/netxlite/certifi.go b/internal/netxlite/certifi.go
diff --git a/internal/netxlite/errno.go b/internal/netxlite/errno.go
diff --git a/internal/netxlite/errno_darwin.go b/internal/netxlite/errno_darwin.go
diff --git a/internal/netxlite/errno_darwin_test.go b/internal/netxlite/errno_darwin_test.go
diff --git a/internal/netxlite/errno_freebsd.go b/internal/netxlite/errno_freebsd.go
diff --git a/internal/netxlite/errno_freebsd_test.go b/internal/netxlite/errno_freebsd_test.go
diff --git a/internal/netxlite/errno_linux.go b/internal/netxlite/errno_linux.go
diff --git a/internal/netxlite/errno_linux_test.go b/internal/netxlite/errno_linux_test.go
diff --git a/internal/netxlite/errno_openbsd.go b/internal/netxlite/errno_openbsd.go
diff --git a/internal/netxlite/errno_openbsd_test.go b/internal/netxlite/errno_openbsd_test.go
diff --git a/internal/netxlite/errno_windows.go b/internal/netxlite/errno_windows.go
diff --git a/internal/netxlite/errno_windows_test.go b/internal/netxlite/errno_windows_test.go