From da320795165fc1dd861a71c1ded84243b82a4713 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Tue, 2 Aug 2022 20:48:14 +0300 Subject: [PATCH] Pull request: upd-links-etc Merge in DNS/adguard-home from upd-links-etc to master Squashed commit of the following: commit 49856df394f1a2123a27afdb35047d3b1a49860f Author: Ainar Garipov Date: Tue Aug 2 20:43:10 2022 +0300 all: revert cdn link revert commit 59bbe4bbd300f48674c1a6224a91f9a567d6c79c Author: Ainar Garipov Date: Tue Aug 2 20:40:50 2022 +0300 all: revert static link revert commit fe2acc4a0d6d5ee31cb8dbb0d0e0984c3cd723db Author: Ainar Garipov Date: Tue Aug 2 18:24:02 2022 +0300 all: revert links up in README; imp tools --- README.md | 34 ++++++++++++++++++---------------- internal/tools/go.mod | 1 - internal/tools/go.sum | 1 - internal/tools/tools.go | 1 - scripts/make/go-lint.sh | 7 +++++-- scripts/make/go-tools.sh | 1 - 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 811e9303..e26cbc0c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@

- AdGuard.com | + AdGuard.com | Wiki | Reddit | Twitter | @@ -44,9 +44,9 @@ AdGuard Home is a network-wide software for blocking ads & tracking. After you s It operates as a DNS server that re-routes tracking domains to a “black hole”, thus preventing your devices from connecting to those servers. It's based on -software we use for our public -[AdGuard DNS](https://link.adtidy.org/forward.html?action=dns&from=readme&app=home) -servers, and both share a lot of code. +software we use for our public [AdGuard DNS](https://adguard-dns.io/) servers, +and both share a lot of code. + * [Getting Started](#getting-started) @@ -166,12 +166,13 @@ It depends. “DNS sinkholing” is capable of blocking a big percentage of ads, but it lacks flexibility and power of traditional ad blockers. You can get a good impression about the difference between these methods by reading -[this article](https://link.adtidy.org/forward.html?action=blog_adaway&from=readme&app=home). -It compares AdGuard for Android (a traditional ad blocker) to hosts-level ad +[this article](https://adguard.com/en/blog/adguard-vs-adaway-dns66/). It +compares AdGuard for Android (a traditional ad blocker) to hosts-level ad blockers (which are almost identical to DNS-based blockers in their capabilities). This level of protection is enough for some users. + Additionally, using a DNS-based blocker can help to block ads, tracking and analytics requests on other types of devices, such as SmartTVs, smart speakers or other kinds of IoT devices (on which you can't install traditional ad blockers). **Known limitations** @@ -324,10 +325,10 @@ If you run into any problem or have a suggestion, head to [this page](https://gi If you want to help with AdGuard Home translations, please learn more about translating AdGuard products -[in our Knowledge Base](https://link.adtidy.org/forward.html?action=kb_translations&from=readme&app=home). +[in our Knowledge Base](https://kb.adguard.com/en/general/adguard-translations). -Direct link to AdGuard Home project on CrowdIn: -. +Here is a link to AdGuard Home project: + ### Other @@ -376,16 +377,17 @@ This software wouldn't have been possible without: * And many more node.js packages. * [whotracks.me data](https://github.com/cliqz-oss/whotracks.me) -You might have seen that [CoreDNS](https://coredns.io) was mentioned here before -— we've stopped using it in AdGuard Home. +You might have seen that [CoreDNS](https://coredns.io) was mentioned here +before, but we've stopped using it in AdGuard Home. For a full list of all node.js packages in use, please take a look at [client/package.json](https://github.com/AdguardTeam/AdGuardHome/blob/master/client/package.json) file. ## Privacy -Our main idea is that you are the one, who should be in control of your data. So -it is only natural, that AdGuard Home does not collect any usage statistics, and -does not use any web services unless you configure it to do so. Full policy with -every bit that _could in theory be_ sent by AdGuard Home is available -[here](https://link.adtidy.org/forward.html?action=privacy&from=readme&app=home). + +Our main idea is that you are the one, who should be in control of your data. +So it is only natural, that AdGuard Home does not collect any usage statistics, +and does not use any web services unless you configure it to do so. Full policy +with every bit that *could in theory be* sent by AdGuard Home is available +[here](https://adguard.com/en/privacy/home.html) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index bb587070..a42140a6 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -9,7 +9,6 @@ require ( github.com/kisielk/errcheck v1.6.0 github.com/kyoh86/looppointer v0.1.7 github.com/securego/gosec/v2 v2.11.0 - golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a honnef.co/go/tools v0.3.1 mvdan.cc/gofumpt v0.3.1 diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 2f04e4a6..f145dfbf 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -435,7 +435,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= diff --git a/internal/tools/tools.go b/internal/tools/tools.go index 214301bf..e41fba4a 100644 --- a/internal/tools/tools.go +++ b/internal/tools/tools.go @@ -11,7 +11,6 @@ import ( _ "github.com/kisielk/errcheck" _ "github.com/kyoh86/looppointer" _ "github.com/securego/gosec/v2/cmd/gosec" - _ "golang.org/x/lint/golint" _ "golang.org/x/tools/go/analysis/passes/nilness/cmd/nilness" _ "golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow" _ "honnef.co/go/tools/cmd/staticcheck" diff --git a/scripts/make/go-lint.sh b/scripts/make/go-lint.sh index df2f297a..853c5fc8 100644 --- a/scripts/make/go-lint.sh +++ b/scripts/make/go-lint.sh @@ -154,7 +154,7 @@ underscores() { fi } -# TODO(a.garipov): Add an analyser to look for `fallthrough`, `goto`, and `new`? +# TODO(a.garipov): Add an analyzer to look for `fallthrough`, `goto`, and `new`? @@ -212,7 +212,10 @@ exit_on_output underscores exit_on_output gofumpt --extra -e -l . -golint --set_exit_status ./... +# TODO(a.garipov): golint is deprecated, and seems to cause more and more +# issues with each release. Find a suitable replacement. +# +# golint --set_exit_status ./... "$GO" vet ./... diff --git a/scripts/make/go-tools.sh b/scripts/make/go-tools.sh index e0ff237d..1830c552 100644 --- a/scripts/make/go-tools.sh +++ b/scripts/make/go-tools.sh @@ -42,7 +42,6 @@ env\ github.com/kisielk/errcheck\ github.com/kyoh86/looppointer/cmd/looppointer\ github.com/securego/gosec/v2/cmd/gosec\ - golang.org/x/lint/golint\ golang.org/x/tools/go/analysis/passes/nilness/cmd/nilness\ golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow\ honnef.co/go/tools/cmd/staticcheck\