From c6d4f2317e3ae19ccd13945391ba65ddcd3e2cab Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Thu, 13 Apr 2023 19:13:11 +0300 Subject: [PATCH] Pull request 1827: upd-deps Merge in DNS/adguard-home from upd-deps to master Squashed commit of the following: commit 4892dc4ed6df76d8733e6799744b095c5db1db6c Author: Ainar Garipov Date: Thu Apr 13 18:22:10 2023 +0300 all: upd dnscrypt, skel --- go.mod | 6 +----- go.sum | 4 ++-- scripts/make/txt-lint.sh | 5 ++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index f3e1080a..56a53ab0 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/AdguardTeam/golibs v0.13.2 github.com/AdguardTeam/urlfilter v0.16.1 github.com/NYTimes/gziphandler v1.1.1 - github.com/ameshkov/dnscrypt/v2 v2.2.6 + github.com/ameshkov/dnscrypt/v2 v2.2.7 github.com/digineo/go-ipset/v2 v2.2.1 github.com/dimfeld/httptreemux/v5 v5.5.0 github.com/fsnotify/fsnotify v1.6.0 @@ -62,7 +62,3 @@ require ( golang.org/x/text v0.9.0 // indirect golang.org/x/tools v0.8.0 // indirect ) - -// TODO(a.garipov): Remove the replace when @a.meshkov merges -// https://github.com/ameshkov/dnscrypt/pull/21. -replace github.com/ameshkov/dnscrypt/v2 => github.com/ainar-g/dnscrypt/v2 v2.0.1-0.20230413122657-d2ec675d1c59 diff --git a/go.sum b/go.sum index e6e6cdb8..6442a7db 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmH github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw= github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us= -github.com/ainar-g/dnscrypt/v2 v2.0.1-0.20230413122657-d2ec675d1c59 h1:UATfPbxkH89nm8B1SvwvfptuqPWyLd8UoqfXQRN3VR8= -github.com/ainar-g/dnscrypt/v2 v2.0.1-0.20230413122657-d2ec675d1c59/go.mod h1:qPWhwz6FdSmuK7W4sMyvogrez4MWdtzosdqlr0Rg3ow= +github.com/ameshkov/dnscrypt/v2 v2.2.7 h1:aEitLIR8HcxVodZ79mgRcCiC0A0I5kZPBuWGFwwulAw= +github.com/ameshkov/dnscrypt/v2 v2.2.7/go.mod h1:qPWhwz6FdSmuK7W4sMyvogrez4MWdtzosdqlr0Rg3ow= github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo= github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A= github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 h1:0b2vaepXIfMsG++IsjHiI2p4bxALD1Y2nQKGMR5zDQM= diff --git a/scripts/make/txt-lint.sh b/scripts/make/txt-lint.sh index 5b7c1dd4..06273185 100644 --- a/scripts/make/txt-lint.sh +++ b/scripts/make/txt-lint.sh @@ -3,7 +3,7 @@ # This comment is used to simplify checking local copies of the script. Bump # this number every time a remarkable change is made to this script. # -# AdGuard-Project-Version: 2 +# AdGuard-Project-Version: 3 verbose="${VERBOSE:-0}" readonly verbose @@ -31,12 +31,11 @@ set -f -u # trailing_newlines is a simple check that makes sure that all plain-text files # have a trailing newlines to make sure that all tools work correctly with them. -# -# TODO(a.garipov): Add to the standard skeleton project. trailing_newlines() { nl="$( printf "\n" )" readonly nl + # NOTE: Adjust for your project. git ls-files\ ':!*.png'\ ':!*.tar.gz'\