all: sync with master, upd chlog

scripts/install.sh

@@ -254,6 +254,9 @@ set_cpu() {
 
 			cpu="${cpu}_softfloat"
 			;;
+		'riscv64')
+			cpu='riscv64'
+			;;
 		*)
 			error_exit "unsupported cpu type: $cpu"
 			;;
@@ -262,7 +265,7 @@ set_cpu() {
 
 	# Validate.
 	case "$cpu" in
-	'amd64' | '386' | 'armv5' | 'armv6' | 'armv7' | 'arm64')
+	'amd64' | '386' | 'armv5' | 'armv6' | 'armv7' | 'arm64' | 'riscv64')
 		# All right, go on.
 		;;
 	'mips64le_softfloat' | 'mips64_softfloat' | 'mipsle_softfloat' | 'mips_softfloat')

scripts/make/go-lint.sh

@@ -212,7 +212,6 @@ run_linter gocognit --over='10' \
 	./internal/rdns/ \
 	./internal/schedule/ \
 	./internal/stats/ \
-	./internal/tools/ \
 	./internal/version/ \
 	./internal/whois/ \
 	./scripts/ \
@@ -296,7 +295,6 @@ run_linter gosec --exclude G115 --quiet \
 	./internal/rdns/ \
 	./internal/schedule/ \
 	./internal/stats/ \
-	./internal/tools/ \
 	./internal/version/ \
 	./internal/whois/ \
 	;

scripts/make/go-tools.sh

@@ -3,7 +3,7 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a significant change is made to this script.
 #
-# AdGuard-Project-Version: 6
+# AdGuard-Project-Version: 7
 
 verbose="${VERBOSE:-0}"
 readonly verbose
@@ -25,30 +25,6 @@ readonly v_flags x_flags
 
 set -e -f -u
 
-go="${GO:-go}"
-readonly go
-
-# Remove only the actual binaries in the bin/ directory, as developers may add
-# their own scripts there.  Most commonly, a script named “go” for tools that
-# call the go binary and need a particular version.
-rm -f \
-	bin/errcheck \
-	bin/fieldalignment \
-	bin/go-junit-report \
-	bin/gocognit \
-	bin/gocyclo \
-	bin/gofumpt \
-	bin/gosec \
-	bin/govulncheck \
-	bin/ineffassign \
-	bin/misspell \
-	bin/nilness \
-	bin/shadow \
-	bin/shfmt \
-	bin/staticcheck \
-	bin/unparam \
-	;
-
 # Reset GOARCH and GOOS to make sure we install the tools for the native
 # architecture even when we're cross-compiling the main binary, and also to
 # prevent the "cannot install cross-compiled binaries when GOBIN is set" error.
@@ -57,23 +33,5 @@ env \
 	GOBIN="${PWD}/bin" \
 	GOOS="" \
 	GOWORK='off' \
-	"$go" install \
-	--modfile=./internal/tools/go.mod \
-	"$v_flags" \
-	"$x_flags" \
-	github.com/fzipp/gocyclo/cmd/gocyclo \
-	github.com/golangci/misspell/cmd/misspell \
-	github.com/gordonklaus/ineffassign \
-	github.com/jstemmer/go-junit-report/v2 \
-	github.com/kisielk/errcheck \
-	github.com/securego/gosec/v2/cmd/gosec \
-	github.com/uudashr/gocognit/cmd/gocognit \
-	golang.org/x/tools/go/analysis/passes/fieldalignment/cmd/fieldalignment \
-	golang.org/x/tools/go/analysis/passes/nilness/cmd/nilness \
-	golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow \
-	golang.org/x/vuln/cmd/govulncheck \
-	honnef.co/go/tools/cmd/staticcheck \
-	mvdan.cc/gofumpt \
-	mvdan.cc/sh/v3/cmd/shfmt \
-	mvdan.cc/unparam \
+	"${GO:-go}" install "$v_flags" "$x_flags" tool \
 	;

scripts/make/go-upd-tools.sh

@@ -3,7 +3,7 @@
 # This comment is used to simplify checking local copies of the script.  Bump
 # this number every time a significant change is made to this script.
 #
-# AdGuard-Project-Version: 3
+# AdGuard-Project-Version: 4
 
 verbose="${VERBOSE:-0}"
 readonly verbose
@@ -26,7 +26,5 @@ set -e -f -u
 go="${GO:-go}"
 readonly go
 
-cd ./internal/tools/
-
-"$go" get -u "$x_flags"
-"$go" mod tidy
+"$go" get -u "$x_flags" tool
+"$go" mod tidy "$x_flags"