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> name: "eof",
<mask> limit: 3,
<mask> rStr: "",
<mask> want: 0,
<mask> err: io.EOF,
<mask> }, {
<mask> name: "limit_reached",
<mask> limit: 0,
<mask> rStr: "abc",
<mask> want: 0,
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove limit: 3,
</s> add </s> remove err: nil,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
|
<mask> rStr: "",
<mask> want: 0,
<mask> err: io.EOF,
<mask> }, {
<mask> name: "limit_reached",
<mask> limit: 0,
<mask> rStr: "abc",
<mask> want: 0,
<mask> err: &LimitReachedError{
<mask> Limit: 0,
<mask> },
<mask> }, {
<mask> name: "truncated",
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove err: io.EOF,
</s> add </s> remove limit: 3,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
|
name: "limit_reached",
rStr: "abc",
limit: 0,
want: 0, | <mask> err: &LimitReachedError{
<mask> Limit: 0,
<mask> },
<mask> }, {
<mask> err: nil,
<mask> name: "truncated",
<mask> rStr: "abc",
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove name: "limit_reached",
limit: 0,
rStr: "abc",
want: 0,
</s> add </s> remove limit: 2,
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
err: nil, | <mask> limit: 0,
<mask> want: 0,
<mask> }, {
<mask> name: "truncated",
<mask> rStr: "abc",
<mask> limit: 2,
<mask> want: 2,
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove limit: 2,
</s> add </s> remove err: nil,
</s> add </s> remove name: "limit_reached",
limit: 0,
rStr: "abc",
want: 0,
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
<mask> Limit: 0,
<mask> },
<mask> }, {
<mask> name: "truncated",
<mask> limit: 2,
<mask> rStr: "abc",
<mask> want: 2,
<mask> err: nil,
<mask> }}
<mask>
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove err: nil,
</s> add </s> remove name: "limit_reached",
limit: 0,
rStr: "abc",
want: 0,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
|
limit: 2, | <mask> err: nil,
<mask> name: "truncated",
<mask> rStr: "abc",
<mask> want: 2,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove err: nil,
</s> add </s> remove limit: 2,
</s> add </s> remove want: fmt.Errorf("aghio: invalid n in LimitReadCloser: -1"),
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
<mask> name: "truncated",
<mask> limit: 2,
<mask> rStr: "abc",
<mask> want: 2,
<mask> err: nil,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> readCloser := ioutil.NopCloser(strings.NewReader(tc.rStr))
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove limit: 2,
</s> add </s> remove want: fmt.Errorf("aghio: invalid n in LimitReadCloser: -1"),
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
|
require.NoError(t, err) | <mask> readCloser := ioutil.NopCloser(strings.NewReader(tc.rStr))
<mask> buf := make([]byte, tc.limit+1)
<mask>
<mask> lreader, err := LimitReadCloser(readCloser, tc.limit)
<mask> require.Nil(t, err)
<mask>
<mask> n, err := lreader.Read(buf)
<mask> require.Equal(t, tc.err, err)
<mask> assert.Equal(t, tc.want, n)
<mask> })
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
err error | <mask>
<mask> func TestLimitedReadCloser_LimitReachedError(t *testing.T) {
<mask> testCases := []struct {
<mask> name string
<mask> want string
<mask> }{{
<mask> err: &LimitReachedError{
<mask> Limit: 0,
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove err error
</s> add </s> remove limit int64
</s> add </s> remove want error
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
<mask> func TestLimitedReadCloser_LimitReachedError(t *testing.T) {
<mask> testCases := []struct {
<mask> name string
<mask> want string
<mask> err error
<mask> }{{
<mask> name: "simplest",
<mask> want: "attempted to read more than 0 bytes",
<mask> err: &LimitReachedError{
<mask> Limit: 0,
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove name: "simplest",
want: "attempted to read more than 0 bytes",
</s> add </s> remove limit int64
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
|
<mask> name string
<mask> want string
<mask> err error
<mask> }{{
<mask> name: "simplest",
<mask> want: "attempted to read more than 0 bytes",
<mask> err: &LimitReachedError{
<mask> Limit: 0,
<mask> },
<mask> }}
<mask>
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove err error
</s> add </s> remove err error
</s> add </s> remove limit int64
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
|
name: "simplest",
want: "attempted to read more than 0 bytes", | <mask> }{{
<mask> err: &LimitReachedError{
<mask> Limit: 0,
<mask> },
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove err: nil,
</s> add </s> remove want: fmt.Errorf("aghio: invalid n in LimitReadCloser: -1"),
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghio/limitedreadcloser_test.go |
require.NoError(t, err) | <mask> var ipd *IPDetector
<mask> var err error
<mask>
<mask> ipd, err = NewIPDetector()
<mask> require.Nil(t, err)
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> ip net.IP
<mask> want bool
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove limit int64
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghnet/ipdetector_test.go |
require.NoError(t, err)
| <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> r := bytes.NewReader(tc.data)
<mask> has, err := dhcpcdStaticConfig(r, "wlan0")
<mask> require.Nil(t, err)
<mask> assert.Equal(t, tc.want, has)
<mask> })
<mask> }
<mask> }
<mask>
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove err: nil,
</s> add </s> remove want: fmt.Errorf("aghio: invalid n in LimitReadCloser: -1"),
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghnet/net_linux_test.go |
require.NoError(t, err)
| <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> r := bytes.NewReader(tc.data)
<mask> has, err := ifacesStaticConfig(r, "enp0s3")
<mask> require.Nil(t, err)
<mask> assert.Equal(t, tc.want, has)
<mask> })
<mask> }
<mask> }
<mask>
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove err: nil,
</s> add </s> remove want: fmt.Errorf("aghio: invalid n in LimitReadCloser: -1"),
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghnet/net_linux_test.go |
require.NoErrorf(t, err, "cannot get net interfaces: %s", err)
require.NotEmpty(t, ifaces, "no net interfaces found") | <mask> )
<mask>
<mask> func TestGetValidNetInterfacesForWeb(t *testing.T) {
<mask> ifaces, err := GetValidNetInterfacesForWeb()
<mask> require.Nilf(t, err, "Cannot get net interfaces: %s", err)
<mask> require.NotEmpty(t, ifaces, "No net interfaces found")
<mask> for _, iface := range ifaces {
<mask> require.NotEmptyf(t, iface.Addresses, "No addresses found for %s", iface.Name)
<mask> }
<mask> }
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove require.NotEmptyf(t, iface.Addresses, "No addresses found for %s", iface.Name)
</s> add require.NotEmptyf(t, iface.Addresses, "no addresses found for %s", iface.Name) </s> remove assert.Nil(t, err, "after %s", time.Since(start))
</s> add assert.NoError(t, err, "after %s", time.Since(start)) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghnet/net_test.go |
require.NotEmptyf(t, iface.Addresses, "no addresses found for %s", iface.Name) | <mask> ifaces, err := GetValidNetInterfacesForWeb()
<mask> require.Nilf(t, err, "Cannot get net interfaces: %s", err)
<mask> require.NotEmpty(t, ifaces, "No net interfaces found")
<mask> for _, iface := range ifaces {
<mask> require.NotEmptyf(t, iface.Addresses, "No addresses found for %s", iface.Name)
<mask> }
<mask> }
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove require.Nilf(t, err, "Cannot get net interfaces: %s", err)
require.NotEmpty(t, ifaces, "No net interfaces found")
</s> add require.NoErrorf(t, err, "cannot get net interfaces: %s", err)
require.NotEmpty(t, ifaces, "no net interfaces found") </s> remove assert.Nil(t, err, "after %s", time.Since(start))
</s> add assert.NoError(t, err, "after %s", time.Since(start)) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghnet/net_test.go |
require.NoError(t, err) | <mask>
<mask> t.Helper()
<mask>
<mask> wd, err := os.Getwd()
<mask> require.Nil(t, err)
<mask>
<mask> dir, err = ioutil.TempDir(wd, "agh-test")
<mask> require.Nil(t, err)
<mask> require.NotEmpty(t, dir)
<mask>
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghtest/os_windows.go |
require.NoError(t, err) | <mask> wd, err := os.Getwd()
<mask> require.Nil(t, err)
<mask>
<mask> dir, err = ioutil.TempDir(wd, "agh-test")
<mask> require.Nil(t, err)
<mask> require.NotEmpty(t, dir)
<mask>
<mask> t.Cleanup(func() {
<mask> start := time.Now()
<mask> for {
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghtest/os_windows.go |
assert.NoError(t, err, "after %s", time.Since(start)) | <mask>
<mask> time.Sleep(retryDur)
<mask> }
<mask>
<mask> assert.Nil(t, err, "after %s", time.Since(start))
<mask> })
<mask>
<mask> return dir
<mask> }
</s> Pull request: all: imp some tests
Merge in DNS/adguard-home from imp-tests to master
Squashed commit of the following:
commit 6171420068d66808f069f280a81e0c60e61e5ce3
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:43:36 2021 +0300
aghnet: imp test msgs
commit ed2880ff03ab0e41a77f07aad2caf13bf5f4bd9f
Author: Ainar Garipov <[email protected]>
Date: Thu Mar 25 17:39:44 2021 +0300
all: imp some tests </s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove require.Nilf(t, err, "Cannot get net interfaces: %s", err)
require.NotEmpty(t, ifaces, "No net interfaces found")
</s> add require.NoErrorf(t, err, "cannot get net interfaces: %s", err)
require.NotEmpty(t, ifaces, "no net interfaces found") </s> remove require.NotEmptyf(t, iface.Addresses, "No addresses found for %s", iface.Name)
</s> add require.NotEmptyf(t, iface.Addresses, "no addresses found for %s", iface.Name) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f4f0527331ad5fa85bcec843cd13cc97c696a8 | internal/aghtest/os_windows.go |
/querylog_info:
get:
tags:
- log
operationId: queryLogInfo
summary: 'Get query log parameters'
responses:
200:
description: OK
schema:
$ref: "#/definitions/QueryLogConfig"
/querylog_config: | <mask> 200:
<mask> description: OK
<mask> schema:
<mask> $ref: '#/definitions/QueryLog'
<mask> /querylog_enable:
<mask> post:
<mask> tags:
<mask> - log
<mask> operationId: querylogEnable
<mask> summary: 'Enable querylog'
</s> + openapi: /querylog_info, /querylog_config, /querylog_clear </s> remove operationId: querylogEnable
summary: 'Enable querylog'
</s> add operationId: queryLogConfig
summary: "Set query log parameters"
consumes:
- application/json
parameters:
- in: "body"
name: "body"
schema:
$ref: "#/definitions/QueryLogConfig" </s> remove /querylog_disable:
</s> add /querylog_clear: </s> remove operationId: querylogDisable
summary: 'Disable filtering'
</s> add operationId: querylogClear
summary: 'Clear query log' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f895cf46278eb8b60432ac3b5e44ca73efe1f2 | openapi/openapi.yaml |
operationId: queryLogConfig
summary: "Set query log parameters"
consumes:
- application/json
parameters:
- in: "body"
name: "body"
schema:
$ref: "#/definitions/QueryLogConfig" | <mask> /querylog_enable:
<mask> post:
<mask> tags:
<mask> - log
<mask> operationId: querylogEnable
<mask> summary: 'Enable querylog'
<mask> responses:
<mask> 200:
<mask> description: OK
<mask> /querylog_disable:
<mask> post:
</s> + openapi: /querylog_info, /querylog_config, /querylog_clear </s> remove /querylog_enable:
</s> add /querylog_info:
get:
tags:
- log
operationId: queryLogInfo
summary: 'Get query log parameters'
responses:
200:
description: OK
schema:
$ref: "#/definitions/QueryLogConfig"
/querylog_config: </s> remove /querylog_disable:
</s> add /querylog_clear: </s> remove operationId: querylogDisable
summary: 'Disable filtering'
</s> add operationId: querylogClear
summary: 'Clear query log' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f895cf46278eb8b60432ac3b5e44ca73efe1f2 | openapi/openapi.yaml |
/querylog_clear: | <mask> summary: 'Enable querylog'
<mask> responses:
<mask> 200:
<mask> description: OK
<mask> /querylog_disable:
<mask> post:
<mask> tags:
<mask> - log
<mask> operationId: querylogDisable
<mask> summary: 'Disable filtering'
</s> + openapi: /querylog_info, /querylog_config, /querylog_clear </s> remove operationId: querylogDisable
summary: 'Disable filtering'
</s> add operationId: querylogClear
summary: 'Clear query log' </s> remove /querylog_enable:
</s> add /querylog_info:
get:
tags:
- log
operationId: queryLogInfo
summary: 'Get query log parameters'
responses:
200:
description: OK
schema:
$ref: "#/definitions/QueryLogConfig"
/querylog_config: </s> remove operationId: querylogEnable
summary: 'Enable querylog'
</s> add operationId: queryLogConfig
summary: "Set query log parameters"
consumes:
- application/json
parameters:
- in: "body"
name: "body"
schema:
$ref: "#/definitions/QueryLogConfig" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f895cf46278eb8b60432ac3b5e44ca73efe1f2 | openapi/openapi.yaml |
operationId: querylogClear
summary: 'Clear query log' | <mask> /querylog_disable:
<mask> post:
<mask> tags:
<mask> - log
<mask> operationId: querylogDisable
<mask> summary: 'Disable filtering'
<mask> responses:
<mask> 200:
<mask> description: OK
<mask>
<mask> # --------------------------------------------------
</s> + openapi: /querylog_info, /querylog_config, /querylog_clear </s> remove /querylog_disable:
</s> add /querylog_clear: </s> remove /querylog_enable:
</s> add /querylog_info:
get:
tags:
- log
operationId: queryLogInfo
summary: 'Get query log parameters'
responses:
200:
description: OK
schema:
$ref: "#/definitions/QueryLogConfig"
/querylog_config: </s> remove operationId: querylogEnable
summary: 'Enable querylog'
</s> add operationId: queryLogConfig
summary: "Set query log parameters"
consumes:
- application/json
parameters:
- in: "body"
name: "body"
schema:
$ref: "#/definitions/QueryLogConfig" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f895cf46278eb8b60432ac3b5e44ca73efe1f2 | openapi/openapi.yaml |
description: OK | <mask> summary: 'Get statistics parameters'
<mask> responses:
<mask> 200:
<mask> schema:
<mask> $ref: "#/definitions/StatsConfig"
<mask> description: OK
<mask>
</s> + openapi: /querylog_info, /querylog_config, /querylog_clear </s> remove /querylog_enable:
</s> add /querylog_info:
get:
tags:
- log
operationId: queryLogInfo
summary: 'Get query log parameters'
responses:
200:
description: OK
schema:
$ref: "#/definitions/QueryLogConfig"
/querylog_config: </s> remove /querylog_disable:
</s> add /querylog_clear: </s> remove operationId: querylogDisable
summary: 'Disable filtering'
</s> add operationId: querylogClear
summary: 'Clear query log' </s> remove operationId: querylogEnable
summary: 'Enable querylog'
</s> add operationId: queryLogConfig
summary: "Set query log parameters"
consumes:
- application/json
parameters:
- in: "body"
name: "body"
schema:
$ref: "#/definitions/QueryLogConfig" | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f895cf46278eb8b60432ac3b5e44ca73efe1f2 | openapi/openapi.yaml |
QueryLogConfig:
type: "object"
description: "Query log configuration"
properties:
enabled:
type: "boolean"
description: "Is query log enabled"
interval:
type: "integer"
description: "Time period to keep data (1 | 7 | 30 | 90)"
| <mask> items:
<mask> $ref: "#/definitions/QueryLogItem"
<mask> TlsConfig:
<mask> type: "object"
<mask> description: "TLS configuration settings and status"
<mask> properties:
<mask> # TLS configuration
</s> + openapi: /querylog_info, /querylog_config, /querylog_clear </s> remove operationId: querylogDisable
summary: 'Disable filtering'
</s> add operationId: querylogClear
summary: 'Clear query log' </s> remove /querylog_enable:
</s> add /querylog_info:
get:
tags:
- log
operationId: queryLogInfo
summary: 'Get query log parameters'
responses:
200:
description: OK
schema:
$ref: "#/definitions/QueryLogConfig"
/querylog_config: </s> remove operationId: querylogEnable
summary: 'Enable querylog'
</s> add operationId: queryLogConfig
summary: "Set query log parameters"
consumes:
- application/json
parameters:
- in: "body"
name: "body"
schema:
$ref: "#/definitions/QueryLogConfig" </s> remove /querylog_disable:
</s> add /querylog_clear: | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/27f895cf46278eb8b60432ac3b5e44ca73efe1f2 | openapi/openapi.yaml |
<mask> checksum := uint32(0)
<mask>
<mask> for {
<mask> line, err := r.ReadString('\n')
<mask> if err != nil {
<mask> break
<mask> }
<mask>
<mask> checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
<mask>
<mask> line = strings.TrimSpace(line)
<mask> if len(line) == 0 {
<mask> continue
</s> - filter: fix rules count when data doesn't end with a newline </s> remove continue
}
</s> add // </s> remove if line[0] == '!' {
</s> add } else if line[0] == '!' { </s> remove continue
</s> add //
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/286eb43c5622b2f35d7fe2b5f445da2ed2663658 | home/filter.go |
|
// | <mask> checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
<mask>
<mask> line = strings.TrimSpace(line)
<mask> if len(line) == 0 {
<mask> continue
<mask> }
<mask>
<mask> if line[0] == '!' {
<mask> m := f.filterTitleRegexp.FindAllStringSubmatch(line, -1)
<mask> if len(m) > 0 && len(m[0]) >= 2 && !seenTitle {
<mask> name = m[0][1]
</s> - filter: fix rules count when data doesn't end with a newline </s> remove if line[0] == '!' {
</s> add } else if line[0] == '!' { </s> remove if err != nil {
break
}
</s> add </s> remove continue
</s> add //
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/286eb43c5622b2f35d7fe2b5f445da2ed2663658 | home/filter.go |
} else if line[0] == '!' { | <mask> if len(line) == 0 {
<mask> continue
<mask> }
<mask>
<mask> if line[0] == '!' {
<mask> m := f.filterTitleRegexp.FindAllStringSubmatch(line, -1)
<mask> if len(m) > 0 && len(m[0]) >= 2 && !seenTitle {
<mask> name = m[0][1]
<mask> seenTitle = true
<mask> }
</s> - filter: fix rules count when data doesn't end with a newline </s> remove continue
}
</s> add // </s> remove continue
</s> add //
</s> remove if err != nil {
break
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/286eb43c5622b2f35d7fe2b5f445da2ed2663658 | home/filter.go |
//
| <mask> name = m[0][1]
<mask> seenTitle = true
<mask> }
<mask> } else if line[0] == '#' {
<mask> continue
<mask> } else {
<mask> rulesCount++
<mask> }
<mask> }
<mask>
</s> - filter: fix rules count when data doesn't end with a newline </s> remove if line[0] == '!' {
</s> add } else if line[0] == '!' { </s> remove continue
}
</s> add // </s> remove if err != nil {
break
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/286eb43c5622b2f35d7fe2b5f445da2ed2663658 | home/filter.go |
if err != nil {
break
} | <mask> rulesCount++
<mask> }
<mask> }
<mask>
<mask> return rulesCount, checksum, name
<mask> }
</s> - filter: fix rules count when data doesn't end with a newline </s> remove continue
</s> add //
</s> remove if line[0] == '!' {
</s> add } else if line[0] == '!' { </s> remove continue
}
</s> add // </s> remove if err != nil {
break
}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/286eb43c5622b2f35d7fe2b5f445da2ed2663658 | home/filter.go |
getStats = (ids, stats) => { | <mask> use_global_blocked_services: true,
<mask> };
<mask> };
<mask>
<mask> getStats = (ip, stats) => {
<mask> if (stats) {
<mask> const statsForCurrentIP = stats.find(item => item.name === ip);
<mask> return statsForCurrentIP && statsForCurrentIP.count;
<mask> }
<mask>
</s> - client: fix request count in clients table </s> remove const clientIP = row.original.ip;
const clientStats = clientIP && this.getStats(clientIP, this.props.topClients);
</s> add const { ids } = row.original;
const clientStats = this.getStats(ids, this.props.topClients); </s> remove const statsForCurrentIP = stats.find(item => item.name === ip);
return statsForCurrentIP && statsForCurrentIP.count;
</s> add const currentStats = stats.find(item => ids.includes(item.name));
return currentStats && currentStats.count; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/289c6f8c731f616c73eac2739b572c13eb245680 | client/src/components/Settings/Clients/ClientsTable.js |
const currentStats = stats.find(item => ids.includes(item.name));
return currentStats && currentStats.count; | <mask> };
<mask>
<mask> getStats = (ip, stats) => {
<mask> if (stats) {
<mask> const statsForCurrentIP = stats.find(item => item.name === ip);
<mask> return statsForCurrentIP && statsForCurrentIP.count;
<mask> }
<mask>
<mask> return '';
<mask> };
<mask>
</s> - client: fix request count in clients table </s> remove const clientIP = row.original.ip;
const clientStats = clientIP && this.getStats(clientIP, this.props.topClients);
</s> add const { ids } = row.original;
const clientStats = this.getStats(ids, this.props.topClients); </s> remove getStats = (ip, stats) => {
</s> add getStats = (ids, stats) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/289c6f8c731f616c73eac2739b572c13eb245680 | client/src/components/Settings/Clients/ClientsTable.js |
const { ids } = row.original;
const clientStats = this.getStats(ids, this.props.topClients); | <mask> Header: this.props.t('requests_count'),
<mask> accessor: 'statistics',
<mask> minWidth: 120,
<mask> Cell: (row) => {
<mask> const clientIP = row.original.ip;
<mask> const clientStats = clientIP && this.getStats(clientIP, this.props.topClients);
<mask>
<mask> if (clientStats) {
<mask> return (
<mask> <div className="logs__row">
<mask> <div className="logs__text" title={clientStats}>
</s> - client: fix request count in clients table </s> remove getStats = (ip, stats) => {
</s> add getStats = (ids, stats) => { </s> remove const statsForCurrentIP = stats.find(item => item.name === ip);
return statsForCurrentIP && statsForCurrentIP.count;
</s> add const currentStats = stats.find(item => ids.includes(item.name));
return currentStats && currentStats.count; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/289c6f8c731f616c73eac2739b572c13eb245680 | client/src/components/Settings/Clients/ClientsTable.js |
type tlsConfigSettings struct { | <mask> }
<mask>
<mask> var defaultDNS = []string{"tls://1.1.1.1", "tls://1.0.0.1"}
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type tlsConfig struct {
<mask> ServerName string `yaml:"server_name" json:"server_name,omitempty"`
<mask> ForceHTTPS bool `yaml:"force_https" json:"force_https,omitempty"`
<mask> PortHTTPS int `yaml:"port_https" json:"port_https,omitempty"`
<mask> PortDNSOverTLS int `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"`
<mask>
</s> /tls/configure -- restart HTTPS server if settings changed
Fixes not using new HTTPS certificate after submitting it. </s> remove httpsServer.cond.Broadcast()
</s> add </s> remove PortHTTPS: 443,
PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
</s> add tlsConfigSettings: tlsConfigSettings{
PortHTTPS: 443,
PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/28df187012ccd456524614a6ee96ce65d396a97f | config.go |
}
// field ordering is important -- yaml fields will mirror ordering from here
type tlsConfig struct {
tlsConfigSettings `yaml:",inline" json:",inline"` | <mask> PortDNSOverTLS int `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"`
<mask>
<mask> dnsforward.TLSConfig `yaml:",inline" json:",inline"`
<mask>
<mask> // only for API, no need to be stored in config
<mask> StatusCertificate string `yaml:"status_cert" json:"status_cert,omitempty"`
<mask> StatusKey string `yaml:"status_key" json:"status_key,omitempty"`
<mask> Warning string `yaml:"warning" json:"warning,omitempty"`
</s> /tls/configure -- restart HTTPS server if settings changed
Fixes not using new HTTPS certificate after submitting it. </s> remove // field ordering is important -- yaml fields will mirror ordering from here
type tlsConfig struct {
</s> add type tlsConfigSettings struct { </s> remove PortHTTPS: 443,
PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
</s> add tlsConfigSettings: tlsConfigSettings{
PortHTTPS: 443,
PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
}, </s> remove httpsServer.cond.Broadcast()
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/28df187012ccd456524614a6ee96ce65d396a97f | config.go |
tlsConfigSettings: tlsConfigSettings{
PortHTTPS: 443,
PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
}, | <mask> },
<mask> UpstreamDNS: defaultDNS,
<mask> },
<mask> TLS: tlsConfig{
<mask> PortHTTPS: 443,
<mask> PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
<mask> },
<mask> Filters: []filter{
<mask> {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
<mask> {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
<mask> {Filter: dnsfilter.Filter{ID: 3}, Enabled: false, URL: "https://hosts-file.net/ad_servers.txt", Name: "hpHosts - Ad and Tracking servers only"},
</s> /tls/configure -- restart HTTPS server if settings changed
Fixes not using new HTTPS certificate after submitting it. </s> remove // field ordering is important -- yaml fields will mirror ordering from here
type tlsConfig struct {
</s> add type tlsConfigSettings struct { </s> remove httpsServer.cond.Broadcast()
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/28df187012ccd456524614a6ee96ce65d396a97f | config.go |
"reflect" | <mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "sort"
<mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
</s> /tls/configure -- restart HTTPS server if settings changed
Fixes not using new HTTPS certificate after submitting it. </s> remove httpsServer.cond.Broadcast()
</s> add </s> remove PortHTTPS: 443,
PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
</s> add tlsConfigSettings: tlsConfigSettings{
PortHTTPS: 443,
PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
}, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/28df187012ccd456524614a6ee96ce65d396a97f | control.go |
restartHTTPS := false
if !reflect.DeepEqual(config.TLS.tlsConfigSettings, data.tlsConfigSettings) {
log.Printf("tls config settings have changed, will restart HTTPS server")
restartHTTPS = true
} | <mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
<mask> return
<mask> }
<mask> config.TLS = data
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
<mask> // until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
</s> /tls/configure -- restart HTTPS server if settings changed
Fixes not using new HTTPS certificate after submitting it. </s> remove httpsServer.cond.Broadcast()
</s> add </s> remove // field ordering is important -- yaml fields will mirror ordering from here
type tlsConfig struct {
</s> add type tlsConfigSettings struct { </s> remove PortHTTPS: 443,
PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
</s> add tlsConfigSettings: tlsConfigSettings{
PortHTTPS: 443,
PortDNSOverTLS: 853, // needs to be passed through to dnsproxy
}, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/28df187012ccd456524614a6ee96ce65d396a97f | control.go |
<mask> httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
<mask> return
<mask> }
<mask> config.TLS = data
<mask> httpsServer.cond.Broadcast()
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func validateCertificates(data tlsConfig) (tlsConfig, error) {
<mask> var err error
</s> /tls/configure -- restart HTTPS server if settings changed
Fixes not using new HTTPS certificate after submitting it. </s> remove // field ordering is important -- yaml fields will mirror ordering from here
type tlsConfig struct {
</s> add type tlsConfigSettings struct { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/28df187012ccd456524614a6ee96ce65d396a97f | control.go |
|
// this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
if restartHTTPS {
go func() {
httpsServer.cond.Broadcast()
httpsServer.server.Shutdown(context.TODO())
}()
} | <mask> }
<mask> config.TLS = data
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func validateCertificates(data tlsConfig) (tlsConfig, error) {
<mask> var err error
<mask>
<mask> if data.CertificateChain != "" {
</s> /tls/configure -- restart HTTPS server if settings changed
Fixes not using new HTTPS certificate after submitting it. </s> remove httpsServer.cond.Broadcast()
</s> add </s> remove // field ordering is important -- yaml fields will mirror ordering from here
type tlsConfig struct {
</s> add type tlsConfigSettings struct { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/28df187012ccd456524614a6ee96ce65d396a97f | control.go |
'GO_VERSION': '1.17' | <mask> 'name': 'build'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.16'
<mask> 'NODE_VERSION': '14'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'branches':
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove 'GO_VERSION': '1.16'
</s> add 'GO_VERSION': '1.17' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf h1:InctQoB89TIkmgIFQeIL4KXNvWc1iebQXdZggqPSwL8=
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
</s> add github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b h1:MHcTarUMC4sFA7eiyR8IEJ6j2PgmgXR+B9X2IIMjh7A=
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod h1:GAFlyu4/XV68LkQKYzKhIo/WW7j3Zi0YRAz/BOoanUc=
github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g=
github.com/mdlayher/socket v0.1.0/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs=
github.com/mdlayher/socket v0.1.1 h1:q3uOGirUPfAV2MUoaC7BavjQ154J7+JOkTWyiV+intI=
github.com/mdlayher/socket v0.1.1/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs= | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | .github/workflows/build.yml |
'GO_VERSION': '1.17' | <mask> 'name': 'lint'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.16'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'tags':
<mask> - 'v*'
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove 'GO_VERSION': '1.16'
</s> add 'GO_VERSION': '1.17' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY=
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | .github/workflows/lint.yml |
'dockerGo': 'adguard/golang-ubuntu:4.0' | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.8'
<mask>
<mask> 'stages':
<mask> - 'Make release':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove 'GO_VERSION': '1.16'
</s> add 'GO_VERSION': '1.17' </s> remove // Set default values for host configuration parameters listed
// in Appendix A of RFC-2131. Those parameters, if requested by
// client, should be returned with values defined by Host
// Requirements Document.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#appendix-A.
//
// See also https://datatracker.ietf.org/doc/html/rfc1122,
// https://datatracker.ietf.org/doc/html/rfc1123, and
// https://datatracker.ietf.org/doc/html/rfc2132.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:4.0' | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.8'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Build final releases on release branches manually.
<mask> 'triggers': []
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove // Set default values for host configuration parameters listed
// in Appendix A of RFC-2131. Those parameters, if requested by
// client, should be returned with values defined by Host
// Requirements Document.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#appendix-A.
//
// See also https://datatracker.ietf.org/doc/html/rfc1122,
// https://datatracker.ietf.org/doc/html/rfc1123, and
// https://datatracker.ietf.org/doc/html/rfc2132.
</s> add </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:4.0' | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove // Set default values for host configuration parameters listed
// in Appendix A of RFC-2131. Those parameters, if requested by
// client, should be returned with values defined by Host
// Requirements Document.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#appendix-A.
//
// See also https://datatracker.ietf.org/doc/html/rfc1122,
// https://datatracker.ietf.org/doc/html/rfc1123, and
// https://datatracker.ietf.org/doc/html/rfc2132.
</s> add </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:4.0' | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.8'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove 'GO_VERSION': '1.16'
</s> add 'GO_VERSION': '1.17' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.8'
</s> add 'dockerGo': 'adguard/golang-ubuntu:4.0' </s> remove 'GO_VERSION': '1.16'
</s> add 'GO_VERSION': '1.17' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | bamboo-specs/test.yaml |
go 1.17 | <mask> module github.com/AdguardTeam/AdGuardHome
<mask>
<mask> go 1.16
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.39.13
<mask> github.com/AdguardTeam/golibs v0.10.3
<mask> github.com/AdguardTeam/urlfilter v0.15.1
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.3 </s> remove go 1.16
</s> add go 1.17 </s> remove github.com/fzipp/gocyclo v0.3.1
</s> add github.com/fzipp/gocyclo v0.4.0 </s> remove github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf h1:gc042VRSIRSUzZ+Px6xQCRWNJZTaPkomisDfUZmoFNk=
github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
</s> add </s> remove github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
</s> add | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.mod |
github.com/ameshkov/dnscrypt/v2 v2.2.3 | <mask> github.com/AdguardTeam/dnsproxy v0.39.13
<mask> github.com/AdguardTeam/golibs v0.10.3
<mask> github.com/AdguardTeam/urlfilter v0.15.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.2
<mask> github.com/digineo/go-ipset/v2 v2.2.1
<mask> github.com/fsnotify/fsnotify v1.4.9
<mask> github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
<mask> github.com/google/go-cmp v0.5.5
<mask> github.com/google/gopacket v1.1.19
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 </s> remove go 1.16
</s> add go 1.17 </s> remove github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
</s> add github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 </s> remove github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
</s> add </s> remove github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.mod |
github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 | <mask> github.com/AdguardTeam/urlfilter v0.15.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.2
<mask> github.com/digineo/go-ipset/v2 v2.2.1
<mask> github.com/fsnotify/fsnotify v1.4.9
<mask> github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
<mask> github.com/google/go-cmp v0.5.5
<mask> github.com/google/gopacket v1.1.19
<mask> github.com/google/renameio v1.0.1
<mask> github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
<mask> github.com/kardianos/service v1.2.0
<mask> github.com/lucas-clemente/quic-go v0.21.1
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.3 </s> remove github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
</s> add github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 </s> remove github.com/lucas-clemente/quic-go v0.21.1
</s> add github.com/lucas-clemente/quic-go v0.24.0 </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.mod |
github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 | <mask> github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
<mask> github.com/google/go-cmp v0.5.5
<mask> github.com/google/gopacket v1.1.19
<mask> github.com/google/renameio v1.0.1
<mask> github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
<mask> github.com/kardianos/service v1.2.0
<mask> github.com/lucas-clemente/quic-go v0.21.1
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
<mask> github.com/mdlayher/netlink v1.4.0
<mask> github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/lucas-clemente/quic-go v0.21.1
</s> add github.com/lucas-clemente/quic-go v0.24.0 </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.3 </s> remove github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.mod |
github.com/lucas-clemente/quic-go v0.24.0 | <mask> github.com/google/gopacket v1.1.19
<mask> github.com/google/renameio v1.0.1
<mask> github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
<mask> github.com/kardianos/service v1.2.0
<mask> github.com/lucas-clemente/quic-go v0.21.1
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
<mask> github.com/mdlayher/netlink v1.4.0
<mask> github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
<mask> github.com/miekg/dns v1.1.43
<mask> github.com/satori/go.uuid v1.2.0
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
</s> add github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 </s> remove github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0=
</s> add </s> remove github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf h1:InctQoB89TIkmgIFQeIL4KXNvWc1iebQXdZggqPSwL8=
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
</s> add github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b h1:MHcTarUMC4sFA7eiyR8IEJ6j2PgmgXR+B9X2IIMjh7A=
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod h1:GAFlyu4/XV68LkQKYzKhIo/WW7j3Zi0YRAz/BOoanUc=
github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g=
github.com/mdlayher/socket v0.1.0/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs=
github.com/mdlayher/socket v0.1.1 h1:q3uOGirUPfAV2MUoaC7BavjQ154J7+JOkTWyiV+intI=
github.com/mdlayher/socket v0.1.1/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.mod |
github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b | <mask> github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
<mask> github.com/kardianos/service v1.2.0
<mask> github.com/lucas-clemente/quic-go v0.21.1
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
<mask> github.com/mdlayher/netlink v1.4.0
<mask> github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
<mask> github.com/miekg/dns v1.1.43
<mask> github.com/satori/go.uuid v1.2.0
<mask> github.com/stretchr/testify v1.7.0
<mask> github.com/ti-mo/netfilter v0.4.0
<mask> go.etcd.io/bbolt v1.3.6
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/lucas-clemente/quic-go v0.21.1
</s> add github.com/lucas-clemente/quic-go v0.24.0 </s> remove github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
</s> add github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6
golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3
</s> add golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 </s> remove github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.mod |
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e | <mask> github.com/satori/go.uuid v1.2.0
<mask> github.com/stretchr/testify v1.7.0
<mask> github.com/ti-mo/netfilter v0.4.0
<mask> go.etcd.io/bbolt v1.3.6
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
<mask> golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6
<mask> golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v2 v2.4.0
<mask> howett.net/plist v0.0.0-20201203080718-1454fab16a06
<mask> )
<mask>
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove howett.net/plist v0.0.0-20201203080718-1454fab16a06
</s> add howett.net/plist v1.0.0 </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> add golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.mod |
howett.net/plist v1.0.0 | <mask> golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6
<mask> golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v2 v2.4.0
<mask> howett.net/plist v0.0.0-20201203080718-1454fab16a06
<mask> )
<mask>
<mask> require github.com/stretchr/objx v0.1.1 // indirect
<mask>
<mask> // TODO(e.burkov): Get rid of the fork in v0.108.0.
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove require github.com/stretchr/objx v0.1.1 // indirect
// TODO(e.burkov): Get rid of the fork in v0.108.0.
replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf
</s> add require (
github.com/BurntSushi/toml v0.4.1 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
github.com/ameshkov/dnsstamps v1.0.3 // indirect
github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/joomcode/errorx v1.0.3 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.8 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
honnef.co/go/tools v0.2.2 // indirect
) </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6
golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3
</s> add golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e </s> remove golang.org/x/sys v0.0.0-20210514084401-e8d321eab015 // indirect
golang.org/x/tools v0.1.1
honnef.co/go/tools v0.1.4
mvdan.cc/gofumpt v0.1.1
mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7
</s> add golang.org/x/tools v0.1.8
honnef.co/go/tools v0.2.2
mvdan.cc/gofumpt v0.2.1
mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5
)
require (
github.com/BurntSushi/toml v0.4.1 // indirect
github.com/client9/misspell v0.3.4 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gookit/color v1.5.0 // indirect
github.com/kyoh86/nolint v0.0.1 // indirect
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect </s> remove github.com/kyoh86/nolint v0.0.1 // indirect
github.com/securego/gosec/v2 v2.7.0
</s> add github.com/securego/gosec/v2 v2.9.5 </s> remove // Set default values for host configuration parameters listed
// in Appendix A of RFC-2131. Those parameters, if requested by
// client, should be returned with values defined by Host
// Requirements Document.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#appendix-A.
//
// See also https://datatracker.ietf.org/doc/html/rfc1122,
// https://datatracker.ietf.org/doc/html/rfc1123, and
// https://datatracker.ietf.org/doc/html/rfc2132.
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.mod |
require (
github.com/BurntSushi/toml v0.4.1 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
github.com/ameshkov/dnsstamps v1.0.3 // indirect
github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/joomcode/errorx v1.0.3 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.8 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
honnef.co/go/tools v0.2.2 // indirect
) | <mask> gopkg.in/yaml.v2 v2.4.0
<mask> howett.net/plist v0.0.0-20201203080718-1454fab16a06
<mask> )
<mask>
<mask> require github.com/stretchr/objx v0.1.1 // indirect
<mask>
<mask> // TODO(e.burkov): Get rid of the fork in v0.108.0.
<mask> replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf
<mask>
<mask> // TODO(a.garipov): Return to the main repo once miekg/dns#1317 is merged.
<mask> replace github.com/miekg/dns => github.com/ameshkov/dns v1.1.32-0.20211214123418-7a5e0dc5f1b0
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove howett.net/plist v0.0.0-20201203080718-1454fab16a06
</s> add howett.net/plist v1.0.0 </s> remove golang.org/x/sys v0.0.0-20210514084401-e8d321eab015 // indirect
golang.org/x/tools v0.1.1
honnef.co/go/tools v0.1.4
mvdan.cc/gofumpt v0.1.1
mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7
</s> add golang.org/x/tools v0.1.8
honnef.co/go/tools v0.2.2
mvdan.cc/gofumpt v0.2.1
mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5
)
require (
github.com/BurntSushi/toml v0.4.1 // indirect
github.com/client9/misspell v0.3.4 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gookit/color v1.5.0 // indirect
github.com/kyoh86/nolint v0.0.1 // indirect
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect </s> remove // Set default values for host configuration parameters listed
// in Appendix A of RFC-2131. Those parameters, if requested by
// client, should be returned with values defined by Host
// Requirements Document.
//
// See https://datatracker.ietf.org/doc/html/rfc2131#appendix-A.
//
// See also https://datatracker.ietf.org/doc/html/rfc1122,
// https://datatracker.ietf.org/doc/html/rfc1123, and
// https://datatracker.ietf.org/doc/html/rfc2132.
</s> add </s> remove github.com/kyoh86/nolint v0.0.1 // indirect
github.com/securego/gosec/v2 v2.7.0
</s> add github.com/securego/gosec/v2 v2.9.5 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.mod |
<mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
<mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
<mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
<mask> github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf h1:gc042VRSIRSUzZ+Px6xQCRWNJZTaPkomisDfUZmoFNk=
<mask> github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
<mask> github.com/AdguardTeam/dnsproxy v0.39.13 h1:7YM5Mr4EpFZ8UO4/4xd6zBG3lZ6AzZO6Xq29Cr4ydOY=
<mask> github.com/AdguardTeam/dnsproxy v0.39.13/go.mod h1:g7zjF1TWpKNeDVh6h3YrjQN8565zsWRd7zo++C/935c=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.9.2/go.mod h1:fCAMwPBJ8S7YMYbTWvYS+eeTLblP5E04IDtNAo7y7IY=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove go 1.16
</s> add go 1.17 </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.3 </s> remove github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
</s> add </s> remove golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
</s> add </s> remove require github.com/stretchr/objx v0.1.1 // indirect
// TODO(e.burkov): Get rid of the fork in v0.108.0.
replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf
</s> add require (
github.com/BurntSushi/toml v0.4.1 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
github.com/ameshkov/dnsstamps v1.0.3 // indirect
github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/joomcode/errorx v1.0.3 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.8 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
honnef.co/go/tools v0.2.2 // indirect
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
<mask> github.com/AdguardTeam/golibs v0.10.3/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
<mask> github.com/AdguardTeam/urlfilter v0.15.1 h1:dP6S7J6eFAk8MN4IDpUq2fZoBo8K8fmc6pXpxNIv84M=
<mask> github.com/AdguardTeam/urlfilter v0.15.1/go.mod h1:EwXwrYhowP7bedqmOrmKKmQtpBYFyDNEBFQ+lxdUgQU=
<mask> github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
<mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
<mask> github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
<mask> github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
<mask> github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
<mask> github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.3 </s> remove github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
</s> add </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 </s> remove go 1.16
</s> add go 1.17 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= | <mask> github.com/AdguardTeam/urlfilter v0.15.1/go.mod h1:EwXwrYhowP7bedqmOrmKKmQtpBYFyDNEBFQ+lxdUgQU=
<mask> github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
<mask> github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
<mask> github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
<mask> github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
<mask> github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
</s> add </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.3 </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 </s> remove github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
<mask> github.com/ameshkov/dns v1.1.32-0.20211214123418-7a5e0dc5f1b0 h1:a6ca3WlDG4zvUWqVFpVu48b9NZJ0fUFlRhiZKKkq+aw=
<mask> github.com/ameshkov/dns v1.1.32-0.20211214123418-7a5e0dc5f1b0/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.2 h1:lxtS1iSA2EjTOMToSi+2+rwspNA+b/wG5/JpccvE9CU=
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo=
<mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
<mask> github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.3 </s> remove require github.com/stretchr/objx v0.1.1 // indirect
// TODO(e.burkov): Get rid of the fork in v0.108.0.
replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf
</s> add require (
github.com/BurntSushi/toml v0.4.1 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
github.com/ameshkov/dnsstamps v1.0.3 // indirect
github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/joomcode/errorx v1.0.3 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.8 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
honnef.co/go/tools v0.2.2 // indirect
) </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/ameshkov/dnscrypt/v2 v2.2.3 h1:X9UP5AHtwp46Ji+sGFfF/1Is6OPI/SjxLqhKpx0P5UI=
github.com/ameshkov/dnscrypt/v2 v2.2.3/go.mod h1:xJB9cE1/GF+NB6EEQqRlkoa4bjcV2w7VYn1G+zVq7Bs= | <mask> github.com/ameshkov/dns v1.1.32-0.20211214123418-7a5e0dc5f1b0/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo=
<mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
<mask> github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 h1:M57m0xQqZIhx7CEJgeLSvRFKEK1RjzRuIXiA3HfYU7g=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2 h1:lxtS1iSA2EjTOMToSi+2+rwspNA+b/wG5/JpccvE9CU=
</s> add </s> remove require github.com/stretchr/objx v0.1.1 // indirect
// TODO(e.burkov): Get rid of the fork in v0.108.0.
replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf
</s> add require (
github.com/BurntSushi/toml v0.4.1 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
github.com/ameshkov/dnsstamps v1.0.3 // indirect
github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/joomcode/errorx v1.0.3 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.8 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
honnef.co/go/tools v0.2.2 // indirect
) </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.3 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/cilium/ebpf v0.5.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= | <mask> github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
<mask> github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
<mask> github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
<mask> github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
<mask> github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
<mask> github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove require github.com/stretchr/objx v0.1.1 // indirect
// TODO(e.burkov): Get rid of the fork in v0.108.0.
replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf
</s> add require (
github.com/BurntSushi/toml v0.4.1 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
github.com/ameshkov/dnsstamps v1.0.3 // indirect
github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/joomcode/errorx v1.0.3 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.8 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
honnef.co/go/tools v0.2.2 // indirect
) </s> remove github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY=
</s> add </s> remove howett.net/plist v0.0.0-20201203080718-1454fab16a06 h1:QDxUo/w2COstK1wIBYpzQlHX/NqaQTcf9jyz347nI58=
howett.net/plist v0.0.0-20201203080718-1454fab16a06/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
</s> add honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
honnef.co/go/tools v0.2.2 h1:MNh1AVMyVX23VUHE2O27jm6lNj3vjO5DexS4A1xvnzk=
honnef.co/go/tools v0.2.2/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= | <mask> github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
<mask> github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
<mask> github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
<mask> github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
<mask> github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
<mask> github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
<mask> github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
<mask> github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
</s> add </s> remove github.com/fzipp/gocyclo v0.3.1 h1:A9UeX3HJSXTBzvHzhqoYVuE0eAhe+aM8XBCCwsPMZOc=
github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E=
</s> add github.com/fzipp/gocyclo v0.4.0 h1:IykTnjwh2YLyYkGa0y92iTTEQcnyAz0r9zOo15EbJ7k=
github.com/fzipp/gocyclo v0.4.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
<mask> github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
<mask> github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
<mask> github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
<mask> github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
<mask> github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
<mask> github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
<mask> github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
<mask> github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
<mask> github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/fzipp/gocyclo v0.3.1 h1:A9UeX3HJSXTBzvHzhqoYVuE0eAhe+aM8XBCCwsPMZOc=
github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E=
</s> add github.com/fzipp/gocyclo v0.4.0 h1:IykTnjwh2YLyYkGa0y92iTTEQcnyAz0r9zOo15EbJ7k=
github.com/fzipp/gocyclo v0.4.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= </s> remove github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020 h1:mdi6AbCEoKCA1xKCmp7UtRB5fvGFlP92PvlhxgdvXEw=
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020/go.mod h1:KmHOjTUmJh/l04ukqPoBWPEZr9jwN05h5NXQl5C+DyY=
</s> add github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 h1:dhy9OQKGBh4zVXbjwbxxHjRxMJtLXj3zfgpBYQaR4Q4=
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= | <mask> github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
<mask> github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
<mask> github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
<mask> github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
<mask> github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
<mask> github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
<mask> github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
</s> add </s> remove github.com/fzipp/gocyclo v0.3.1 h1:A9UeX3HJSXTBzvHzhqoYVuE0eAhe+aM8XBCCwsPMZOc=
github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E=
</s> add github.com/fzipp/gocyclo v0.4.0 h1:IykTnjwh2YLyYkGa0y92iTTEQcnyAz0r9zOo15EbJ7k=
github.com/fzipp/gocyclo v0.4.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= </s> remove github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020 h1:mdi6AbCEoKCA1xKCmp7UtRB5fvGFlP92PvlhxgdvXEw=
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020/go.mod h1:KmHOjTUmJh/l04ukqPoBWPEZr9jwN05h5NXQl5C+DyY=
</s> add github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 h1:dhy9OQKGBh4zVXbjwbxxHjRxMJtLXj3zfgpBYQaR4Q4=
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 h1:dhy9OQKGBh4zVXbjwbxxHjRxMJtLXj3zfgpBYQaR4Q4=
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= | <mask> github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
<mask> github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
<mask> github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
<mask> github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
<mask> github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020 h1:mdi6AbCEoKCA1xKCmp7UtRB5fvGFlP92PvlhxgdvXEw=
<mask> github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020/go.mod h1:KmHOjTUmJh/l04ukqPoBWPEZr9jwN05h5NXQl5C+DyY=
<mask> github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
<mask> github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
<mask> github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
<mask> github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
<mask> github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
</s> add </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2
</s> add github.com/ameshkov/dnscrypt/v2 v2.2.3 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= | <mask> github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
<mask> github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
<mask> github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
<mask> github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
<mask> github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
<mask> github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
<mask> github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
<mask> github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
<mask> github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
</s> add </s> remove github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
<mask> github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
<mask> github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
<mask> github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
<mask> github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
<mask> github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
</s> add </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= | <mask> github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
<mask> github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
<mask> github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
<mask> github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
</s> add </s> remove github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
</s> add </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | <mask> github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU=
<mask> github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
<mask> github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
<mask> github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
<mask> github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
<mask> github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
<mask> github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
<mask> github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
</s> add github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 </s> remove github.com/lucas-clemente/quic-go v0.21.1
</s> add github.com/lucas-clemente/quic-go v0.24.0 </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 </s> remove github.com/gookit/color v1.3.8/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ=
github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk=
github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ=
</s> add github.com/gookit/color v1.5.0 h1:1Opow3+BWDwqor78DcJkJCIwnkviFi+rrOANki9BUFw=
github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo= | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 h1:jhdHqd7DxBrzfuFSoPxjD6nUVaV/1RIn9aHA0WCf/as=
github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= | <mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8=
<mask> github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
<mask> github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
<mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
<mask> github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
<mask> github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2 h1:lxtS1iSA2EjTOMToSi+2+rwspNA+b/wG5/JpccvE9CU=
</s> add </s> remove require github.com/stretchr/objx v0.1.1 // indirect
// TODO(e.burkov): Get rid of the fork in v0.108.0.
replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf
</s> add require (
github.com/BurntSushi/toml v0.4.1 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
github.com/ameshkov/dnsstamps v1.0.3 // indirect
github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/joomcode/errorx v1.0.3 // indirect
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
github.com/mdlayher/socket v0.1.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.8 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
honnef.co/go/tools v0.2.2 // indirect
) </s> remove github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0=
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR77jAZG3Y3bsb8hF6fHJbFoyFukLFOkQ98S0pQz3xw=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b h1:c3NTyLNozICy8B4mlMXemD3z/gXgQzVXZS/HqT+i3do=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U=
<mask> github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
<mask> github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
<mask> github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
<mask> github.com/kardianos/service v1.2.0 h1:bGuZ/epo3vrt8IPC7mnKQolqFeYJb7Cs8Rk4PSOBB/g=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/lucas-clemente/quic-go v0.21.1
</s> add github.com/lucas-clemente/quic-go v0.24.0 </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
</s> add github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/jsimonetti/rtnetlink v0.0.0-20210525051524-4cc836578190/go.mod h1:NmKSdU4VGSiv1bMsdqNALI4RSvvjtz65tTMCnD05qLo=
github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786 h1:N527AHMa793TP5z5GNAn/VLPzlc0ewzWdeP/25gDfgQ=
github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786/go.mod h1:v4hqbTdfQngbVSZJVWUhGE/lbTFf9jb+ygmNUDQMuOs= | <mask> github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR77jAZG3Y3bsb8hF6fHJbFoyFukLFOkQ98S0pQz3xw=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U=
<mask> github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
<mask> github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
<mask> github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
<mask> github.com/kardianos/service v1.2.0 h1:bGuZ/epo3vrt8IPC7mnKQolqFeYJb7Cs8Rk4PSOBB/g=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b h1:c3NTyLNozICy8B4mlMXemD3z/gXgQzVXZS/HqT+i3do=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.21.1
</s> add github.com/lucas-clemente/quic-go v0.24.0 </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
</s> add github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 </s> remove github.com/fsnotify/fsnotify v1.4.9
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
github.com/google/go-cmp v0.5.5
</s> add github.com/fsnotify/fsnotify v1.5.1
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534
github.com/google/go-cmp v0.5.6 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= | <mask> github.com/kardianos/service v1.2.0/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM=
<mask> github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
<mask> github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
<mask> github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
<mask> github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
<mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
<mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.21.1 h1:uuhCcu885TE9u/piPYMChI/yqA1lXfaLUEx8uCMxf8w=
</s> add </s> remove github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
<mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
<mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/lucas-clemente/quic-go v0.21.1 h1:uuhCcu885TE9u/piPYMChI/yqA1lXfaLUEx8uCMxf8w=
<mask> github.com/lucas-clemente/quic-go v0.21.1/go.mod h1:U9kFi5LKbNIlU30dkuM9vxmTxWq4Bvzee/MjBI+07UA=
<mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
<mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
<mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g=
github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= | <mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
<mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/lucas-clemente/quic-go v0.21.1/go.mod h1:U9kFi5LKbNIlU30dkuM9vxmTxWq4Bvzee/MjBI+07UA=
<mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
<mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
<mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/lucas-clemente/quic-go v0.21.1 h1:uuhCcu885TE9u/piPYMChI/yqA1lXfaLUEx8uCMxf8w=
</s> add </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> github.com/lucas-clemente/quic-go v0.21.1/go.mod h1:U9kFi5LKbNIlU30dkuM9vxmTxWq4Bvzee/MjBI+07UA=
<mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
<mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
<mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.3 h1:XEZ1xGorVy9u+lJq+WXNE+hiqRYLNvJGYmwfwKQN2gU=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2 h1:SficYjyOthSrliKI+EaFuXS6HqSsX3dkY9AqxAAjBjw=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/marten-seemann/qtls-go1-16 v0.1.3 h1:XEZ1xGorVy9u+lJq+WXNE+hiqRYLNvJGYmwfwKQN2gU=
</s> add </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2 h1:SficYjyOthSrliKI+EaFuXS6HqSsX3dkY9AqxAAjBjw=
</s> add github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= </s> remove github.com/lucas-clemente/quic-go v0.21.1 h1:uuhCcu885TE9u/piPYMChI/yqA1lXfaLUEx8uCMxf8w=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
<mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
<mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.3 h1:XEZ1xGorVy9u+lJq+WXNE+hiqRYLNvJGYmwfwKQN2gU=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2 h1:SficYjyOthSrliKI+EaFuXS6HqSsX3dkY9AqxAAjBjw=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
<mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
</s> add </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2 h1:SficYjyOthSrliKI+EaFuXS6HqSsX3dkY9AqxAAjBjw=
</s> add github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= </s> remove github.com/lucas-clemente/quic-go v0.21.1 h1:uuhCcu885TE9u/piPYMChI/yqA1lXfaLUEx8uCMxf8w=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= | <mask> github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.3 h1:XEZ1xGorVy9u+lJq+WXNE+hiqRYLNvJGYmwfwKQN2gU=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2 h1:SficYjyOthSrliKI+EaFuXS6HqSsX3dkY9AqxAAjBjw=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
<mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
<mask> github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/marten-seemann/qtls-go1-16 v0.1.3 h1:XEZ1xGorVy9u+lJq+WXNE+hiqRYLNvJGYmwfwKQN2gU=
</s> add </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
</s> add </s> remove github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk=
github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= | <mask> github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
<mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
<mask> github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2 h1:SficYjyOthSrliKI+EaFuXS6HqSsX3dkY9AqxAAjBjw=
</s> add github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= </s> remove github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY=
</s> add </s> remove github.com/marten-seemann/qtls-go1-16 v0.1.3 h1:XEZ1xGorVy9u+lJq+WXNE+hiqRYLNvJGYmwfwKQN2gU=
</s> add </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4 h1:RehYMOyRW8hPVEja1KBVsFVNSm35Jj9Mvs5yNoZZ28A=
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
<mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
<mask> github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY=
<mask> github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo=
<mask> github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0=
<mask> github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc=
<mask> github.com/mdlayher/netlink v0.0.0-20190313131330-258ea9dff42c/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
<mask> github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2 h1:SficYjyOthSrliKI+EaFuXS6HqSsX3dkY9AqxAAjBjw=
</s> add github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= </s> remove github.com/marten-seemann/qtls-go1-16 v0.1.3 h1:XEZ1xGorVy9u+lJq+WXNE+hiqRYLNvJGYmwfwKQN2gU=
</s> add </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60 h1:tHdB+hQRHU10CfcK0furo6rSNgZ38JT8uPh70c/pFD8=
github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60/go.mod h1:aYbhishWc4Ai3I2U4Gaa2n3kHWSwzme6EsG/46HRQbE= | <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
<mask> github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo=
<mask> github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0=
<mask> github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc=
<mask> github.com/mdlayher/netlink v0.0.0-20190313131330-258ea9dff42c/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
<mask> github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 h1:WgyLFv10Ov49JAQI/ZLUkCZ7VJS3r74hwFIGXJsgZlY=
</s> add </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2 h1:SficYjyOthSrliKI+EaFuXS6HqSsX3dkY9AqxAAjBjw=
</s> add github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove github.com/lucas-clemente/quic-go v0.21.1
</s> add github.com/lucas-clemente/quic-go v0.24.0 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> github.com/mdlayher/netlink v1.2.0/go.mod h1:kwVW1io0AZy9A1E2YYgaD4Cj+C+GPkU6klXCMzIJ9p8=
<mask> github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU=
<mask> github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU=
<mask> github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys=
<mask> github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0=
<mask> github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8=
<mask> github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
<mask> github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf h1:InctQoB89TIkmgIFQeIL4KXNvWc1iebQXdZggqPSwL8=
<mask> github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf h1:InctQoB89TIkmgIFQeIL4KXNvWc1iebQXdZggqPSwL8=
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
</s> add github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b h1:MHcTarUMC4sFA7eiyR8IEJ6j2PgmgXR+B9X2IIMjh7A=
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod h1:GAFlyu4/XV68LkQKYzKhIo/WW7j3Zi0YRAz/BOoanUc=
github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g=
github.com/mdlayher/socket v0.1.0/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs=
github.com/mdlayher/socket v0.1.1 h1:q3uOGirUPfAV2MUoaC7BavjQ154J7+JOkTWyiV+intI=
github.com/mdlayher/socket v0.1.1/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs= </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove github.com/lucas-clemente/quic-go v0.21.1
</s> add github.com/lucas-clemente/quic-go v0.24.0 </s> remove github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
</s> add github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/mdlayher/netlink v1.4.1/go.mod h1:e4/KuJ+s8UhfUpO9z00/fDZZmhSrs+oxyqAS9cNgn6Q=
github.com/mdlayher/netlink v1.5.0 h1:r4fa439+SsMarM0rMONU3iSshSV3ArVqJl6H/zjrhh4=
github.com/mdlayher/netlink v1.5.0/go.mod h1:1Kr8BBFxGyUyNmztC9WLOayqYVAd2wsgOZm18nqGuzQ= | <mask> github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys=
<mask> github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8=
<mask> github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
<mask> github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b h1:MHcTarUMC4sFA7eiyR8IEJ6j2PgmgXR+B9X2IIMjh7A=
<mask> github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
<mask> github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod h1:GAFlyu4/XV68LkQKYzKhIo/WW7j3Zi0YRAz/BOoanUc=
<mask> github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf h1:InctQoB89TIkmgIFQeIL4KXNvWc1iebQXdZggqPSwL8=
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
</s> add github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b h1:MHcTarUMC4sFA7eiyR8IEJ6j2PgmgXR+B9X2IIMjh7A=
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod h1:GAFlyu4/XV68LkQKYzKhIo/WW7j3Zi0YRAz/BOoanUc=
github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g=
github.com/mdlayher/socket v0.1.0/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs=
github.com/mdlayher/socket v0.1.1 h1:q3uOGirUPfAV2MUoaC7BavjQ154J7+JOkTWyiV+intI=
github.com/mdlayher/socket v0.1.1/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs= </s> remove github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0=
</s> add </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove github.com/lucas-clemente/quic-go v0.21.1
</s> add github.com/lucas-clemente/quic-go v0.24.0 </s> remove github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
</s> add github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b h1:MHcTarUMC4sFA7eiyR8IEJ6j2PgmgXR+B9X2IIMjh7A=
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod h1:GAFlyu4/XV68LkQKYzKhIo/WW7j3Zi0YRAz/BOoanUc=
github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g=
github.com/mdlayher/socket v0.1.0/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs=
github.com/mdlayher/socket v0.1.1 h1:q3uOGirUPfAV2MUoaC7BavjQ154J7+JOkTWyiV+intI=
github.com/mdlayher/socket v0.1.1/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs= | <mask> github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0=
<mask> github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8=
<mask> github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
<mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
<mask> github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf h1:InctQoB89TIkmgIFQeIL4KXNvWc1iebQXdZggqPSwL8=
<mask> github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
<mask> github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
<mask> github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
<mask> github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
<mask> github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
<mask> github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/mdlayher/netlink v1.4.0 h1:n3ARR+Fm0dDv37dj5wSWZXDKcy+U0zwcXS3zKMnSiT0=
</s> add </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
</s> add github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 </s> remove github.com/lucas-clemente/quic-go v0.21.1
</s> add github.com/lucas-clemente/quic-go v0.24.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
<mask> github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
<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/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
<mask> github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
<mask> github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
<mask> github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
<mask> github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
<mask> github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
</s> add </s> remove github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
</s> add </s> remove github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4=
github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
</s> add github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= | <mask> github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
<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/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
<mask> github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
<mask> github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
<mask> github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
<mask> github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
</s> add </s> remove github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
</s> add </s> remove github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4=
github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
</s> add github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= </s> remove github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
<mask> github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
<mask> github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
<mask> github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
<mask> github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
<mask> github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
<mask> github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
<mask> github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
<mask> github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
<mask> github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
</s> add </s> remove github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
</s> add </s> remove github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4=
github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
</s> add github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= | <mask> github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
<mask> github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
<mask> github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
<mask> github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
<mask> github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
<mask> github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
<mask> github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
<mask> github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
</s> add </s> remove github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4=
github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
</s> add github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= </s> remove github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
<mask> github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
<mask> github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
<mask> github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
<mask> github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
<mask> github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
<mask> github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
<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=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
</s> add </s> remove github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ=
github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
</s> add github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE=
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= </s> remove github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4=
github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
</s> add github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= | <mask> github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
<mask> github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
<mask> github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
<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: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
</s> add </s> remove github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ=
github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
</s> add github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE=
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= </s> remove github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 h1:XMAtQHwKjWHIRwg+8Nj/rzUomQY1q6cM3ncA0wP8GU4=
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA= | <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/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
<mask> github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
<mask> github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
<mask> github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
<mask> github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
<mask> go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
<mask> go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6
golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3
</s> add golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | <mask> github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
<mask> github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
<mask> github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
<mask> github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
<mask> github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
<mask> github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
<mask> go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
<mask> go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
<mask> go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/u-root/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
</s> add github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 h1:XMAtQHwKjWHIRwg+8Nj/rzUomQY1q6cM3ncA0wP8GU4=
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA= </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6
golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3
</s> add golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= | <mask> github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
<mask> github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
<mask> github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
<mask> github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
<mask> go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
<mask> go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
<mask> go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
<mask> go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
<mask> golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
<mask> golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove github.com/u-root/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
</s> add github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 h1:XMAtQHwKjWHIRwg+8Nj/rzUomQY1q6cM3ncA0wP8GU4=
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA= </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6
golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3
</s> add golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e </s> remove github.com/mdlayher/netlink v1.4.0
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
</s> add github.com/mdlayher/netlink v1.5.0
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= | <mask> golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
<mask> golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
<mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
</s> add golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= </s> remove golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
</s> add golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6
golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3
</s> add golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | <mask> golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
<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 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
</s> add </s> remove golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> add golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= | <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.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
</s> add golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= </s> remove golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
<mask> golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
<mask> golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
<mask> golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
</s> add </s> remove golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6 h1:Z04ewVs7JhXaYkmDhBERPi41gnltfQpMWDnTnQbaCqk=
</s> add golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
|
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= | <mask> golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
</s> add </s> remove golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
</s> add </s> remove golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6 h1:Z04ewVs7JhXaYkmDhBERPi41gnltfQpMWDnTnQbaCqk=
</s> add golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= | <mask> golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<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-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
<mask> golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20210908191846-a5e095526f91/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> Pull request: all: upd go, tools, deps
Updates #2275.
Updates #3057.
Squashed commit of the following:
commit da22ad203cec1ef2a5d0a218933ddc3ac03c2ad3
Merge: dbd7e202 779fbe79
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 16:26:46 2021 +0300
Merge branch 'master' into 2275-upd-go
commit dbd7e20209ddc04198e89698b7e3c2750c4d9902
Author: Ainar Garipov <[email protected]>
Date: Wed Dec 22 15:04:17 2021 +0300
all: upd docker img
commit 269796e3a00f60120a6327d6501f2dde031435c4
Author: Ainar Garipov <[email protected]>
Date: Tue Dec 21 21:04:25 2021 +0300
all: upd go, tools, deps </s> remove golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6 h1:Z04ewVs7JhXaYkmDhBERPi41gnltfQpMWDnTnQbaCqk=
</s> add golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= </s> remove golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2968a65f14551f7c2990df32d4c96782936be566 | go.sum |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.