docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
* | <mask> };
<mask>
<mask> /**
<mask> * Gets the source metadata for the specified tracker
<mask> * @param {TrackerData} trackerData tracker data
<mask> * @returns {source} source metadata or null if no matching tracker found
<mask> */
<mask> export const getSourceData = (trackerData) => {
<mask> if (!trackerData || !trackerData.source) {
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove "energized_spark": {
"name": "Energized Spark",
"categoryId": "general",
"homepage": "https://energized.pro/",
"source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_28.txt"
},
</s> add </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | client/src/helpers/trackers/trackers.js |
* | <mask> };
<mask>
<mask> /**
<mask> * Converts the JSON string source into numeric source for AdGuard Home
<mask> * @param {TrackerData} trackerData tracker data
<mask> * @returns {number} source number
<mask> */
<mask> const convertSource = (sourceStr) => {
<mask> if (!sourceStr || sourceStr !== 'AdGuard') {
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove "energized_spark": {
"name": "Energized Spark",
"categoryId": "general",
"homepage": "https://energized.pro/",
"source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_28.txt"
},
</s> add </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | client/src/helpers/trackers/trackers.js |
golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 | <mask> github.com/quic-go/quic-go v0.32.0
<mask> github.com/stretchr/testify v1.8.1
<mask> github.com/ti-mo/netfilter v0.5.0
<mask> go.etcd.io/bbolt v1.3.7
<mask> golang.org/x/crypto v0.5.0
<mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771
<mask> golang.org/x/net v0.5.0
<mask> golang.org/x/sys v0.5.0
<mask> gopkg.in/natefinch/lumberjack.v2 v2.2.1
<mask> gopkg.in/yaml.v3 v3.0.1
<mask> howett.net/plist v1.0.0
<mask> )
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
</s> add golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
</s> add golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
</s> add golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.mod |
github.com/onsi/ginkgo/v2 v2.8.1 // indirect | <mask> github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
<mask> github.com/josharian/native v1.1.0 // indirect
<mask> github.com/mdlayher/packet v1.1.1 // indirect
<mask> github.com/mdlayher/socket v0.4.0 // indirect
<mask> github.com/onsi/ginkgo/v2 v2.8.0 // indirect
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
<mask> github.com/pkg/errors v0.9.1 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/quic-go/qpack v0.4.0 // indirect
<mask> github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
</s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.mod |
github.com/pierrec/lz4/v4 v4.1.17 // indirect | <mask> github.com/mdlayher/socket v0.4.0 // indirect
<mask> github.com/onsi/ginkgo/v2 v2.8.1 // indirect
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
<mask> github.com/pkg/errors v0.9.1 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/quic-go/qpack v0.4.0 // indirect
<mask> github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
<mask> github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
<mask> github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/mod v0.8.0 // indirect | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.mod |
github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect | <mask> github.com/quic-go/qpack v0.4.0 // indirect
<mask> github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
<mask> github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
<mask> github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
<mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
<mask> golang.org/x/mod v0.7.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/text v0.6.0 // indirect
<mask> golang.org/x/tools v0.5.0 // indirect
<mask> )
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
</s> add golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.mod |
golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect | <mask> github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
<mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
<mask> golang.org/x/mod v0.7.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/text v0.6.0 // indirect
<mask> golang.org/x/tools v0.5.0 // indirect
<mask> )
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/mod v0.8.0 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
</s> add golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.mod |
github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= | <mask> github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
<mask> github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
<mask> github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
<mask> github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
<mask> github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
<mask> github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
<mask> github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
<mask> github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
<mask> github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
<mask> github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/net v0.5.0
</s> add golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.sum |
github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= | <mask> github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
<mask> github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
<mask> github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
<mask> github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
<mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
</s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/net v0.5.0
</s> add golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.sum |
<mask> github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
<mask> github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
<mask> github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
<mask> github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
<mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww=
<mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f/go.mod h1:IogEAUBXDEwX7oR/BMmCctShYs80ql4hF0ySdzGxf7E=
<mask> github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
<mask> go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
<mask> go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
</s> add golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/net v0.5.0
</s> add golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.sum |
|
github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c h1:PHoGTnweZP+KIg/8Zc6+iOesrIF5yHkpb4GBDxHm7yE=
github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264= | <mask> github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
<mask> github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
<mask> github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
<mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f/go.mod h1:IogEAUBXDEwX7oR/BMmCctShYs80ql4hF0ySdzGxf7E=
<mask> github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
<mask> go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
<mask> go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww=
</s> add </s> remove golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
</s> add golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/net v0.5.0
</s> add golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.sum |
golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= | <mask> go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
<mask> golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
<mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
<mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
<mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
<mask> golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/net v0.5.0
</s> add golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.sum |
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= | <mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
<mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
<mask> golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
<mask> golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
</s> add golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
</s> add golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
</s> add golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.sum |
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= | <mask> golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
<mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
<mask> golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
<mask> golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
<mask> golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
</s> add golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/net v0.5.0
</s> add golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.sum |
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= | <mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
<mask> golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
<mask> golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
<mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
<mask> golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
<mask> golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
</s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ=
golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 h1:HRexnHfiDA2hkPNMDgf3vxabRMeC+XeS8tCKP9olVbs=
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE=
</s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1
honnef.co/go/tools v0.4.0
</s> add golang.org/x/tools v0.6.0
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
honnef.co/go/tools v0.4.1 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.sum |
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= | <mask> golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
<mask> golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
<mask> golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
<mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ=
golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 h1:HRexnHfiDA2hkPNMDgf3vxabRMeC+XeS8tCKP9olVbs=
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE=
</s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> remove golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
</s> add golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1
honnef.co/go/tools v0.4.0
</s> add golang.org/x/tools v0.6.0
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
honnef.co/go/tools v0.4.1 </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | go.sum |
<mask> IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M433 179.11c0-97.2-63.71-125.7-63.71-125.7-62.52-28.7-228.56-28.4-290.48 0 0 0-63.72 28.5-63.72 125.7 0 115.7-6.6 259.4 105.63 289.1 40.51 10.7 75.32 13 103.33 11.4 50.81-2.8 79.32-18.1 79.32-18.1l-1.7-36.9s-36.31 11.4-77.12 10.1c-40.41-1.4-83-4.4-89.63-54a102.54 102.54 0 0 1-.9-13.9c85.63 20.9 158.65 9.1 178.75 6.7 56.12-6.7 105-41.3 111.23-72.9 9.8-49.8 9-121.5 9-121.5zm-75.12 125.2h-46.63v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.33V197c0-58.5-64-56.6-64-6.9v114.2H90.19c0-122.1-5.2-147.9 18.41-175 25.9-28.9 79.82-30.8 103.83 6.1l11.6 19.5 11.6-19.5c24.11-37.1 78.12-34.8 103.83-6.1 23.71 27.3 18.4 53 18.4 175z\"/></svg>"),
<mask> Rules: []string{
<mask> "||aus.social^",
<mask> "||awscommunity.social^",
<mask> "||cupoftea.social^",
<mask> "||cyberplace.social^",
<mask> "||defcon.social^",
<mask> "||det.social^",
<mask> "||fosstodon.org^",
<mask> "||glasgow.social^",
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove "||defcon.social^",
</s> add </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
</s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/filtering/servicelist.go |
|
<mask> "||aus.social^",
<mask> "||awscommunity.social^",
<mask> "||cupoftea.social^",
<mask> "||cyberplace.social^",
<mask> "||defcon.social^",
<mask> "||det.social^",
<mask> "||fosstodon.org^",
<mask> "||glasgow.social^",
<mask> "||h4.io^",
<mask> "||hachyderm.io^",
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove "||cupoftea.social^",
</s> add </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
</s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/filtering/servicelist.go |
|
<mask> "||masto.pt^",
<mask> "||mastodon.au^",
<mask> "||mastodon.bida.im^",
<mask> "||mastodon.com.tr^",
<mask> "||mastodon.eus^",
<mask> "||mastodon.green^",
<mask> "||mastodon.ie^",
<mask> "||mastodon.iriseden.eu^",
<mask> "||mastodon.nl^",
<mask> "||mastodon.nu^",
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/net v0.5.0
</s> add golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
</s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/filtering/servicelist.go |
|
"||mastodon.online^", | <mask> "||mastodon.nz^",
<mask> "||mastodon.online^",
<mask> "||mastodon.scot^",
<mask> "||mastodon.sdf.org^",
<mask> "||mastodon.social^",
<mask> "||mastodon.social^",
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove "||mastodon.zaclys.com^",
</s> add "||mastodon.xyz^", </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
</s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/filtering/servicelist.go |
"||mastodon.social^", | <mask> "||mastodon.scot^",
<mask> "||mastodon.sdf.org^",
<mask> "||mastodon.social^",
<mask> "||mastodon.top^",
<mask> "||mastodon.uno^",
<mask> "||mastodon.world^",
<mask> "||mastodon.xyz^",
<mask> "||mastodonapp.uk^",
<mask> "||mastodonners.nl^",
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove "||mastodon.zaclys.com^",
</s> add "||mastodon.xyz^", </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
</s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/filtering/servicelist.go |
"||mastodon.xyz^", | <mask> "||mastodon.social^",
<mask> "||mastodon.top^",
<mask> "||mastodon.uno^",
<mask> "||mastodon.world^",
<mask> "||mastodon.zaclys.com^",
<mask> "||mastodonapp.uk^",
<mask> "||mastodonners.nl^",
<mask> "||mastodont.cat^",
<mask> "||mastodontech.de^",
<mask> "||mastodontti.fi^",
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
</s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/filtering/servicelist.go |
"||mstdn.party^", | <mask> "||metalhead.club^",
<mask> "||mindly.social^",
<mask> "||mstdn.ca^",
<mask> "||mstdn.jp^",
<mask> "||mstdn.social^",
<mask> "||muenchen.social^",
<mask> "||nerdculture.de^",
<mask> "||newsie.social^",
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove "||muenster.im^",
</s> add "||nerdculture.de^", </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
</s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/filtering/servicelist.go |
"||nerdculture.de^", | <mask> "||mstdn.ca^",
<mask> "||mstdn.jp^",
<mask> "||mstdn.social^",
<mask> "||muenchen.social^",
<mask> "||muenster.im^",
<mask> "||newsie.social^",
<mask> "||noc.social^",
<mask> "||norden.social^",
<mask> "||nrw.social^",
<mask> "||o3o.ca^",
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
</s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU=
github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc=
github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/filtering/servicelist.go |
golang.org/x/tools v0.6.0
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
honnef.co/go/tools v0.4.1 | <mask> github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28
<mask> github.com/kisielk/errcheck v1.6.3
<mask> github.com/kyoh86/looppointer v0.2.1
<mask> github.com/securego/gosec/v2 v2.15.0
<mask> golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2
<mask> golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1
<mask> honnef.co/go/tools v0.4.0
<mask> mvdan.cc/gofumpt v0.4.0
<mask> mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95
<mask> )
<mask>
<mask> require (
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ=
golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 h1:HRexnHfiDA2hkPNMDgf3vxabRMeC+XeS8tCKP9olVbs=
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE=
</s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/tools/go.mod |
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/mod v0.8.0 // indirect | <mask> github.com/gookit/color v1.5.2 // indirect
<mask> github.com/kyoh86/nolint v0.0.1 // indirect
<mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
<mask> github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
<mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect
<mask> golang.org/x/mod v0.7.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/sys v0.5.0 // indirect
<mask> gopkg.in/yaml.v3 v3.0.1 // indirect
<mask> )
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect
golang.org/x/mod v0.8.0 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/net v0.5.0
</s> add golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/tools/go.mod |
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= | <mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
<mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
<mask> golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s=
<mask> golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
<mask> golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
<mask> golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
</s> add golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/net v0.5.0
</s> add golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/tools/go.sum |
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= | <mask> golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
<mask> golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
<mask> golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s=
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU=
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
</s> add golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
</s> add golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= </s> remove golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
</s> add golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w=
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/tools/go.sum |
golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= | <mask> golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
<mask> golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
<mask> golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
</s> add golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/net v0.5.0
</s> add golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/tools/go.sum |
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= | <mask> golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
<mask> golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
<mask> golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
<mask> golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ=
<mask> golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
<mask> golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 h1:HRexnHfiDA2hkPNMDgf3vxabRMeC+XeS8tCKP9olVbs=
<mask> golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE=
<mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
</s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1
honnef.co/go/tools v0.4.0
</s> add golang.org/x/tools v0.6.0
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
honnef.co/go/tools v0.4.1 </s> remove golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
</s> add golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect
</s> add golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.6.0 // indirect </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
</s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/tools/go.sum |
honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo=
honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= | <mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
<mask> gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8=
<mask> honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA=
<mask> mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM=
<mask> mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ=
<mask> mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 h1:n/xhncJPSt0YzfOhnyn41XxUdrWQNgmLBG72FE27Fqw=
<mask> mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95/go.mod h1:2vU506e8nGWodqcci641NLi4im2twWSq4Lod756epHQ=
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1
honnef.co/go/tools v0.4.0
</s> add golang.org/x/tools v0.6.0
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30
honnef.co/go/tools v0.4.1 </s> remove golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230206171751-46f607a40771
golang.org/x/net v0.5.0
</s> add golang.org/x/crypto v0.6.0
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
golang.org/x/net v0.7.0 </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ=
golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 h1:HRexnHfiDA2hkPNMDgf3vxabRMeC+XeS8tCKP9olVbs=
golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE=
</s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y=
golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect
golang.org/x/mod v0.7.0 // indirect
</s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect
golang.org/x/mod v0.8.0 // indirect | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | internal/tools/go.sum |
pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) | <mask>
<mask> return
<mask> }
<mask>
<mask> pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
<mask> var pid int
<mask> data, err := os.ReadFile(pidfile)
<mask> if errors.Is(err, os.ErrNotExist) {
<mask> if pid, err = aghos.PIDByCommand(serviceName, os.Getpid()); err != nil {
<mask> log.Error("service: finding AdGuardHome process: %s", err)
</s> Pull request: 3868 imp service uninstall
Merge in DNS/adguard-home from 3868-imp-uninstall to master
Closes #3868.
Updates #3457.
Squashed commit of the following:
commit 6f50713407980c27e5b14bef4dc8839e134ec5c8
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 19:06:13 2021 +0300
all: imp openwrt
commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:26:32 2021 +0300
all: imp code && docs
commit bab95366b0ffa40d96de5bb8116ec14606e310ed
Merge: 92ebc210 52f36f20
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:06:25 2021 +0300
Merge branch 'master' into 3868-imp-uninstall
commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 13:18:58 2021 +0300
home: imp freebsd script & log changes
commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 16 14:08:46 2021 +0300
all: imp service uninstall </s> remove data, err := os.ReadFile(pidfile)
</s> add data, err := os.ReadFile(pidFile) </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err)
</s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove log.Error("service: parsing pid file %s: bad value", pidfile)
</s> add log.Error("service: parsing pid file %s: bad value", pidFile) </s> remove log.Error("service: reading pid file %s: %s", pidfile, err)
</s> add log.Error("service: reading pid file %s: %s", pidFile, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f | internal/home/service.go |
data, err := os.ReadFile(pidFile) | <mask> }
<mask>
<mask> pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
<mask> var pid int
<mask> data, err := os.ReadFile(pidfile)
<mask> if errors.Is(err, os.ErrNotExist) {
<mask> if pid, err = aghos.PIDByCommand(serviceName, os.Getpid()); err != nil {
<mask> log.Error("service: finding AdGuardHome process: %s", err)
<mask>
<mask> return
</s> Pull request: 3868 imp service uninstall
Merge in DNS/adguard-home from 3868-imp-uninstall to master
Closes #3868.
Updates #3457.
Squashed commit of the following:
commit 6f50713407980c27e5b14bef4dc8839e134ec5c8
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 19:06:13 2021 +0300
all: imp openwrt
commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:26:32 2021 +0300
all: imp code && docs
commit bab95366b0ffa40d96de5bb8116ec14606e310ed
Merge: 92ebc210 52f36f20
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:06:25 2021 +0300
Merge branch 'master' into 3868-imp-uninstall
commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 13:18:58 2021 +0300
home: imp freebsd script & log changes
commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 16 14:08:46 2021 +0300
all: imp service uninstall </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
</s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err)
</s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove log.Error("service: parsing pid file %s: bad value", pidfile)
</s> add log.Error("service: parsing pid file %s: bad value", pidFile) </s> remove log.Error("service: reading pid file %s: %s", pidfile, err)
</s> add log.Error("service: reading pid file %s: %s", pidFile, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f | internal/home/service.go |
log.Error("service: reading pid file %s: %s", pidFile, err) | <mask>
<mask> return
<mask> }
<mask> } else if err != nil {
<mask> log.Error("service: reading pid file %s: %s", pidfile, err)
<mask>
<mask> return
<mask> } else {
<mask> parts := strings.SplitN(string(data), "\n", 2)
<mask> if len(parts) == 0 {
</s> Pull request: 3868 imp service uninstall
Merge in DNS/adguard-home from 3868-imp-uninstall to master
Closes #3868.
Updates #3457.
Squashed commit of the following:
commit 6f50713407980c27e5b14bef4dc8839e134ec5c8
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 19:06:13 2021 +0300
all: imp openwrt
commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:26:32 2021 +0300
all: imp code && docs
commit bab95366b0ffa40d96de5bb8116ec14606e310ed
Merge: 92ebc210 52f36f20
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:06:25 2021 +0300
Merge branch 'master' into 3868-imp-uninstall
commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 13:18:58 2021 +0300
home: imp freebsd script & log changes
commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 16 14:08:46 2021 +0300
all: imp service uninstall </s> remove log.Error("service: parsing pid file %s: bad value", pidfile)
</s> add log.Error("service: parsing pid file %s: bad value", pidFile) </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err)
</s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove data, err := os.ReadFile(pidfile)
</s> add data, err := os.ReadFile(pidFile) </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
</s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f | internal/home/service.go |
log.Error("service: parsing pid file %s: bad value", pidFile) | <mask> return
<mask> } else {
<mask> parts := strings.SplitN(string(data), "\n", 2)
<mask> if len(parts) == 0 {
<mask> log.Error("service: parsing pid file %s: bad value", pidfile)
<mask>
<mask> return
<mask> }
<mask>
<mask> if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
</s> Pull request: 3868 imp service uninstall
Merge in DNS/adguard-home from 3868-imp-uninstall to master
Closes #3868.
Updates #3457.
Squashed commit of the following:
commit 6f50713407980c27e5b14bef4dc8839e134ec5c8
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 19:06:13 2021 +0300
all: imp openwrt
commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:26:32 2021 +0300
all: imp code && docs
commit bab95366b0ffa40d96de5bb8116ec14606e310ed
Merge: 92ebc210 52f36f20
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:06:25 2021 +0300
Merge branch 'master' into 3868-imp-uninstall
commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 13:18:58 2021 +0300
home: imp freebsd script & log changes
commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 16 14:08:46 2021 +0300
all: imp service uninstall </s> remove log.Error("service: reading pid file %s: %s", pidfile, err)
</s> add log.Error("service: reading pid file %s: %s", pidFile, err) </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err)
</s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove data, err := os.ReadFile(pidfile)
</s> add data, err := os.ReadFile(pidFile) </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
</s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f | internal/home/service.go |
log.Error("service: parsing pid from file %s: %s", pidFile, err) | <mask> return
<mask> }
<mask>
<mask> if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil {
<mask> log.Error("service: parsing pid from file %s: %s", pidfile, err)
<mask>
<mask> return
<mask> }
<mask> }
<mask>
</s> Pull request: 3868 imp service uninstall
Merge in DNS/adguard-home from 3868-imp-uninstall to master
Closes #3868.
Updates #3457.
Squashed commit of the following:
commit 6f50713407980c27e5b14bef4dc8839e134ec5c8
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 19:06:13 2021 +0300
all: imp openwrt
commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:26:32 2021 +0300
all: imp code && docs
commit bab95366b0ffa40d96de5bb8116ec14606e310ed
Merge: 92ebc210 52f36f20
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:06:25 2021 +0300
Merge branch 'master' into 3868-imp-uninstall
commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 13:18:58 2021 +0300
home: imp freebsd script & log changes
commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 16 14:08:46 2021 +0300
all: imp service uninstall </s> remove log.Error("service: parsing pid file %s: bad value", pidfile)
</s> add log.Error("service: parsing pid file %s: bad value", pidFile) </s> remove log.Error("service: reading pid file %s: %s", pidfile, err)
</s> add log.Error("service: reading pid file %s: %s", pidFile, err) </s> remove data, err := os.ReadFile(pidfile)
</s> add data, err := os.ReadFile(pidFile) </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
</s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f | internal/home/service.go |
// installation. Otherwise, the service won't start on the system | <mask> }
<mask>
<mask> if aghos.IsOpenWrt() {
<mask> // On OpenWrt it is important to run enable after the service
<mask> // installation Otherwise, the service won't start on the system
<mask> // startup.
<mask> _, err = runInitdCommand("enable")
<mask> if err != nil {
<mask> log.Fatalf("service: running init enable: %s", err)
<mask> }
</s> Pull request: 3868 imp service uninstall
Merge in DNS/adguard-home from 3868-imp-uninstall to master
Closes #3868.
Updates #3457.
Squashed commit of the following:
commit 6f50713407980c27e5b14bef4dc8839e134ec5c8
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 19:06:13 2021 +0300
all: imp openwrt
commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:26:32 2021 +0300
all: imp code && docs
commit bab95366b0ffa40d96de5bb8116ec14606e310ed
Merge: 92ebc210 52f36f20
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:06:25 2021 +0300
Merge branch 'master' into 3868-imp-uninstall
commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 13:18:58 2021 +0300
home: imp freebsd script & log changes
commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 16 14:08:46 2021 +0300
all: imp service uninstall </s> remove // sysVersion is the version of local service.System interface
// implementation.
</s> add // sysVersion is the version of local service.System interface implementation. </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err)
</s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove data, err := os.ReadFile(pidfile)
</s> add data, err := os.ReadFile(pidFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f | internal/home/service.go |
if err := svcAction(s, "stop"); err != nil {
log.Debug("service: executing action %q: %s", "stop", err)
}
| <mask> log.Fatalf("service: running init disable: %s", err)
<mask> }
<mask> }
<mask>
<mask> if err := svcAction(s, "uninstall"); err != nil {
<mask> log.Fatalf("service: executing action %q: %s", "uninstall", err)
<mask> }
<mask>
<mask> if runtime.GOOS == "darwin" {
<mask> // Remove log files on cleanup and log errors.
</s> Pull request: 3868 imp service uninstall
Merge in DNS/adguard-home from 3868-imp-uninstall to master
Closes #3868.
Updates #3457.
Squashed commit of the following:
commit 6f50713407980c27e5b14bef4dc8839e134ec5c8
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 19:06:13 2021 +0300
all: imp openwrt
commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:26:32 2021 +0300
all: imp code && docs
commit bab95366b0ffa40d96de5bb8116ec14606e310ed
Merge: 92ebc210 52f36f20
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:06:25 2021 +0300
Merge branch 'master' into 3868-imp-uninstall
commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 13:18:58 2021 +0300
home: imp freebsd script & log changes
commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 16 14:08:46 2021 +0300
all: imp service uninstall </s> remove // installation Otherwise, the service won't start on the system
</s> add // installation. Otherwise, the service won't start on the system </s> remove log.Error("service: reading pid file %s: %s", pidfile, err)
</s> add log.Error("service: reading pid file %s: %s", pidFile, err) </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err)
</s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove data, err := os.ReadFile(pidfile)
</s> add data, err := os.ReadFile(pidFile) </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
</s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f | internal/home/service.go |
// Pass the script and action as a single string argument. | <mask> // runInitdCommand runs init.d service command
<mask> // returns command code or error if any
<mask> func runInitdCommand(action string) (int, error) {
<mask> confPath := "/etc/init.d/" + serviceName
<mask> code, _, err := aghos.RunCommand("sh", "-c", confPath+" "+action)
<mask>
<mask> return code, err
<mask> }
</s> Pull request: 3868 imp service uninstall
Merge in DNS/adguard-home from 3868-imp-uninstall to master
Closes #3868.
Updates #3457.
Squashed commit of the following:
commit 6f50713407980c27e5b14bef4dc8839e134ec5c8
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 19:06:13 2021 +0300
all: imp openwrt
commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:26:32 2021 +0300
all: imp code && docs
commit bab95366b0ffa40d96de5bb8116ec14606e310ed
Merge: 92ebc210 52f36f20
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:06:25 2021 +0300
Merge branch 'master' into 3868-imp-uninstall
commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 13:18:58 2021 +0300
home: imp freebsd script & log changes
commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 16 14:08:46 2021 +0300
all: imp service uninstall </s> remove // installation Otherwise, the service won't start on the system
</s> add // installation. Otherwise, the service won't start on the system </s> remove data, err := os.ReadFile(pidfile)
</s> add data, err := os.ReadFile(pidFile) </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
</s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> remove log.Error("service: parsing pid file %s: bad value", pidfile)
</s> add log.Error("service: parsing pid file %s: bad value", pidFile) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f | internal/home/service.go |
pidfile_child="/var/run/${name}.pid"
pidfile="/var/run/${name}_daemon.pid" | <mask> . /etc/rc.subr
<mask> name="{{.Name}}"
<mask> {{.Name}}_env="IS_DAEMON=1"
<mask> {{.Name}}_user="root"
<mask> pidfile="/var/run/${name}.pid"
<mask> command="/usr/sbin/daemon"
<mask> command_args="-p ${pidfile} -f -r {{.WorkingDirectory}}/{{.Name}}"
<mask> run_rc_command "$1"
<mask> `
<mask>
</s> Pull request: 3868 imp service uninstall
Merge in DNS/adguard-home from 3868-imp-uninstall to master
Closes #3868.
Updates #3457.
Squashed commit of the following:
commit 6f50713407980c27e5b14bef4dc8839e134ec5c8
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 19:06:13 2021 +0300
all: imp openwrt
commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:26:32 2021 +0300
all: imp code && docs
commit bab95366b0ffa40d96de5bb8116ec14606e310ed
Merge: 92ebc210 52f36f20
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:06:25 2021 +0300
Merge branch 'master' into 3868-imp-uninstall
commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 13:18:58 2021 +0300
home: imp freebsd script & log changes
commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 16 14:08:46 2021 +0300
all: imp service uninstall </s> remove command_args="-p ${pidfile} -f -r {{.WorkingDirectory}}/{{.Name}}"
</s> add command_args="-P ${pidfile} -p ${pidfile_child} -f -r {{.WorkingDirectory}}/{{.Name}}" </s> remove // sysVersion is the version of local service.System interface
// implementation.
</s> add // sysVersion is the version of local service.System interface implementation. </s> remove // installation Otherwise, the service won't start on the system
</s> add // installation. Otherwise, the service won't start on the system | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f | internal/home/service.go |
command_args="-P ${pidfile} -p ${pidfile_child} -f -r {{.WorkingDirectory}}/{{.Name}}" | <mask> {{.Name}}_env="IS_DAEMON=1"
<mask> {{.Name}}_user="root"
<mask> pidfile="/var/run/${name}.pid"
<mask> command="/usr/sbin/daemon"
<mask> command_args="-p ${pidfile} -f -r {{.WorkingDirectory}}/{{.Name}}"
<mask> run_rc_command "$1"
<mask> `
<mask>
<mask> const openBSDScript = `#!/bin/sh
<mask> #
</s> Pull request: 3868 imp service uninstall
Merge in DNS/adguard-home from 3868-imp-uninstall to master
Closes #3868.
Updates #3457.
Squashed commit of the following:
commit 6f50713407980c27e5b14bef4dc8839e134ec5c8
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 19:06:13 2021 +0300
all: imp openwrt
commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:26:32 2021 +0300
all: imp code && docs
commit bab95366b0ffa40d96de5bb8116ec14606e310ed
Merge: 92ebc210 52f36f20
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:06:25 2021 +0300
Merge branch 'master' into 3868-imp-uninstall
commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 13:18:58 2021 +0300
home: imp freebsd script & log changes
commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 16 14:08:46 2021 +0300
all: imp service uninstall </s> remove pidfile="/var/run/${name}.pid"
</s> add pidfile_child="/var/run/${name}.pid"
pidfile="/var/run/${name}_daemon.pid" </s> remove // sysVersion is the version of local service.System interface
// implementation.
</s> add // sysVersion is the version of local service.System interface implementation. </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err)
</s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove data, err := os.ReadFile(pidfile)
</s> add data, err := os.ReadFile(pidFile) </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName)
</s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f | internal/home/service.go |
// sysVersion is the version of local service.System interface implementation. | <mask> // package and has only one internal dependency.
<mask> //
<mask> // TODO(e.burkov): Perhaps, file a PR to github.com/kardianos/service.
<mask>
<mask> // sysVersion is the version of local service.System interface
<mask> // implementation.
<mask> const sysVersion = "openbsd-runcom"
<mask>
<mask> func chooseSystem() {
<mask> service.ChooseSystem(openbsdSystem{})
<mask> }
</s> Pull request: 3868 imp service uninstall
Merge in DNS/adguard-home from 3868-imp-uninstall to master
Closes #3868.
Updates #3457.
Squashed commit of the following:
commit 6f50713407980c27e5b14bef4dc8839e134ec5c8
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 19:06:13 2021 +0300
all: imp openwrt
commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:26:32 2021 +0300
all: imp code && docs
commit bab95366b0ffa40d96de5bb8116ec14606e310ed
Merge: 92ebc210 52f36f20
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 17:06:25 2021 +0300
Merge branch 'master' into 3868-imp-uninstall
commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c
Author: Eugene Burkov <[email protected]>
Date: Mon Dec 27 13:18:58 2021 +0300
home: imp freebsd script & log changes
commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc
Author: Eugene Burkov <[email protected]>
Date: Thu Dec 16 14:08:46 2021 +0300
all: imp service uninstall </s> remove // installation Otherwise, the service won't start on the system
</s> add // installation. Otherwise, the service won't start on the system </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err)
</s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove log.Error("service: parsing pid file %s: bad value", pidfile)
</s> add log.Error("service: parsing pid file %s: bad value", pidFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f | internal/home/service_openbsd.go |
"upstreams": "Upstreams", | <mask> "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https://www.quad9.net/' target='_blank'>Quad9</a> as an upstream.",
<mask> "test_upstream_btn": "Test upstreams",
<mask> "apply_btn": "Apply",
<mask> "disabled_filtering_toast": "Disabled filtering",
<mask> "enabled_filtering_toast": "Enabled filtering",
<mask> "disabled_safe_browsing_toast": "Disabled safebrowsing",
<mask> "enabled_safe_browsing_toast": "Enabled safebrowsing",
<mask> "disabled_parental_toast": "Disabled parental control",
</s> + client: handle upstream DNS servers for clients </s> remove use_global_settings: true,
use_global_blocked_services: true,
...client,
</s> add upstreams: (upstreams && upstreams.join('\n')) || '',
...values, </s> remove if (values && values.blocked_services) {
const blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
config = { ...values, blocked_services };
</s> add if (values) {
if (values.blocked_services) {
config.blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
}
if (values.upstreams && typeof values.upstreams === 'string') {
config.upstreams = normalizeTextarea(values.upstreams);
} else {
config.upstreams = [];
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4 | client/src/__locales/en.json |
import { normalizeTextarea } from '../../../helpers/helpers'; | <mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import ReactTable from 'react-table';
<mask>
<mask> import { MODAL_TYPE } from '../../../helpers/constants';
<mask> import Card from '../../ui/Card';
<mask> import Modal from './Modal';
<mask> import WrapCell from './WrapCell';
<mask>
<mask> import whoisCell from './whoisCell';
</s> + client: handle upstream DNS servers for clients </s> remove if (values && values.blocked_services) {
const blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
config = { ...values, blocked_services };
</s> add if (values) {
if (values.blocked_services) {
config.blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
}
if (values.upstreams && typeof values.upstreams === 'string') {
config.upstreams = normalizeTextarea(values.upstreams);
} else {
config.upstreams = [];
} </s> remove use_global_settings: true,
use_global_blocked_services: true,
...client,
</s> add upstreams: (upstreams && upstreams.join('\n')) || '',
...values, </s> remove let config = values;
</s> add const config = values; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4 | client/src/components/Settings/Clients/ClientsTable.js |
const config = values; | <mask> this.props.updateClient(values, name);
<mask> };
<mask>
<mask> handleSubmit = (values) => {
<mask> let config = values;
<mask>
<mask> if (values && values.blocked_services) {
<mask> const blocked_services = Object
<mask> .keys(values.blocked_services)
<mask> .filter(service => values.blocked_services[service]);
</s> + client: handle upstream DNS servers for clients </s> remove if (values && values.blocked_services) {
const blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
config = { ...values, blocked_services };
</s> add if (values) {
if (values.blocked_services) {
config.blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
}
if (values.upstreams && typeof values.upstreams === 'string') {
config.upstreams = normalizeTextarea(values.upstreams);
} else {
config.upstreams = [];
} </s> remove use_global_settings: true,
use_global_blocked_services: true,
...client,
</s> add upstreams: (upstreams && upstreams.join('\n')) || '',
...values, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4 | client/src/components/Settings/Clients/ClientsTable.js |
if (values) {
if (values.blocked_services) {
config.blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
}
if (values.upstreams && typeof values.upstreams === 'string') {
config.upstreams = normalizeTextarea(values.upstreams);
} else {
config.upstreams = [];
} | <mask>
<mask> handleSubmit = (values) => {
<mask> let config = values;
<mask>
<mask> if (values && values.blocked_services) {
<mask> const blocked_services = Object
<mask> .keys(values.blocked_services)
<mask> .filter(service => values.blocked_services[service]);
<mask> config = { ...values, blocked_services };
<mask> }
<mask>
<mask> if (this.props.modalType === MODAL_TYPE.EDIT) {
<mask> this.handleFormUpdate(config, this.props.modalClientName);
<mask> } else {
</s> + client: handle upstream DNS servers for clients </s> remove let config = values;
</s> add const config = values; </s> remove use_global_settings: true,
use_global_blocked_services: true,
...client,
</s> add upstreams: (upstreams && upstreams.join('\n')) || '',
...values, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4 | client/src/components/Settings/Clients/ClientsTable.js |
const { upstreams, whois_info, ...values } = client; | <mask> getClient = (name, clients) => {
<mask> const client = clients.find(item => name === item.name);
<mask>
<mask> if (client) {
<mask> return {
<mask> upstreams: (upstreams && upstreams.join('\n')) || '',
<mask> ...values,
<mask> };
<mask> }
</s> + client: handle upstream DNS servers for clients </s> remove use_global_settings: true,
use_global_blocked_services: true,
...client,
</s> add upstreams: (upstreams && upstreams.join('\n')) || '',
...values, </s> remove if (values && values.blocked_services) {
const blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
config = { ...values, blocked_services };
</s> add if (values) {
if (values.blocked_services) {
config.blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
}
if (values.upstreams && typeof values.upstreams === 'string') {
config.upstreams = normalizeTextarea(values.upstreams);
} else {
config.upstreams = [];
} </s> remove let config = values;
</s> add const config = values; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4 | client/src/components/Settings/Clients/ClientsTable.js |
upstreams: (upstreams && upstreams.join('\n')) || '',
...values, | <mask> const client = clients.find(item => name === item.name);
<mask>
<mask> if (client) {
<mask> return {
<mask> use_global_settings: true,
<mask> use_global_blocked_services: true,
<mask> ...client,
<mask> };
<mask> }
<mask>
<mask> return {
<mask> ids: [''],
</s> + client: handle upstream DNS servers for clients </s> remove if (values && values.blocked_services) {
const blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
config = { ...values, blocked_services };
</s> add if (values) {
if (values.blocked_services) {
config.blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
}
if (values.upstreams && typeof values.upstreams === 'string') {
config.upstreams = normalizeTextarea(values.upstreams);
} else {
config.upstreams = [];
} </s> remove let config = values;
</s> add const config = values; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4 | client/src/components/Settings/Clients/ClientsTable.js |
import Examples from '../Dns/Upstream/Examples'; | <mask> import i18n from '../../../i18n';
<mask> import Tabs from '../../ui/Tabs';
<mask> import { toggleAllServices } from '../../../helpers/helpers';
<mask> import {
<mask> renderField,
<mask> renderGroupField,
</s> + client: handle upstream DNS servers for clients </s> remove if (values && values.blocked_services) {
const blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
config = { ...values, blocked_services };
</s> add if (values) {
if (values.blocked_services) {
config.blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
}
if (values.upstreams && typeof values.upstreams === 'string') {
config.upstreams = normalizeTextarea(values.upstreams);
} else {
config.upstreams = [];
} </s> remove use_global_settings: true,
use_global_blocked_services: true,
...client,
</s> add upstreams: (upstreams && upstreams.join('\n')) || '',
...values, </s> remove let config = values;
</s> add const config = values; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4 | client/src/components/Settings/Clients/Form.js |
<div label="upstream" title={props.t('upstream_dns')}>
<Field
id="upstreams"
name="upstreams"
component="textarea"
type="text"
className="form-control form-control--textarea mb-5"
placeholder={t('upstream_dns')}
/>
<Examples />
</div> | <mask> </div>
<mask> </div>
<mask> </div>
<mask> </Tabs>
<mask> </div>
<mask>
<mask> <div className="modal-footer">
</s> + client: handle upstream DNS servers for clients </s> remove use_global_settings: true,
use_global_blocked_services: true,
...client,
</s> add upstreams: (upstreams && upstreams.join('\n')) || '',
...values, </s> remove if (values && values.blocked_services) {
const blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
config = { ...values, blocked_services };
</s> add if (values) {
if (values.blocked_services) {
config.blocked_services = Object
.keys(values.blocked_services)
.filter(service => values.blocked_services[service]);
}
if (values.upstreams && typeof values.upstreams === 'string') {
config.upstreams = normalizeTextarea(values.upstreams);
} else {
config.upstreams = [];
} </s> remove let config = values;
</s> add const config = values; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4 | client/src/components/Settings/Clients/Form.js |
// Existing files are overwritten
// Return the list of files (not directories) written
func zipFileUnpack(zipfile, outdir string) ([]string, error) {
| <mask> return &u, nil
<mask> }
<mask>
<mask> // Unpack all files from .zip file to the specified directory
<mask> func zipFileUnpack(zipfile, outdir string) error {
<mask> r, err := zip.OpenReader(zipfile)
<mask> if err != nil {
<mask> return fmt.Errorf("zip.OpenReader(): %s", err)
<mask> }
<mask> defer r.Close()
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove return fmt.Errorf("zip.OpenReader(): %s", err)
</s> add return nil, fmt.Errorf("zip.OpenReader(): %s", err) </s> remove zr.Close()
</s> add f.Close()
log.Tracef("created file %s", fn)
files = append(files, fi.Name()) </s> remove return nil
</s> add zr.Close()
return files, err2 </s> remove zr, err := zf.Open()
</s> add zr, err = zf.Open() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
return nil, fmt.Errorf("zip.OpenReader(): %s", err) | <mask> // Unpack all files from .zip file to the specified directory
<mask> func zipFileUnpack(zipfile, outdir string) error {
<mask> r, err := zip.OpenReader(zipfile)
<mask> if err != nil {
<mask> return fmt.Errorf("zip.OpenReader(): %s", err)
<mask> }
<mask> defer r.Close()
<mask>
<mask> for _, zf := range r.File {
<mask> zr, err := zf.Open()
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove func zipFileUnpack(zipfile, outdir string) error {
</s> add // Existing files are overwritten
// Return the list of files (not directories) written
func zipFileUnpack(zipfile, outdir string) ([]string, error) {
</s> remove zr, err := zf.Open()
</s> add zr, err = zf.Open() </s> remove zr.Close()
</s> add f.Close()
log.Tracef("created file %s", fn)
files = append(files, fi.Name()) </s> remove return fmt.Errorf("zip file Open(): %s", err)
</s> add err2 = fmt.Errorf("zip file Open(): %s", err)
break | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
var files []string
var err2 error
var zr io.ReadCloser | <mask> return nil, fmt.Errorf("zip.OpenReader(): %s", err)
<mask> }
<mask> defer r.Close()
<mask>
<mask> for _, zf := range r.File {
<mask> zr, err = zf.Open()
<mask> if err != nil {
<mask> err2 = fmt.Errorf("zip file Open(): %s", err)
<mask> break
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove zr, err := zf.Open()
</s> add zr, err = zf.Open() </s> remove return fmt.Errorf("zip file Open(): %s", err)
</s> add err2 = fmt.Errorf("zip file Open(): %s", err)
break </s> remove return fmt.Errorf("zip.OpenReader(): %s", err)
</s> add return nil, fmt.Errorf("zip.OpenReader(): %s", err) </s> remove if err != nil {
return fmt.Errorf("zip file Read(): %s", err)
</s> add if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %s", err)
break </s> remove zr.Close()
return fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %s", err)
break | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
zr, err = zf.Open() | <mask> }
<mask> defer r.Close()
<mask>
<mask> for _, zf := range r.File {
<mask> zr, err := zf.Open()
<mask> if err != nil {
<mask> return fmt.Errorf("zip file Open(): %s", err)
<mask> }
<mask> fi := zf.FileInfo()
<mask> fn := filepath.Join(outdir, fi.Name())
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove return fmt.Errorf("zip file Open(): %s", err)
</s> add err2 = fmt.Errorf("zip file Open(): %s", err)
break </s> remove return fmt.Errorf("zip.OpenReader(): %s", err)
</s> add return nil, fmt.Errorf("zip.OpenReader(): %s", err) </s> remove if err != nil {
return fmt.Errorf("zip file Read(): %s", err)
</s> add if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %s", err)
break | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
err2 = fmt.Errorf("zip file Open(): %s", err)
break | <mask>
<mask> for _, zf := range r.File {
<mask> zr, err := zf.Open()
<mask> if err != nil {
<mask> return fmt.Errorf("zip file Open(): %s", err)
<mask> }
<mask> fi := zf.FileInfo()
<mask> fn := filepath.Join(outdir, fi.Name())
<mask>
<mask> if fi.IsDir() {
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove zr, err := zf.Open()
</s> add zr, err = zf.Open() </s> remove return fmt.Errorf("zip.OpenReader(): %s", err)
</s> add return nil, fmt.Errorf("zip.OpenReader(): %s", err) </s> remove if err != nil {
return fmt.Errorf("zip file Read(): %s", err)
</s> add if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %s", err)
break | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
if len(fi.Name()) == 0 {
continue
}
| <mask>
<mask> fi := zf.FileInfo()
<mask> fn := filepath.Join(outdir, fi.Name())
<mask>
<mask> if fi.IsDir() {
<mask> err = os.Mkdir(fn, fi.Mode())
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove if err != nil {
return fmt.Errorf("zip file Read(): %s", err)
</s> add if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %s", err)
break </s> remove return fmt.Errorf("zip file Open(): %s", err)
</s> add err2 = fmt.Errorf("zip file Open(): %s", err)
break </s> remove zr, err := zf.Open()
</s> add zr, err = zf.Open() </s> remove zr.Close()
return fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %s", err)
break | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %s", err)
break | <mask> fn := filepath.Join(outdir, fi.Name())
<mask>
<mask> if fi.IsDir() {
<mask> err = os.Mkdir(fn, fi.Mode())
<mask> if err != nil {
<mask> return fmt.Errorf("zip file Read(): %s", err)
<mask> }
<mask> continue
<mask> }
<mask>
<mask> f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fi.Mode())
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove zr.Close()
return fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %s", err)
break </s> remove return fmt.Errorf("zip file Open(): %s", err)
</s> add err2 = fmt.Errorf("zip file Open(): %s", err)
break </s> remove zr, err := zf.Open()
</s> add zr, err = zf.Open() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
log.Tracef("created directory %s", fn) | <mask> break
<mask> }
<mask> continue
<mask> }
<mask>
<mask> f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fi.Mode())
<mask> if err != nil {
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove if err != nil {
return fmt.Errorf("zip file Read(): %s", err)
</s> add if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %s", err)
break </s> remove zr.Close()
return fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %s", err)
break </s> remove zr.Close()
return fmt.Errorf("io.Copy(): %s", err)
</s> add f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break </s> remove return fmt.Errorf("zip file Open(): %s", err)
</s> add err2 = fmt.Errorf("zip file Open(): %s", err)
break | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
err2 = fmt.Errorf("os.OpenFile(): %s", err)
break | <mask> }
<mask>
<mask> f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fi.Mode())
<mask> if err != nil {
<mask> zr.Close()
<mask> return fmt.Errorf("os.OpenFile(): %s", err)
<mask> }
<mask> _, err = io.Copy(f, zr)
<mask> if err != nil {
<mask> zr.Close()
<mask> return fmt.Errorf("io.Copy(): %s", err)
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove zr.Close()
return fmt.Errorf("io.Copy(): %s", err)
</s> add f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break </s> remove if err != nil {
return fmt.Errorf("zip file Read(): %s", err)
</s> add if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %s", err)
break </s> remove zr.Close()
</s> add f.Close()
log.Tracef("created file %s", fn)
files = append(files, fi.Name()) </s> remove err = zipFileUnpack(u.pkgName, u.updateDir)
</s> add _, err = zipFileUnpack(u.pkgName, u.updateDir) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break | <mask> return fmt.Errorf("os.OpenFile(): %s", err)
<mask> }
<mask> _, err = io.Copy(f, zr)
<mask> if err != nil {
<mask> zr.Close()
<mask> return fmt.Errorf("io.Copy(): %s", err)
<mask> }
<mask> zr.Close()
<mask> }
<mask> return nil
<mask> }
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove zr.Close()
return fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %s", err)
break </s> remove zr.Close()
</s> add f.Close()
log.Tracef("created file %s", fn)
files = append(files, fi.Name()) </s> remove return nil
</s> add zr.Close()
return files, err2 </s> remove if err != nil {
return fmt.Errorf("zip file Read(): %s", err)
</s> add if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %s", err)
break </s> remove err = zipFileUnpack(u.pkgName, u.updateDir)
</s> add _, err = zipFileUnpack(u.pkgName, u.updateDir) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
f.Close()
log.Tracef("created file %s", fn)
files = append(files, fi.Name()) | <mask> if err != nil {
<mask> zr.Close()
<mask> return fmt.Errorf("io.Copy(): %s", err)
<mask> }
<mask> zr.Close()
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // Unpack all files from .tar.gz file to the specified directory
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove return nil
</s> add zr.Close()
return files, err2 </s> remove func zipFileUnpack(zipfile, outdir string) error {
</s> add // Existing files are overwritten
// Return the list of files (not directories) written
func zipFileUnpack(zipfile, outdir string) ([]string, error) {
</s> remove return fmt.Errorf("zip.OpenReader(): %s", err)
</s> add return nil, fmt.Errorf("zip.OpenReader(): %s", err) </s> remove zr.Close()
return fmt.Errorf("io.Copy(): %s", err)
</s> add f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break </s> remove zr.Close()
return fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %s", err)
break | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
zr.Close()
return files, err2 | <mask> return fmt.Errorf("io.Copy(): %s", err)
<mask> }
<mask> zr.Close()
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // Unpack all files from .tar.gz file to the specified directory
<mask> // Existing files are overwritten
<mask> // Return the list of files (not directories) written
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove func zipFileUnpack(zipfile, outdir string) error {
</s> add // Existing files are overwritten
// Return the list of files (not directories) written
func zipFileUnpack(zipfile, outdir string) ([]string, error) {
</s> remove zr.Close()
</s> add f.Close()
log.Tracef("created file %s", fn)
files = append(files, fi.Name()) </s> remove return fmt.Errorf("zip.OpenReader(): %s", err)
</s> add return nil, fmt.Errorf("zip.OpenReader(): %s", err) </s> remove zr.Close()
return fmt.Errorf("io.Copy(): %s", err)
</s> add f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break </s> remove zr.Close()
return fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %s", err)
break | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
_, err = zipFileUnpack(u.pkgName, u.updateDir) | <mask> log.Tracef("Unpacking the package")
<mask> _ = os.Mkdir(u.updateDir, 0755)
<mask> _, file := filepath.Split(u.pkgName)
<mask> if strings.HasSuffix(file, ".zip") {
<mask> err = zipFileUnpack(u.pkgName, u.updateDir)
<mask> if err != nil {
<mask> return fmt.Errorf("zipFileUnpack() failed: %s", err)
<mask> }
<mask> } else if strings.HasSuffix(file, ".tar.gz") {
<mask> _, err = targzFileUnpack(u.pkgName, u.updateDir)
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove if err != nil {
return fmt.Errorf("zip file Read(): %s", err)
</s> add if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %s", err)
break </s> remove zr.Close()
return fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %s", err)
break </s> remove e := zipFileUnpack(fn, outdir)
</s> add files, e := zipFileUnpack(fn, outdir) </s> remove return fmt.Errorf("zip file Open(): %s", err)
</s> add err2 = fmt.Errorf("zip file Open(): %s", err)
break </s> remove zr.Close()
return fmt.Errorf("io.Copy(): %s", err)
</s> add f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update.go |
files, e := zipFileUnpack(fn, outdir) | <mask> func testZipFileUnpack(t *testing.T) {
<mask> fn := "./dist/AdGuardHome_v0.95_Windows_amd64.zip"
<mask> outdir := "./test-unpack"
<mask> _ = os.Mkdir(outdir, 0755)
<mask> e := zipFileUnpack(fn, outdir)
<mask> if e != nil {
<mask> t.Fatalf("FAILED: %s", e)
<mask> }
<mask> os.RemoveAll(outdir)
<mask> }
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove err = zipFileUnpack(u.pkgName, u.updateDir)
</s> add _, err = zipFileUnpack(u.pkgName, u.updateDir) </s> remove func zipFileUnpack(zipfile, outdir string) error {
</s> add // Existing files are overwritten
// Return the list of files (not directories) written
func zipFileUnpack(zipfile, outdir string) ([]string, error) {
</s> remove return fmt.Errorf("zip.OpenReader(): %s", err)
</s> add return nil, fmt.Errorf("zip.OpenReader(): %s", err) </s> remove if err != nil {
return fmt.Errorf("zip file Read(): %s", err)
</s> add if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %s", err)
break | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update_test.go |
t.Logf("%v", files) | <mask> t.Fatalf("FAILED: %s", e)
<mask> }
<mask> os.RemoveAll(outdir)
<mask> }
</s> * auto-update: zipFileUnpack() returns list of unpacked files </s> remove e := zipFileUnpack(fn, outdir)
</s> add files, e := zipFileUnpack(fn, outdir) </s> remove zr.Close()
return fmt.Errorf("io.Copy(): %s", err)
</s> add f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break </s> remove zr.Close()
</s> add f.Close()
log.Tracef("created file %s", fn)
files = append(files, fi.Name()) </s> remove zr.Close()
return fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %s", err)
break | [
"keep",
"add",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/66c670c6fff0489ce1195e5fabec1128505220b5 | control_update_test.go |
dnsctx dnsContext | <mask> versionCheckJSON []byte
<mask> versionCheckLastTime time.Time
<mask>
<mask> dnsServer *dnsforward.Server
<mask> dhcpServer dhcpd.Server
<mask> httpServer *http.Server
<mask> httpsServer HTTPSServer
<mask>
</s> * move "dnsctx" to "config" </s> remove dnsctx.rdnsLock.Lock()
delete(dnsctx.rdnsIP, ip)
dnsctx.rdnsLock.Unlock()
</s> add config.dnsctx.rdnsLock.Lock()
delete(config.dnsctx.rdnsIP, ip)
config.dnsctx.rdnsLock.Unlock() </s> remove ip = <-dnsctx.rdnsChannel
</s> add ip = <-config.dnsctx.rdnsChannel </s> remove resp, err := dnsctx.upstream.Exchange(&req)
</s> add resp, err := config.dnsctx.upstream.Exchange(&req) </s> remove case dnsctx.rdnsChannel <- ip:
</s> add case config.dnsctx.rdnsChannel <- ip: </s> remove dnsctx.rdnsIP[ip] = true
</s> add config.dnsctx.rdnsIP[ip] = true | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6701e9ce068d7caba926673f0217f7d8108d7db2 | home/config.go |
<mask> rdnsLock sync.Mutex // synchronize access to rdnsIP
<mask> upstream upstream.Upstream // Upstream object for our own DNS server
<mask> }
<mask>
<mask> var dnsctx dnsContext
<mask>
<mask> // initDNSServer creates an instance of the dnsforward.Server
<mask> // Please note that we must do it even if we don't start it
<mask> // so that we had access to the query log and the stats
<mask> func initDNSServer(baseDir string) {
<mask> err := os.MkdirAll(baseDir, 0755)
</s> * move "dnsctx" to "config" </s> remove ip = <-dnsctx.rdnsChannel
</s> add ip = <-config.dnsctx.rdnsChannel </s> remove resp, err := dnsctx.upstream.Exchange(&req)
</s> add resp, err := config.dnsctx.upstream.Exchange(&req) </s> remove dnsctx.rdnsLock.Lock()
defer dnsctx.rdnsLock.Unlock()
_, ok := dnsctx.rdnsIP[ip]
</s> add config.dnsctx.rdnsLock.Lock()
defer config.dnsctx.rdnsLock.Unlock()
_, ok := config.dnsctx.rdnsIP[ip] </s> remove dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts)
</s> add config.dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6701e9ce068d7caba926673f0217f7d8108d7db2 | home/dns.go |
|
config.dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts) | <mask> resolverAddress := fmt.Sprintf("%s:%d", bindhost, config.DNS.Port)
<mask> opts := upstream.Options{
<mask> Timeout: rdnsTimeout,
<mask> }
<mask> dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts)
<mask> if err != nil {
<mask> log.Error("upstream.AddressToUpstream: %s", err)
<mask> return
<mask> }
<mask> dnsctx.rdnsIP = make(map[string]bool)
</s> * move "dnsctx" to "config" </s> remove dnsctx.rdnsIP = make(map[string]bool)
dnsctx.rdnsChannel = make(chan string, 256)
</s> add config.dnsctx.rdnsIP = make(map[string]bool)
config.dnsctx.rdnsChannel = make(chan string, 256) </s> remove resp, err := dnsctx.upstream.Exchange(&req)
</s> add resp, err := config.dnsctx.upstream.Exchange(&req) </s> remove dnsctx.rdnsLock.Lock()
defer dnsctx.rdnsLock.Unlock()
_, ok := dnsctx.rdnsIP[ip]
</s> add config.dnsctx.rdnsLock.Lock()
defer config.dnsctx.rdnsLock.Unlock()
_, ok := config.dnsctx.rdnsIP[ip] </s> remove dnsctx.rdnsIP[ip] = true
</s> add config.dnsctx.rdnsIP[ip] = true </s> remove ip = <-dnsctx.rdnsChannel
</s> add ip = <-config.dnsctx.rdnsChannel | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6701e9ce068d7caba926673f0217f7d8108d7db2 | home/dns.go |
config.dnsctx.rdnsIP = make(map[string]bool)
config.dnsctx.rdnsChannel = make(chan string, 256) | <mask> if err != nil {
<mask> log.Error("upstream.AddressToUpstream: %s", err)
<mask> return
<mask> }
<mask> dnsctx.rdnsIP = make(map[string]bool)
<mask> dnsctx.rdnsChannel = make(chan string, 256)
<mask> go asyncRDNSLoop()
<mask> }
<mask>
<mask> func isRunning() bool {
<mask> return config.dnsServer != nil && config.dnsServer.IsRunning()
</s> * move "dnsctx" to "config" </s> remove dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts)
</s> add config.dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts) </s> remove resp, err := dnsctx.upstream.Exchange(&req)
</s> add resp, err := config.dnsctx.upstream.Exchange(&req) </s> remove ip = <-dnsctx.rdnsChannel
</s> add ip = <-config.dnsctx.rdnsChannel </s> remove dnsctx.rdnsIP[ip] = true
</s> add config.dnsctx.rdnsIP[ip] = true </s> remove case dnsctx.rdnsChannel <- ip:
</s> add case config.dnsctx.rdnsChannel <- ip: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6701e9ce068d7caba926673f0217f7d8108d7db2 | home/dns.go |
config.dnsctx.rdnsLock.Lock()
defer config.dnsctx.rdnsLock.Unlock()
_, ok := config.dnsctx.rdnsIP[ip] | <mask> return
<mask> }
<mask>
<mask> // add IP to rdnsIP, if not exists
<mask> dnsctx.rdnsLock.Lock()
<mask> defer dnsctx.rdnsLock.Unlock()
<mask> _, ok := dnsctx.rdnsIP[ip]
<mask> if ok {
<mask> return
<mask> }
<mask> dnsctx.rdnsIP[ip] = true
<mask>
</s> * move "dnsctx" to "config" </s> remove dnsctx.rdnsIP[ip] = true
</s> add config.dnsctx.rdnsIP[ip] = true </s> remove dnsctx.rdnsLock.Lock()
delete(dnsctx.rdnsIP, ip)
dnsctx.rdnsLock.Unlock()
</s> add config.dnsctx.rdnsLock.Lock()
delete(config.dnsctx.rdnsIP, ip)
config.dnsctx.rdnsLock.Unlock() </s> remove case dnsctx.rdnsChannel <- ip:
</s> add case config.dnsctx.rdnsChannel <- ip: </s> remove ip = <-dnsctx.rdnsChannel
</s> add ip = <-config.dnsctx.rdnsChannel </s> remove dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts)
</s> add config.dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6701e9ce068d7caba926673f0217f7d8108d7db2 | home/dns.go |
config.dnsctx.rdnsIP[ip] = true | <mask> _, ok := dnsctx.rdnsIP[ip]
<mask> if ok {
<mask> return
<mask> }
<mask> dnsctx.rdnsIP[ip] = true
<mask>
<mask> log.Tracef("Adding %s for rDNS resolve", ip)
<mask> select {
<mask> case dnsctx.rdnsChannel <- ip:
<mask> //
</s> * move "dnsctx" to "config" </s> remove case dnsctx.rdnsChannel <- ip:
</s> add case config.dnsctx.rdnsChannel <- ip: </s> remove dnsctx.rdnsLock.Lock()
defer dnsctx.rdnsLock.Unlock()
_, ok := dnsctx.rdnsIP[ip]
</s> add config.dnsctx.rdnsLock.Lock()
defer config.dnsctx.rdnsLock.Unlock()
_, ok := config.dnsctx.rdnsIP[ip] </s> remove dnsctx.rdnsLock.Lock()
delete(dnsctx.rdnsIP, ip)
dnsctx.rdnsLock.Unlock()
</s> add config.dnsctx.rdnsLock.Lock()
delete(config.dnsctx.rdnsIP, ip)
config.dnsctx.rdnsLock.Unlock() </s> remove dnsctx.rdnsIP = make(map[string]bool)
dnsctx.rdnsChannel = make(chan string, 256)
</s> add config.dnsctx.rdnsIP = make(map[string]bool)
config.dnsctx.rdnsChannel = make(chan string, 256) </s> remove resp, err := dnsctx.upstream.Exchange(&req)
</s> add resp, err := config.dnsctx.upstream.Exchange(&req) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6701e9ce068d7caba926673f0217f7d8108d7db2 | home/dns.go |
case config.dnsctx.rdnsChannel <- ip: | <mask> dnsctx.rdnsIP[ip] = true
<mask>
<mask> log.Tracef("Adding %s for rDNS resolve", ip)
<mask> select {
<mask> case dnsctx.rdnsChannel <- ip:
<mask> //
<mask> default:
<mask> log.Tracef("rDNS queue is full")
<mask> }
<mask> }
</s> * move "dnsctx" to "config" </s> remove dnsctx.rdnsIP[ip] = true
</s> add config.dnsctx.rdnsIP[ip] = true </s> remove dnsctx.rdnsLock.Lock()
defer dnsctx.rdnsLock.Unlock()
_, ok := dnsctx.rdnsIP[ip]
</s> add config.dnsctx.rdnsLock.Lock()
defer config.dnsctx.rdnsLock.Unlock()
_, ok := config.dnsctx.rdnsIP[ip] </s> remove dnsctx.rdnsLock.Lock()
delete(dnsctx.rdnsIP, ip)
dnsctx.rdnsLock.Unlock()
</s> add config.dnsctx.rdnsLock.Lock()
delete(config.dnsctx.rdnsIP, ip)
config.dnsctx.rdnsLock.Unlock() </s> remove dnsctx.rdnsIP = make(map[string]bool)
dnsctx.rdnsChannel = make(chan string, 256)
</s> add config.dnsctx.rdnsIP = make(map[string]bool)
config.dnsctx.rdnsChannel = make(chan string, 256) </s> remove resp, err := dnsctx.upstream.Exchange(&req)
</s> add resp, err := config.dnsctx.upstream.Exchange(&req) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6701e9ce068d7caba926673f0217f7d8108d7db2 | home/dns.go |
resp, err := config.dnsctx.upstream.Exchange(&req) | <mask> log.Debug("Error while calling dns.ReverseAddr(%s): %s", ip, err)
<mask> return ""
<mask> }
<mask>
<mask> resp, err := dnsctx.upstream.Exchange(&req)
<mask> if err != nil {
<mask> log.Error("Error while making an rDNS lookup for %s: %s", ip, err)
<mask> return ""
<mask> }
<mask> if len(resp.Answer) != 1 {
</s> * move "dnsctx" to "config" </s> remove dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts)
</s> add config.dnsctx.upstream, err = upstream.AddressToUpstream(resolverAddress, opts) </s> remove dnsctx.rdnsIP = make(map[string]bool)
dnsctx.rdnsChannel = make(chan string, 256)
</s> add config.dnsctx.rdnsIP = make(map[string]bool)
config.dnsctx.rdnsChannel = make(chan string, 256) </s> remove dnsctx.rdnsIP[ip] = true
</s> add config.dnsctx.rdnsIP[ip] = true </s> remove dnsctx.rdnsLock.Lock()
defer dnsctx.rdnsLock.Unlock()
_, ok := dnsctx.rdnsIP[ip]
</s> add config.dnsctx.rdnsLock.Lock()
defer config.dnsctx.rdnsLock.Unlock()
_, ok := config.dnsctx.rdnsIP[ip] </s> remove var dnsctx dnsContext
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6701e9ce068d7caba926673f0217f7d8108d7db2 | home/dns.go |
ip = <-config.dnsctx.rdnsChannel | <mask> // Add the hostname:IP pair to "Clients" array
<mask> func asyncRDNSLoop() {
<mask> for {
<mask> var ip string
<mask> ip = <-dnsctx.rdnsChannel
<mask>
<mask> host := resolveRDNS(ip)
<mask> if len(host) == 0 {
<mask> continue
<mask> }
</s> * move "dnsctx" to "config" </s> remove dnsctx.rdnsLock.Lock()
delete(dnsctx.rdnsIP, ip)
dnsctx.rdnsLock.Unlock()
</s> add config.dnsctx.rdnsLock.Lock()
delete(config.dnsctx.rdnsIP, ip)
config.dnsctx.rdnsLock.Unlock() </s> remove var dnsctx dnsContext
</s> add </s> remove dnsctx.rdnsIP = make(map[string]bool)
dnsctx.rdnsChannel = make(chan string, 256)
</s> add config.dnsctx.rdnsIP = make(map[string]bool)
config.dnsctx.rdnsChannel = make(chan string, 256) </s> remove dnsctx.rdnsLock.Lock()
defer dnsctx.rdnsLock.Unlock()
_, ok := dnsctx.rdnsIP[ip]
</s> add config.dnsctx.rdnsLock.Lock()
defer config.dnsctx.rdnsLock.Unlock()
_, ok := config.dnsctx.rdnsIP[ip] </s> remove dnsctx.rdnsIP[ip] = true
</s> add config.dnsctx.rdnsIP[ip] = true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6701e9ce068d7caba926673f0217f7d8108d7db2 | home/dns.go |
config.dnsctx.rdnsLock.Lock()
delete(config.dnsctx.rdnsIP, ip)
config.dnsctx.rdnsLock.Unlock() | <mask> if len(host) == 0 {
<mask> continue
<mask> }
<mask>
<mask> dnsctx.rdnsLock.Lock()
<mask> delete(dnsctx.rdnsIP, ip)
<mask> dnsctx.rdnsLock.Unlock()
<mask>
<mask> _, _ = config.clients.AddHost(ip, host, ClientSourceRDNS)
<mask> }
<mask> }
<mask>
</s> * move "dnsctx" to "config" </s> remove ip = <-dnsctx.rdnsChannel
</s> add ip = <-config.dnsctx.rdnsChannel </s> remove dnsctx.rdnsLock.Lock()
defer dnsctx.rdnsLock.Unlock()
_, ok := dnsctx.rdnsIP[ip]
</s> add config.dnsctx.rdnsLock.Lock()
defer config.dnsctx.rdnsLock.Unlock()
_, ok := config.dnsctx.rdnsIP[ip] </s> remove dnsctx.rdnsIP[ip] = true
</s> add config.dnsctx.rdnsIP[ip] = true </s> remove case dnsctx.rdnsChannel <- ip:
</s> add case config.dnsctx.rdnsChannel <- ip: </s> remove dnsctx.rdnsIP = make(map[string]bool)
dnsctx.rdnsChannel = make(chan string, 256)
</s> add config.dnsctx.rdnsIP = make(map[string]bool)
config.dnsctx.rdnsChannel = make(chan string, 256) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6701e9ce068d7caba926673f0217f7d8108d7db2 | home/dns.go |
var cj clientJSON | <mask> el := map[string]interface{}{}
<mask> c, ok := clients.Find(ip)
<mask> if !ok {
<mask> var found bool
<mask> cj, found = clients.findTemporary(ip)
<mask> if !found {
</s> Pull request: home: don't miss blocked clients in client search api
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master
Updates #2428.
Squashed commit of the following:
commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 15 16:32:53 2021 +0300
home: don't miss blocked clients in client search api </s> remove ch, ok := clients.FindAutoClient(ip)
if !ok {
continue // a client with this IP isn't found
</s> add var found bool
cj, found = clients.findTemporary(ip)
if !found {
continue </s> remove cj := clientHostToJSON(ip, ch)
cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
el[ip] = cj
</s> add </s> remove respData.Web.Status = fmt.Sprintf("%v", err)
</s> add respData.Web.Status = err.Error() </s> remove respData.DNS.Status = fmt.Sprintf("%v", err)
</s> add respData.DNS.Status = err.Error() | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/679bbcdc26775bc3d961cbeef553dce7aa9c091b | internal/home/clientshttp.go |
var found bool
cj, found = clients.findTemporary(ip)
if !found {
continue | <mask> }
<mask> el := map[string]interface{}{}
<mask> c, ok := clients.Find(ip)
<mask> if !ok {
<mask> ch, ok := clients.FindAutoClient(ip)
<mask> if !ok {
<mask> continue // a client with this IP isn't found
<mask> }
<mask> cj := clientHostToJSON(ip, ch)
<mask>
<mask> cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
<mask> el[ip] = cj
</s> Pull request: home: don't miss blocked clients in client search api
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master
Updates #2428.
Squashed commit of the following:
commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 15 16:32:53 2021 +0300
home: don't miss blocked clients in client search api </s> remove cj := clientHostToJSON(ip, ch)
cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
el[ip] = cj
</s> add </s> remove cj := clientToJSON(&c)
</s> add cj = clientToJSON(&c) </s> remove el[ip] = cj
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/679bbcdc26775bc3d961cbeef553dce7aa9c091b | internal/home/clientshttp.go |
<mask> ch, ok := clients.FindAutoClient(ip)
<mask> if !ok {
<mask> continue // a client with this IP isn't found
<mask> }
<mask> cj := clientHostToJSON(ip, ch)
<mask>
<mask> cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
<mask> el[ip] = cj
<mask> } else {
<mask> cj := clientToJSON(&c)
<mask>
<mask> cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
<mask> el[ip] = cj
</s> Pull request: home: don't miss blocked clients in client search api
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master
Updates #2428.
Squashed commit of the following:
commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 15 16:32:53 2021 +0300
home: don't miss blocked clients in client search api </s> remove ch, ok := clients.FindAutoClient(ip)
if !ok {
continue // a client with this IP isn't found
</s> add var found bool
cj, found = clients.findTemporary(ip)
if !found {
continue </s> remove cj := clientToJSON(&c)
</s> add cj = clientToJSON(&c) </s> remove el[ip] = cj
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/679bbcdc26775bc3d961cbeef553dce7aa9c091b | internal/home/clientshttp.go |
|
cj = clientToJSON(&c) | <mask>
<mask> cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
<mask> el[ip] = cj
<mask> } else {
<mask> cj := clientToJSON(&c)
<mask>
<mask> cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
<mask> el[ip] = cj
<mask> }
<mask>
<mask> data = append(data, el)
</s> Pull request: home: don't miss blocked clients in client search api
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master
Updates #2428.
Squashed commit of the following:
commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 15 16:32:53 2021 +0300
home: don't miss blocked clients in client search api </s> remove el[ip] = cj
</s> add </s> remove cj := clientHostToJSON(ip, ch)
cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
el[ip] = cj
</s> add </s> remove ch, ok := clients.FindAutoClient(ip)
if !ok {
continue // a client with this IP isn't found
</s> add var found bool
cj, found = clients.findTemporary(ip)
if !found {
continue </s> remove respData.DNS.Status = fmt.Sprintf("%v", err)
</s> add respData.DNS.Status = err.Error() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/679bbcdc26775bc3d961cbeef553dce7aa9c091b | internal/home/clientshttp.go |
<mask> } else {
<mask> cj := clientToJSON(&c)
<mask>
<mask> cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
<mask> el[ip] = cj
<mask> }
<mask>
<mask> data = append(data, el)
<mask> }
<mask>
</s> Pull request: home: don't miss blocked clients in client search api
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master
Updates #2428.
Squashed commit of the following:
commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 15 16:32:53 2021 +0300
home: don't miss blocked clients in client search api </s> remove cj := clientToJSON(&c)
</s> add cj = clientToJSON(&c) </s> remove cj := clientHostToJSON(ip, ch)
cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
el[ip] = cj
</s> add </s> remove ch, ok := clients.FindAutoClient(ip)
if !ok {
continue // a client with this IP isn't found
</s> add var found bool
cj, found = clients.findTemporary(ip)
if !found {
continue </s> remove respData.DNS.Status = fmt.Sprintf("%v", err)
</s> add respData.DNS.Status = err.Error() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/679bbcdc26775bc3d961cbeef553dce7aa9c091b | internal/home/clientshttp.go |
|
el[ip] = cj | <mask> cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
<mask> }
<mask>
<mask> data = append(data, el)
<mask> }
<mask>
<mask> js, err := json.Marshal(data)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "json.Marshal: %s", err)
</s> Pull request: home: don't miss blocked clients in client search api
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master
Updates #2428.
Squashed commit of the following:
commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 15 16:32:53 2021 +0300
home: don't miss blocked clients in client search api </s> remove respData.DNS.Status = fmt.Sprintf("%v", err)
</s> add respData.DNS.Status = err.Error() </s> remove respData.Web.Status = fmt.Sprintf("%v", err)
</s> add respData.Web.Status = err.Error() </s> remove el[ip] = cj
</s> add </s> remove cj := clientToJSON(&c)
</s> add cj = clientToJSON(&c) </s> remove cj := clientHostToJSON(ip, ch)
cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
el[ip] = cj
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/679bbcdc26775bc3d961cbeef553dce7aa9c091b | internal/home/clientshttp.go |
data.NotBefore.Equal(notBefore) &&
data.NotAfter.Equal(notAfter) && | <mask> data.ValidKey &&
<mask> data.KeyType == "RSA" &&
<mask> data.Subject == "CN=AdGuard Home,O=AdGuard Ltd" &&
<mask> data.Issuer == "CN=AdGuard Home,O=AdGuard Ltd" &&
<mask> data.NotBefore == notBefore &&
<mask> data.NotAfter == notAfter &&
<mask> // data.DNSNames[0] == &&
<mask> data.ValidPair) {
<mask> t.Fatalf("valid cert & priv key: validateCertificates(): %v", data)
<mask> }
<mask> }
</s> Pull request: home: don't miss blocked clients in client search api
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master
Updates #2428.
Squashed commit of the following:
commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 15 16:32:53 2021 +0300
home: don't miss blocked clients in client search api </s> remove respData.Web.Status = fmt.Sprintf("%v", err)
</s> add respData.Web.Status = err.Error() </s> remove cj := clientHostToJSON(ip, ch)
cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
el[ip] = cj
</s> add </s> remove ch, ok := clients.FindAutoClient(ip)
if !ok {
continue // a client with this IP isn't found
</s> add var found bool
cj, found = clients.findTemporary(ip)
if !found {
continue </s> remove respData.DNS.Status = fmt.Sprintf("%v", err)
</s> add respData.DNS.Status = err.Error() </s> remove el[ip] = cj
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/679bbcdc26775bc3d961cbeef553dce7aa9c091b | internal/home/control_test.go |
respData.Web.Status = err.Error() | <mask>
<mask> if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort && reqData.Web.Port != config.BetaBindPort {
<mask> err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
<mask> if err != nil {
<mask> respData.Web.Status = fmt.Sprintf("%v", err)
<mask> }
<mask> }
<mask>
<mask> if reqData.DNS.Port != 0 {
<mask> err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> Pull request: home: don't miss blocked clients in client search api
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master
Updates #2428.
Squashed commit of the following:
commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 15 16:32:53 2021 +0300
home: don't miss blocked clients in client search api </s> remove respData.DNS.Status = fmt.Sprintf("%v", err)
</s> add respData.DNS.Status = err.Error() </s> remove data.NotBefore == notBefore &&
data.NotAfter == notAfter &&
</s> add data.NotBefore.Equal(notBefore) &&
data.NotAfter.Equal(notAfter) && </s> remove ch, ok := clients.FindAutoClient(ip)
if !ok {
continue // a client with this IP isn't found
</s> add var found bool
cj, found = clients.findTemporary(ip)
if !found {
continue </s> remove cj := clientHostToJSON(ip, ch)
cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
el[ip] = cj
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/679bbcdc26775bc3d961cbeef553dce7aa9c091b | internal/home/controlinstall.go |
respData.DNS.Status = err.Error() | <mask> err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
<mask> }
<mask>
<mask> if err != nil {
<mask> respData.DNS.Status = fmt.Sprintf("%v", err)
<mask> } else if reqData.DNS.IP != "0.0.0.0" {
<mask> respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
<mask> }
<mask> }
<mask>
</s> Pull request: home: don't miss blocked clients in client search api
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master
Updates #2428.
Squashed commit of the following:
commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <[email protected]>
Date: Fri Jan 15 16:32:53 2021 +0300
home: don't miss blocked clients in client search api </s> remove respData.Web.Status = fmt.Sprintf("%v", err)
</s> add respData.Web.Status = err.Error() </s> remove el[ip] = cj
</s> add </s> remove cj := clientHostToJSON(ip, ch)
cj.Disallowed, cj.DisallowedRule = clients.dnsServer.IsBlockedIP(ip)
el[ip] = cj
</s> add </s> remove ch, ok := clients.FindAutoClient(ip)
if !ok {
continue // a client with this IP isn't found
</s> add var found bool
cj, found = clients.findTemporary(ip)
if !found {
continue | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/679bbcdc26775bc3d961cbeef553dce7aa9c091b | internal/home/controlinstall.go |
// Package cmd is the AdGuard Home entry point. It assembles the configuration
// file manager, sets up signal processing logic, and so on. | <mask> // Package cmd is the AdGuard Home entry point. It contains the on-disk
<mask> // configuration file utilities, signal processing logic, and so on.
<mask> //
<mask> // TODO(a.garipov): Move to the upper-level internal/.
<mask> package cmd
<mask>
<mask> import (
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove func New(fileName string, start time.Time) (m *Manager, err error) {
</s> add func New(
fileName string,
frontend fs.FS,
start time.Time,
) (m *Manager, err error) { </s> remove // Main is the entry point of application.
func Main(clientBuildFS fs.FS) {
</s> add // Main is the entry point of AdGuard Home.
func Main(frontend fs.FS) { </s> remove var clientBuildFS embed.FS
</s> add var frontend embed.FS | [
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
<mask>
<mask> import (
<mask> "context"
<mask> "io/fs"
<mask> "math/rand"
<mask> "os"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/next/configmgr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
|
// Main is the entry point of AdGuard Home.
func Main(frontend fs.FS) { | <mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // Main is the entry point of application.
<mask> func Main(clientBuildFS fs.FS) {
<mask> // Initial Configuration
<mask>
<mask> start := time.Now()
<mask> rand.Seed(start.UnixNano())
<mask>
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove rand.Seed(start.UnixNano())
</s> add </s> remove func New(fileName string, start time.Time) (m *Manager, err error) {
</s> add func New(
fileName string,
frontend fs.FS,
start time.Time,
) (m *Manager, err error) { </s> remove func (m *Manager) assemble(ctx context.Context, conf *config, start time.Time) (err error) {
</s> add func (m *Manager) assemble(
ctx context.Context,
conf *config,
frontend fs.FS,
start time.Time,
) (err error) { </s> remove // Package cmd is the AdGuard Home entry point. It contains the on-disk
// configuration file utilities, signal processing logic, and so on.
</s> add // Package cmd is the AdGuard Home entry point. It assembles the configuration
// file manager, sets up signal processing logic, and so on. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
<mask> func Main(clientBuildFS fs.FS) {
<mask> // Initial Configuration
<mask>
<mask> start := time.Now()
<mask> rand.Seed(start.UnixNano())
<mask>
<mask> // TODO(a.garipov): Set up logging.
<mask>
<mask> log.Info("starting adguard home, version %s, pid %d", version.Version(), os.Getpid())
<mask>
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove // TODO(a.garipov): Use in the Web service.
_ = clientBuildFS
</s> add </s> remove // Main is the entry point of application.
func Main(clientBuildFS fs.FS) {
</s> add // Main is the entry point of AdGuard Home.
func Main(frontend fs.FS) { </s> remove confMgr, err := configmgr.New(confFile, start)
fatalOnError(err)
</s> add confMgr, err := configmgr.New(confFile, frontend, start)
check(err) </s> remove func New(fileName string, start time.Time) (m *Manager, err error) {
</s> add func New(
fileName string,
frontend fs.FS,
start time.Time,
) (m *Manager, err error) { </s> remove func newSignalHandler(confFile string, start time.Time, svcs ...agh.Service) (h *signalHandler) {
</s> add func newSignalHandler(
confFile string,
frontend fs.FS,
start time.Time,
svcs ...agh.Service,
) (h *signalHandler) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
|
<mask> log.Info("starting adguard home, version %s, pid %d", version.Version(), os.Getpid())
<mask>
<mask> // Web Service
<mask>
<mask> // TODO(a.garipov): Use in the Web service.
<mask> _ = clientBuildFS
<mask>
<mask> // TODO(a.garipov): Set up configuration file name.
<mask> const confFile = "AdGuardHome.1.yaml"
<mask>
<mask> confMgr, err := configmgr.New(confFile, start)
<mask> fatalOnError(err)
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove rand.Seed(start.UnixNano())
</s> add </s> remove confMgr, err := configmgr.New(confFile, start)
fatalOnError(err)
</s> add confMgr, err := configmgr.New(confFile, frontend, start)
check(err) </s> remove // Package cmd is the AdGuard Home entry point. It contains the on-disk
// configuration file utilities, signal processing logic, and so on.
</s> add // Package cmd is the AdGuard Home entry point. It assembles the configuration
// file manager, sets up signal processing logic, and so on. </s> remove confMgr, err := configmgr.New(h.confFile, h.start)
fatalOnError(err)
</s> add confMgr, err := configmgr.New(h.confFile, h.frontend, h.start)
check(err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
|
confMgr, err := configmgr.New(confFile, frontend, start)
check(err) | <mask>
<mask> // TODO(a.garipov): Set up configuration file name.
<mask> const confFile = "AdGuardHome.1.yaml"
<mask>
<mask> confMgr, err := configmgr.New(confFile, start)
<mask> fatalOnError(err)
<mask>
<mask> web := confMgr.Web()
<mask> err = web.Start()
<mask> fatalOnError(err)
<mask>
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove // TODO(a.garipov): Use in the Web service.
_ = clientBuildFS
</s> add </s> remove fatalOnError(err)
</s> add check(err) </s> remove fatalOnError(err)
</s> add check(err) </s> remove confMgr, err := configmgr.New(h.confFile, h.start)
fatalOnError(err)
</s> add confMgr, err := configmgr.New(h.confFile, h.frontend, h.start)
check(err) </s> remove // Package cmd is the AdGuard Home entry point. It contains the on-disk
// configuration file utilities, signal processing logic, and so on.
</s> add // Package cmd is the AdGuard Home entry point. It assembles the configuration
// file manager, sets up signal processing logic, and so on. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
check(err) | <mask> fatalOnError(err)
<mask>
<mask> web := confMgr.Web()
<mask> err = web.Start()
<mask> fatalOnError(err)
<mask>
<mask> dns := confMgr.DNS()
<mask> err = dns.Start()
<mask> fatalOnError(err)
<mask>
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove fatalOnError(err)
</s> add check(err) </s> remove fatalOnError(err)
</s> add check(err) </s> remove fatalOnError(err)
</s> add check(err) </s> remove confMgr, err := configmgr.New(confFile, start)
fatalOnError(err)
</s> add confMgr, err := configmgr.New(confFile, frontend, start)
check(err) </s> remove confMgr, err := configmgr.New(h.confFile, h.start)
fatalOnError(err)
</s> add confMgr, err := configmgr.New(h.confFile, h.frontend, h.start)
check(err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
check(err) | <mask> fatalOnError(err)
<mask>
<mask> dns := confMgr.DNS()
<mask> err = dns.Start()
<mask> fatalOnError(err)
<mask>
<mask> sigHdlr := newSignalHandler(
<mask> confFile,
<mask> start,
<mask> web,
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove fatalOnError(err)
</s> add check(err) </s> remove fatalOnError(err)
</s> add check(err) </s> remove fatalOnError(err)
</s> add check(err) </s> remove confMgr, err := configmgr.New(confFile, start)
fatalOnError(err)
</s> add confMgr, err := configmgr.New(confFile, frontend, start)
check(err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
frontend, | <mask> sigHdlr := newSignalHandler(
<mask> confFile,
<mask> start,
<mask> web,
<mask> dns,
<mask> )
<mask>
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove fatalOnError(err)
</s> add check(err) </s> remove func newSignalHandler(confFile string, start time.Time, svcs ...agh.Service) (h *signalHandler) {
</s> add func newSignalHandler(
confFile string,
frontend fs.FS,
start time.Time,
svcs ...agh.Service,
) (h *signalHandler) { </s> remove fatalOnError(err)
</s> add check(err) </s> remove go sigHdlr.handle()
select {}
</s> add sigHdlr.handle() | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
sigHdlr.handle() | <mask> web,
<mask> dns,
<mask> )
<mask>
<mask> go sigHdlr.handle()
<mask>
<mask> select {}
<mask> }
<mask>
<mask> // defaultTimeout is the timeout used for some operations where another timeout
<mask> // hasn't been defined yet.
<mask> const defaultTimeout = 15 * time.Second
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove const defaultTimeout = 15 * time.Second
</s> add const defaultTimeout = 5 * time.Second </s> remove err = m.assemble(ctx, conf, start)
</s> add err = m.assemble(ctx, conf, frontend, start) </s> remove fatalOnError(err)
</s> add check(err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
const defaultTimeout = 5 * time.Second | <mask> }
<mask>
<mask> // defaultTimeout is the timeout used for some operations where another timeout
<mask> // hasn't been defined yet.
<mask> const defaultTimeout = 15 * time.Second
<mask>
<mask> // ctxWithDefaultTimeout is a helper function that returns a context with
<mask> // timeout set to defaultTimeout.
<mask> func ctxWithDefaultTimeout() (ctx context.Context, cancel context.CancelFunc) {
<mask> return context.WithTimeout(context.Background(), defaultTimeout)
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove go sigHdlr.handle()
select {}
</s> add sigHdlr.handle() </s> remove // fatalOnError is a helper that exits the program with an error code if err is
// not nil. It must only be used within Main.
func fatalOnError(err error) {
</s> add // check is a simple error-checking helper. It must only be used within Main.
func check(err error) { </s> remove log.Fatal(err)
</s> add panic(err) </s> remove return svc
</s> add return svc, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
// check is a simple error-checking helper. It must only be used within Main.
func check(err error) { | <mask> func ctxWithDefaultTimeout() (ctx context.Context, cancel context.CancelFunc) {
<mask> return context.WithTimeout(context.Background(), defaultTimeout)
<mask> }
<mask>
<mask> // fatalOnError is a helper that exits the program with an error code if err is
<mask> // not nil. It must only be used within Main.
<mask> func fatalOnError(err error) {
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
<mask> }
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove log.Fatal(err)
</s> add panic(err) </s> remove const defaultTimeout = 15 * time.Second
</s> add const defaultTimeout = 5 * time.Second </s> remove func New(c *Config) (svc *Service) {
</s> add //
// TODO(a.garipov): Get rid of this special handling of nil or explain it
// better.
func New(c *Config) (svc *Service, err error) { </s> remove return nil
</s> add return nil, nil
}
frontend, err := fs.Sub(c.Frontend, "build/static")
if err != nil {
return nil, fmt.Errorf("frontend fs: %w", err) </s> remove func New(fileName string, start time.Time) (m *Manager, err error) {
</s> add func New(
fileName string,
frontend fs.FS,
start time.Time,
) (m *Manager, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
panic(err) | <mask> // fatalOnError is a helper that exits the program with an error code if err is
<mask> // not nil. It must only be used within Main.
<mask> func fatalOnError(err error) {
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
<mask> }
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove // fatalOnError is a helper that exits the program with an error code if err is
// not nil. It must only be used within Main.
func fatalOnError(err error) {
</s> add // check is a simple error-checking helper. It must only be used within Main.
func check(err error) { </s> remove func New(c *Config) (svc *Service) {
</s> add //
// TODO(a.garipov): Get rid of this special handling of nil or explain it
// better.
func New(c *Config) (svc *Service, err error) { </s> remove return nil
</s> add return nil, nil
}
frontend, err := fs.Sub(c.Frontend, "build/static")
if err != nil {
return nil, fmt.Errorf("frontend fs: %w", err) </s> remove func New(fileName string, start time.Time) (m *Manager, err error) {
</s> add func New(
fileName string,
frontend fs.FS,
start time.Time,
) (m *Manager, err error) { </s> remove const defaultTimeout = 15 * time.Second
</s> add const defaultTimeout = 5 * time.Second | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/cmd.go |
"io/fs" | <mask> package cmd
<mask>
<mask> import (
<mask> "os"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/next/agh"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/next/configmgr"
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove "math/rand"
</s> add </s> remove // Package cmd is the AdGuard Home entry point. It contains the on-disk
// configuration file utilities, signal processing logic, and so on.
</s> add // Package cmd is the AdGuard Home entry point. It assembles the configuration
// file manager, sets up signal processing logic, and so on. | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/signal.go |
// frontend is the filesystem with the frontend and other statically
// compiled files.
frontend fs.FS
| <mask> // confFile is the path to the configuration file.
<mask> confFile string
<mask>
<mask> // start is the time at which AdGuard Home has been started.
<mask> start time.Time
<mask>
<mask> // services are the services that are shut down before application exiting.
<mask> services []agh.Service
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove // Package cmd is the AdGuard Home entry point. It contains the on-disk
// configuration file utilities, signal processing logic, and so on.
</s> add // Package cmd is the AdGuard Home entry point. It assembles the configuration
// file manager, sets up signal processing logic, and so on. </s> remove func New(fileName string, start time.Time) (m *Manager, err error) {
</s> add func New(
fileName string,
frontend fs.FS,
start time.Time,
) (m *Manager, err error) { </s> remove confMgr, err := configmgr.New(h.confFile, h.start)
fatalOnError(err)
</s> add confMgr, err := configmgr.New(h.confFile, h.frontend, h.start)
check(err) </s> remove // Main is the entry point of application.
func Main(clientBuildFS fs.FS) {
</s> add // Main is the entry point of AdGuard Home.
func Main(frontend fs.FS) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/signal.go |
confMgr, err := configmgr.New(h.confFile, h.frontend, h.start)
check(err) | <mask> // TODO(a.garipov): This is a very rough way to do it. Some services can be
<mask> // reconfigured without the full shutdown, and the error handling is
<mask> // currently not the best.
<mask>
<mask> confMgr, err := configmgr.New(h.confFile, h.start)
<mask> fatalOnError(err)
<mask>
<mask> web := confMgr.Web()
<mask> err = web.Start()
<mask> fatalOnError(err)
<mask>
</s> Pull request 1870: nextapi-frontend-fs
Merge in DNS/adguard-home from nextapi-frontend-fs to master
Squashed commit of the following:
commit 3ed959f21939cf5590c27426af46906cbffed502
Merge: e60bbdd04 9fda7bfd3
Author: Ainar Garipov <[email protected]>
Date: Tue Jun 13 13:37:00 2023 +0300
Merge branch 'master' into nextapi-frontend-fs
commit e60bbdd04ce841c1aaaa198cc9dc85ae14799ffa
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 9 14:53:09 2023 +0300
next: support frontend fs </s> remove confMgr, err := configmgr.New(confFile, start)
fatalOnError(err)
</s> add confMgr, err := configmgr.New(confFile, frontend, start)
check(err) </s> remove fatalOnError(err)
</s> add check(err) </s> remove fatalOnError(err)
</s> add check(err) </s> remove log.Fatal(err)
</s> add panic(err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/681c604c228942dfcb90c02f88e0fe148c7acd67 | internal/next/cmd/signal.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.