From a0d0ef5cd80b51df7fff42f1eae8712176e8478b Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Mon, 17 May 2021 13:27:40 +0300 Subject: [PATCH] Pull request: all: restore netbsd compat Updates #3147. Squashed commit of the following: commit 4e1bcfd1561f9b927755c5024521d5508ef94b1f Author: Ainar Garipov Date: Mon May 17 13:17:51 2021 +0300 all: restore netbsd compat --- go.mod | 2 +- go.sum | 4 ++-- internal/aghos/{os_darwin.go => os_bsd.go} | 2 +- scripts/make/go-lint.sh | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) rename internal/aghos/{os_darwin.go => os_bsd.go} (94%) diff --git a/go.mod b/go.mod index 32a40cfb..6a527654 100644 --- a/go.mod +++ b/go.mod @@ -40,4 +40,4 @@ require ( howett.net/plist v0.0.0-20201203080718-1454fab16a06 ) -replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210420175708-50b0efd52063 +replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210517101438-550ef4cd8c6e diff --git a/go.sum b/go.sum index d4c5ea0b..c692063f 100644 --- a/go.sum +++ b/go.sum @@ -18,8 +18,8 @@ dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBr dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= -github.com/AdguardTeam/dhcp v0.0.0-20210420175708-50b0efd52063 h1:RBsQppxEJEqHApY6WDBkM2H0UG5wt57RcT0El2WGdp8= -github.com/AdguardTeam/dhcp v0.0.0-20210420175708-50b0efd52063/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI= +github.com/AdguardTeam/dhcp v0.0.0-20210517101438-550ef4cd8c6e h1:M6YnFP12o0/SjBEPt6b2r8ZkIy/wsV14TK8X9Tb6DEE= +github.com/AdguardTeam/dhcp v0.0.0-20210517101438-550ef4cd8c6e/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI= github.com/AdguardTeam/dnsproxy v0.37.2 h1:3lgizD+lZI6uqxFiQykd1/hV7Ji4vSJBMejl1rbFAXU= github.com/AdguardTeam/dnsproxy v0.37.2/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE= github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= diff --git a/internal/aghos/os_darwin.go b/internal/aghos/os_bsd.go similarity index 94% rename from internal/aghos/os_darwin.go rename to internal/aghos/os_bsd.go index 1fd6ac56..e49ddac5 100644 --- a/internal/aghos/os_darwin.go +++ b/internal/aghos/os_bsd.go @@ -1,4 +1,4 @@ -// +build darwin +// +build darwin netbsd openbsd package aghos diff --git a/scripts/make/go-lint.sh b/scripts/make/go-lint.sh index cce7c002..c62aa27f 100644 --- a/scripts/make/go-lint.sh +++ b/scripts/make/go-lint.sh @@ -92,6 +92,7 @@ underscores() { git ls-files '*_*.go' | { grep -F\ -e '_big.go'\ + -e '_bsd.go'\ -e '_darwin.go'\ -e '_freebsd.go'\ -e '_linux.go'\