docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> m = d["top_blocked_domains"].([]map[string]uint)
<mask> assert.True(t, m[0]["domain"] == 1)
<mask>
<mask> m = d["top_clients"].([]map[string]uint)
<mask> assert.True(t, m[0]["127.0.0.1"] == 2)
<mask>
<mask> assert.True(t, d["num_dns_queries"].(uint) == 2)
<mask> assert.True(t, d["num_blocked_filtering"].(uint) == 1)
<mask> assert.True(t, d["num_replaced_safebrowsing"].(uint) == 0)
</s> * stats: use uint32 or uint64 integer values, not int </s> remove assert.True(t, d["num_dns_queries"].(uint) == 2)
assert.True(t, d["num_blocked_filtering"].(uint) == 1)
assert.True(t, d["num_replaced_safebrowsing"].(uint) == 0)
assert.True(t, d["num_replaced_safesearch"].(uint) == 0)
assert.True(t, d["num_replaced_parental"].(uint) == 0)
</s> add assert.True(t, d["num_dns_queries"].(uint64) == 2)
assert.True(t, d["num_blocked_filtering"].(uint64) == 1)
assert.True(t, d["num_replaced_safebrowsing"].(uint64) == 0)
assert.True(t, d["num_replaced_safesearch"].(uint64) == 0)
assert.True(t, d["num_replaced_parental"].(uint64) == 0) </s> remove m = d["top_blocked_domains"].([]map[string]uint)
</s> add m = d["top_blocked_domains"].([]map[string]uint64) </s> remove m := d["top_queried_domains"].([]map[string]uint)
</s> add m := d["top_queried_domains"].([]map[string]uint64) </s> remove assert.True(t, d["num_dns_queries"].(uint) == uint(int(hour)*n))
</s> add assert.True(t, d["num_dns_queries"].(uint64) == uint64(int(hour)*n)) </s> remove a = []uint{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
assert.True(t, UIntArrayEquals(d["replaced_parental"].([]uint), a))
</s> add a = []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
assert.True(t, UIntArrayEquals(d["replaced_parental"].([]uint64), a)) </s> remove a = []uint{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
assert.True(t, UIntArrayEquals(d["replaced_safebrowsing"].([]uint), a))
</s> add a = []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
assert.True(t, UIntArrayEquals(d["replaced_safebrowsing"].([]uint64), a)) | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_test.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> m = d["top_clients"].([]map[string]uint)
<mask> assert.True(t, m[0]["127.0.0.1"] == 2)
<mask>
<mask> assert.True(t, d["num_dns_queries"].(uint) == 2)
<mask> assert.True(t, d["num_blocked_filtering"].(uint) == 1)
<mask> assert.True(t, d["num_replaced_safebrowsing"].(uint) == 0)
<mask> assert.True(t, d["num_replaced_safesearch"].(uint) == 0)
<mask> assert.True(t, d["num_replaced_parental"].(uint) == 0)
<mask> assert.True(t, d["avg_processing_time"].(float64) == 0.123456)
<mask>
<mask> s.Clear()
<mask> s.Close()
<mask> os.Remove("./stats.db")
</s> * stats: use uint32 or uint64 integer values, not int </s> remove m = d["top_clients"].([]map[string]uint)
</s> add m = d["top_clients"].([]map[string]uint64) </s> remove m = d["top_blocked_domains"].([]map[string]uint)
</s> add m = d["top_blocked_domains"].([]map[string]uint64) </s> remove assert.True(t, d["num_dns_queries"].(uint) == uint(int(hour)*n))
</s> add assert.True(t, d["num_dns_queries"].(uint64) == uint64(int(hour)*n)) </s> remove m := d["top_queried_domains"].([]map[string]uint)
</s> add m := d["top_queried_domains"].([]map[string]uint64) </s> remove a = []uint{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
assert.True(t, UIntArrayEquals(d["replaced_parental"].([]uint), a))
</s> add a = []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
assert.True(t, UIntArrayEquals(d["replaced_parental"].([]uint64), a)) </s> remove a = []uint{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
assert.True(t, UIntArrayEquals(d["replaced_safebrowsing"].([]uint), a))
</s> add a = []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
assert.True(t, UIntArrayEquals(d["replaced_safebrowsing"].([]uint64), a)) | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_test.go |
keep keep keep keep replace keep replace keep | <mask>
<mask> func TestLargeNumbers(t *testing.T) {
<mask> var hour int32
<mask> hour = 1
<mask> newID := func() int {
<mask> // use "atomic" to make Go race detector happy
<mask> return int(atomic.LoadInt32(&hour))
<mask> }
</s> * stats: use uint32 or uint64 integer values, not int </s> remove func btoi(b []byte) int {
return int(binary.BigEndian.Uint64(b))
</s> add func btoi(b []byte) uint64 {
return binary.BigEndian.Uint64(b) </s> remove func newUnitID() int {
return int(time.Now().Unix() / (60 * 60))
</s> add func newUnitID() uint32 {
return uint32(time.Now().Unix() / (60 * 60)) </s> remove id int // unit ID. Default: absolute hour since Jan 1, 1970
</s> add id uint32 // unit ID. Default: absolute hour since Jan 1, 1970 </s> remove type unitIDCallback func() int
</s> add type unitIDCallback func() uint32 </s> remove binary.BigEndian.PutUint64(b, uint64(v))
</s> add binary.BigEndian.PutUint64(b, v) | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_test.go |
keep keep keep keep replace keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> d := s.GetData(Hours)
<mask> assert.True(t, d["num_dns_queries"].(uint) == uint(int(hour)*n))
<mask>
<mask> s.Close()
<mask> os.Remove(fn)
<mask> }
</s> * stats: use uint32 or uint64 integer values, not int </s> remove assert.True(t, d["num_dns_queries"].(uint) == 2)
assert.True(t, d["num_blocked_filtering"].(uint) == 1)
assert.True(t, d["num_replaced_safebrowsing"].(uint) == 0)
assert.True(t, d["num_replaced_safesearch"].(uint) == 0)
assert.True(t, d["num_replaced_parental"].(uint) == 0)
</s> add assert.True(t, d["num_dns_queries"].(uint64) == 2)
assert.True(t, d["num_blocked_filtering"].(uint64) == 1)
assert.True(t, d["num_replaced_safebrowsing"].(uint64) == 0)
assert.True(t, d["num_replaced_safesearch"].(uint64) == 0)
assert.True(t, d["num_replaced_parental"].(uint64) == 0) </s> remove m = d["top_clients"].([]map[string]uint)
</s> add m = d["top_clients"].([]map[string]uint64) </s> remove return int(atomic.LoadInt32(&hour))
</s> add return uint32(atomic.LoadInt32(&hour)) </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a = []uint{}
</s> add a = []uint64{} | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> )
<mask>
<mask> // statsCtx - global context
<mask> type statsCtx struct {
<mask> limit int // maximum time we need to keep data for (in hours)
<mask> filename string // database file name
<mask> unitID unitIDCallback // user function which returns the current unit ID
<mask> db *bolt.DB
<mask>
<mask> unit *unit // the current unit
</s> * stats: use uint32 or uint64 integer values, not int </s> remove type unitIDCallback func() int
</s> add type unitIDCallback func() uint32 </s> remove func New(filename string, limit int, unitID unitIDCallback) (Stats, error) {
</s> add func New(filename string, limit uint32, unitID unitIDCallback) (Stats, error) { </s> remove func newUnitID() int {
return int(time.Now().Unix() / (60 * 60))
</s> add func newUnitID() uint32 {
return uint32(time.Now().Unix() / (60 * 60)) </s> remove func btoi(b []byte) int {
return int(binary.BigEndian.Uint64(b))
</s> add func btoi(b []byte) uint64 {
return binary.BigEndian.Uint64(b) </s> remove id int // unit ID. Default: absolute hour since Jan 1, 1970
</s> add id uint32 // unit ID. Default: absolute hour since Jan 1, 1970 </s> remove Count uint
</s> add Count uint64 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep replace replace replace keep keep keep | <mask> }
<mask>
<mask> // data for 1 time unit
<mask> type unit struct {
<mask> id int // unit ID. Default: absolute hour since Jan 1, 1970
<mask>
<mask> nTotal int // total requests
<mask> nResult []int // number of requests per one result
<mask> timeSum int // sum of processing time of all requests (usec)
<mask>
<mask> // top:
<mask> domains map[string]int // number of requests per domain
</s> * stats: use uint32 or uint64 integer values, not int </s> remove domains map[string]int // number of requests per domain
blockedDomains map[string]int // number of blocked requests per domain
clients map[string]int // number of requests per client
</s> add domains map[string]uint64 // number of requests per domain
blockedDomains map[string]uint64 // number of blocked requests per domain
clients map[string]uint64 // number of requests per client </s> remove limit int // maximum time we need to keep data for (in hours)
</s> add limit uint32 // maximum time we need to keep data for (in hours) </s> remove type unitIDCallback func() int
</s> add type unitIDCallback func() uint32 </s> remove Time uint // processing time (msec)
</s> add Time uint32 // processing time (msec) </s> remove func newUnitID() int {
return int(time.Now().Unix() / (60 * 60))
</s> add func newUnitID() uint32 {
return uint32(time.Now().Unix() / (60 * 60)) | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> nResult []int // number of requests per one result
<mask> timeSum int // sum of processing time of all requests (usec)
<mask>
<mask> // top:
<mask> domains map[string]int // number of requests per domain
<mask> blockedDomains map[string]int // number of blocked requests per domain
<mask> clients map[string]int // number of requests per client
<mask> }
<mask>
<mask> // name-count pair
<mask> type countPair struct {
<mask> Name string
</s> * stats: use uint32 or uint64 integer values, not int </s> remove nTotal int // total requests
nResult []int // number of requests per one result
timeSum int // sum of processing time of all requests (usec)
</s> add nTotal uint64 // total requests
nResult []uint64 // number of requests per one result
timeSum uint64 // sum of processing time of all requests (usec) </s> remove id int // unit ID. Default: absolute hour since Jan 1, 1970
</s> add id uint32 // unit ID. Default: absolute hour since Jan 1, 1970 </s> remove Count uint
</s> add Count uint64 </s> remove Time uint // processing time (msec)
</s> add Time uint32 // processing time (msec) </s> remove if len(units) != s.limit {
</s> add if len(units) != int(s.limit) { </s> remove limit int // maximum time we need to keep data for (in hours)
</s> add limit uint32 // maximum time we need to keep data for (in hours) | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep replace replace keep keep keep keep | <mask>
<mask> // name-count pair
<mask> type countPair struct {
<mask> Name string
<mask> Count uint
<mask> }
<mask>
<mask> // structure for storing data in file
<mask> type unitDB struct {
<mask> NTotal uint
<mask> NResult []uint
<mask>
<mask> Domains []countPair
<mask> BlockedDomains []countPair
<mask> Clients []countPair
</s> * stats: use uint32 or uint64 integer values, not int </s> remove TimeAvg uint // usec
</s> add TimeAvg uint32 // usec </s> remove Time uint // processing time (msec)
</s> add Time uint32 // processing time (msec) </s> remove domains map[string]int // number of requests per domain
blockedDomains map[string]int // number of blocked requests per domain
clients map[string]int // number of requests per client
</s> add domains map[string]uint64 // number of requests per domain
blockedDomains map[string]uint64 // number of blocked requests per domain
clients map[string]uint64 // number of requests per client </s> remove func convertMapToArray(m map[string]int, max int) []countPair {
</s> add func convertMapToArray(m map[string]uint64, max int) []countPair { </s> remove Interval uint `json:"interval"`
</s> add Interval uint32 `json:"interval"` | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> Domains []countPair
<mask> BlockedDomains []countPair
<mask> Clients []countPair
<mask>
<mask> TimeAvg uint // usec
<mask> }
<mask>
<mask> func createObject(filename string, limitDays int, unitID unitIDCallback) (*statsCtx, error) {
<mask> s := statsCtx{}
<mask> s.limit = limitDays * 24
</s> * stats: use uint32 or uint64 integer values, not int </s> remove func createObject(filename string, limitDays int, unitID unitIDCallback) (*statsCtx, error) {
</s> add func createObject(filename string, limitDays uint32, unitID unitIDCallback) (*statsCtx, error) { </s> remove NTotal uint
NResult []uint
</s> add NTotal uint64
NResult []uint64 </s> remove func New(filename string, limit int, unitID unitIDCallback) (Stats, error) {
</s> add func New(filename string, limit uint32, unitID unitIDCallback) (Stats, error) { </s> remove func convertMapToArray(m map[string]int, max int) []countPair {
</s> add func convertMapToArray(m map[string]uint64, max int) []countPair { </s> remove s.limit = limit * 24
</s> add s.limit = uint32(limit) * 24 </s> remove u.timeSum = int(udb.TimeAvg) * u.nTotal
</s> add u.timeSum = uint64(udb.TimeAvg) * u.nTotal | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> TimeAvg uint // usec
<mask> }
<mask>
<mask> func createObject(filename string, limitDays int, unitID unitIDCallback) (*statsCtx, error) {
<mask> s := statsCtx{}
<mask> s.limit = limitDays * 24
<mask> s.filename = filename
<mask> s.unitID = newUnitID
<mask> if unitID != nil {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove TimeAvg uint // usec
</s> add TimeAvg uint32 // usec </s> remove func New(filename string, limit int, unitID unitIDCallback) (Stats, error) {
</s> add func New(filename string, limit uint32, unitID unitIDCallback) (Stats, error) { </s> remove s.limit = limit * 24
</s> add s.limit = uint32(limit) * 24 </s> remove func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id int, udb *unitDB) bool {
</s> add func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id uint32, udb *unitDB) bool { </s> remove u.timeSum = int(udb.TimeAvg) * u.nTotal
</s> add u.timeSum = uint64(udb.TimeAvg) * u.nTotal </s> remove if len(units) != s.limit {
</s> add if len(units) != int(s.limit) { | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> log.Tracef("Deleting old units...")
<mask> firstID := id - s.limit - 1
<mask> unitDel := 0
<mask> forEachBkt := func(name []byte, b *bolt.Bucket) error {
<mask> id := btoi(name)
<mask> if id < firstID {
<mask> err := tx.DeleteBucket(name)
<mask> if err != nil {
<mask> log.Debug("tx.DeleteBucket: %s", err)
<mask> }
</s> * stats: use uint32 or uint64 integer values, not int </s> remove func (s *statsCtx) deleteUnit(tx *bolt.Tx, id int) bool {
</s> add func (s *statsCtx) deleteUnit(tx *bolt.Tx, id uint32) bool { </s> remove func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id int, udb *unitDB) bool {
</s> add func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id uint32, udb *unitDB) bool { </s> remove config.stats, err = stats.New(filepath.Join(baseDir, "stats.db"), int(config.DNS.StatsInterval), nil)
</s> add statsDBFilename := filepath.Join(baseDir, "stats.db")
config.stats, err = stats.New(statsDBFilename, config.DNS.StatsInterval, nil) </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep replace replace keep keep keep replace | <mask>
<mask> // Get unit ID for the current hour
<mask> func newUnitID() int {
<mask> return int(time.Now().Unix() / (60 * 60))
<mask> }
<mask>
<mask> // Initialize a unit
<mask> func (s *statsCtx) initUnit(u *unit, id int) {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove func btoi(b []byte) int {
return int(binary.BigEndian.Uint64(b))
</s> add func btoi(b []byte) uint64 {
return binary.BigEndian.Uint64(b) </s> remove u.nResult = make([]int, rLast)
u.domains = make(map[string]int)
u.blockedDomains = make(map[string]int)
u.clients = make(map[string]int)
</s> add u.nResult = make([]uint64, rLast)
u.domains = make(map[string]uint64)
u.blockedDomains = make(map[string]uint64)
u.clients = make(map[string]uint64) </s> remove limit int // maximum time we need to keep data for (in hours)
</s> add limit uint32 // maximum time we need to keep data for (in hours) </s> remove func unitName(id int) []byte {
return itob(id)
</s> add func unitName(id uint32) []byte {
return itob(uint64(id)) </s> remove s.limit = limit * 24
</s> add s.limit = uint32(limit) * 24 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask>
<mask> // Initialize a unit
<mask> func (s *statsCtx) initUnit(u *unit, id int) {
<mask> u.id = id
<mask> u.nResult = make([]int, rLast)
<mask> u.domains = make(map[string]int)
<mask> u.blockedDomains = make(map[string]int)
<mask> u.clients = make(map[string]int)
<mask> }
<mask>
<mask> // Open a DB transaction
<mask> func (s *statsCtx) beginTxn(wr bool) *bolt.Tx {
<mask> db := s.db
</s> * stats: use uint32 or uint64 integer values, not int </s> remove func (s *statsCtx) initUnit(u *unit, id int) {
</s> add func (s *statsCtx) initUnit(u *unit, id uint32) { </s> remove func newUnitID() int {
return int(time.Now().Unix() / (60 * 60))
</s> add func newUnitID() uint32 {
return uint32(time.Now().Unix() / (60 * 60)) </s> remove u.timeSum = int(udb.TimeAvg) * u.nTotal
</s> add u.timeSum = uint64(udb.TimeAvg) * u.nTotal </s> remove func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id int, udb *unitDB) bool {
</s> add func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id uint32, udb *unitDB) bool { </s> remove s.limit = limit * 24
</s> add s.limit = uint32(limit) * 24 </s> remove u.nTotal = int(udb.NTotal)
</s> add u.nTotal = udb.NTotal | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace replace keep keep keep replace | <mask> log.Tracef("tx.Commit")
<mask> }
<mask>
<mask> // Get unit name
<mask> func unitName(id int) []byte {
<mask> return itob(id)
<mask> }
<mask>
<mask> // Convert integer to 8-byte array (big endian)
<mask> func itob(v int) []byte {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove binary.BigEndian.PutUint64(b, uint64(v))
</s> add binary.BigEndian.PutUint64(b, v) </s> remove func btoi(b []byte) int {
return int(binary.BigEndian.Uint64(b))
</s> add func btoi(b []byte) uint64 {
return binary.BigEndian.Uint64(b) </s> remove func newUnitID() int {
return int(time.Now().Unix() / (60 * 60))
</s> add func newUnitID() uint32 {
return uint32(time.Now().Unix() / (60 * 60)) </s> remove func convertMapToArray(m map[string]int, max int) []countPair {
</s> add func convertMapToArray(m map[string]uint64, max int) []countPair { </s> remove func (s *statsCtx) loadUnitFromDB(tx *bolt.Tx, id int) *unitDB {
</s> add func (s *statsCtx) loadUnitFromDB(tx *bolt.Tx, id uint32) *unitDB { | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep replace keep keep keep keep replace replace keep keep keep keep | <mask> func itob(v int) []byte {
<mask> b := make([]byte, 8)
<mask> binary.BigEndian.PutUint64(b, uint64(v))
<mask> return b
<mask> }
<mask>
<mask> // Convert 8-byte array (big endian) to integer
<mask> func btoi(b []byte) int {
<mask> return int(binary.BigEndian.Uint64(b))
<mask> }
<mask>
<mask> // Flush the current unit to DB and delete an old unit when a new hour is started
<mask> func (s *statsCtx) periodicFlush() {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove func itob(v int) []byte {
</s> add func itob(v uint64) []byte { </s> remove func unitName(id int) []byte {
return itob(id)
</s> add func unitName(id uint32) []byte {
return itob(uint64(id)) </s> remove func newUnitID() int {
return int(time.Now().Unix() / (60 * 60))
</s> add func newUnitID() uint32 {
return uint32(time.Now().Unix() / (60 * 60)) </s> remove func New(filename string, limit int, unitID unitIDCallback) (Stats, error) {
</s> add func New(filename string, limit uint32, unitID unitIDCallback) (Stats, error) { </s> remove type unitIDCallback func() int
</s> add type unitIDCallback func() uint32 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> log.Tracef("periodicFlush() exited")
<mask> }
<mask>
<mask> // Delete unit's data from file
<mask> func (s *statsCtx) deleteUnit(tx *bolt.Tx, id int) bool {
<mask> err := tx.DeleteBucket(unitName(id))
<mask> if err != nil {
<mask> log.Tracef("bolt DeleteBucket: %s", err)
<mask> return false
<mask> }
</s> * stats: use uint32 or uint64 integer values, not int </s> remove func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id int, udb *unitDB) bool {
</s> add func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id uint32, udb *unitDB) bool { </s> remove config.stats, err = stats.New(filepath.Join(baseDir, "stats.db"), int(config.DNS.StatsInterval), nil)
</s> add statsDBFilename := filepath.Join(baseDir, "stats.db")
config.stats, err = stats.New(statsDBFilename, config.DNS.StatsInterval, nil) </s> remove func (s *statsCtx) loadUnitFromDB(tx *bolt.Tx, id int) *unitDB {
</s> add func (s *statsCtx) loadUnitFromDB(tx *bolt.Tx, id uint32) *unitDB { </s> remove id := btoi(name)
</s> add id := uint32(btoi(name)) </s> remove func UIntArrayEquals(a []uint, b []uint) bool {
</s> add func UIntArrayEquals(a []uint64, b []uint64) bool { </s> remove s.limit = limit * 24
</s> add s.limit = uint32(limit) * 24 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep replace keep keep keep keep replace keep keep keep keep | <mask>
<mask> func convertMapToArray(m map[string]int, max int) []countPair {
<mask> a := []countPair{}
<mask> for k, v := range m {
<mask> pair := countPair{}
<mask> pair.Name = k
<mask> pair.Count = uint(v)
<mask> a = append(a, pair)
<mask> }
<mask> less := func(i, j int) bool {
<mask> if a[i].Count >= a[j].Count {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove func convertTopArray(a []countPair) []map[string]uint {
m := []map[string]uint{}
</s> add func convertTopArray(a []countPair) []map[string]uint64 {
m := []map[string]uint64{} </s> remove ent := map[string]uint{}
</s> add ent := map[string]uint64{} </s> remove m[it.Name] = int(it.Count)
</s> add m[it.Name] = it.Count </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a = []uint{}
</s> add a = []uint64{} | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep replace replace keep replace keep keep keep keep | <mask>
<mask> func convertArrayToMap(a []countPair) map[string]int {
<mask> m := map[string]int{}
<mask> for _, it := range a {
<mask> m[it.Name] = int(it.Count)
<mask> }
<mask> return m
<mask> }
<mask>
</s> * stats: use uint32 or uint64 integer values, not int </s> remove m := map[string]int{}
</s> add m := map[string]uint64{} </s> remove m = map[string]int{}
</s> add m = map[string]uint64{} </s> remove m = map[string]int{}
</s> add m = map[string]uint64{} </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep replace keep replace keep keep | <mask>
<mask> func serialize(u *unit) *unitDB {
<mask> udb := unitDB{}
<mask> udb.NTotal = uint(u.nTotal)
<mask> for _, it := range u.nResult {
<mask> udb.NResult = append(udb.NResult, uint(it))
<mask> }
<mask> if u.nTotal != 0 {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove u.nTotal = int(udb.NTotal)
</s> add u.nTotal = udb.NTotal </s> remove udb.TimeAvg = uint(u.timeSum / u.nTotal)
</s> add udb.TimeAvg = uint32(u.timeSum / u.nTotal) </s> remove m[it.Name] = int(it.Count)
</s> add m[it.Name] = it.Count </s> remove sum.NResult = make([]uint, rLast)
</s> add </s> remove func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id int, udb *unitDB) bool {
</s> add func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id uint32, udb *unitDB) bool { | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> for _, it := range u.nResult {
<mask> udb.NResult = append(udb.NResult, uint(it))
<mask> }
<mask> if u.nTotal != 0 {
<mask> udb.TimeAvg = uint(u.timeSum / u.nTotal)
<mask> }
<mask> udb.Domains = convertMapToArray(u.domains, maxDomains)
<mask> udb.BlockedDomains = convertMapToArray(u.blockedDomains, maxDomains)
<mask> udb.Clients = convertMapToArray(u.clients, maxClients)
<mask> return &udb
</s> * stats: use uint32 or uint64 integer values, not int </s> remove udb.NResult = append(udb.NResult, uint(it))
</s> add udb.NResult = append(udb.NResult, it) </s> remove udb.NTotal = uint(u.nTotal)
</s> add udb.NTotal = u.nTotal </s> remove u.nTotal = int(udb.NTotal)
</s> add u.nTotal = udb.NTotal </s> remove m = map[string]int{}
</s> add m = map[string]uint64{} </s> remove m = map[string]int{}
</s> add m = map[string]uint64{} </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return &udb
<mask> }
<mask>
<mask> func deserialize(u *unit, udb *unitDB) {
<mask> u.nTotal = int(udb.NTotal)
<mask> for _, it := range udb.NResult {
<mask> u.nResult = append(u.nResult, int(it))
<mask> }
<mask> u.domains = convertArrayToMap(udb.Domains)
<mask> u.blockedDomains = convertArrayToMap(udb.BlockedDomains)
</s> * stats: use uint32 or uint64 integer values, not int </s> remove u.timeSum = int(udb.TimeAvg) * u.nTotal
</s> add u.timeSum = uint64(udb.TimeAvg) * u.nTotal </s> remove udb.NTotal = uint(u.nTotal)
</s> add udb.NTotal = u.nTotal </s> remove udb.NResult = append(udb.NResult, uint(it))
</s> add udb.NResult = append(udb.NResult, it) </s> remove udb.TimeAvg = uint(u.timeSum / u.nTotal)
</s> add udb.TimeAvg = uint32(u.timeSum / u.nTotal) </s> remove u.nResult = make([]int, rLast)
u.domains = make(map[string]int)
u.blockedDomains = make(map[string]int)
u.clients = make(map[string]int)
</s> add u.nResult = make([]uint64, rLast)
u.domains = make(map[string]uint64)
u.blockedDomains = make(map[string]uint64)
u.clients = make(map[string]uint64) </s> remove func (s *statsCtx) initUnit(u *unit, id int) {
</s> add func (s *statsCtx) initUnit(u *unit, id uint32) { | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep replace keep keep replace | <mask> u.blockedDomains = convertArrayToMap(udb.BlockedDomains)
<mask> u.clients = convertArrayToMap(udb.Clients)
<mask> u.timeSum = int(udb.TimeAvg) * u.nTotal
<mask> }
<mask>
<mask> func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id int, udb *unitDB) bool {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove u.nTotal = int(udb.NTotal)
</s> add u.nTotal = udb.NTotal </s> remove func (s *statsCtx) initUnit(u *unit, id int) {
</s> add func (s *statsCtx) initUnit(u *unit, id uint32) { </s> remove u.nResult = make([]int, rLast)
u.domains = make(map[string]int)
u.blockedDomains = make(map[string]int)
u.clients = make(map[string]int)
</s> add u.nResult = make([]uint64, rLast)
u.domains = make(map[string]uint64)
u.blockedDomains = make(map[string]uint64)
u.clients = make(map[string]uint64) </s> remove func (s *statsCtx) deleteUnit(tx *bolt.Tx, id int) bool {
</s> add func (s *statsCtx) deleteUnit(tx *bolt.Tx, id uint32) bool { </s> remove s.limit = limit * 24
</s> add s.limit = uint32(limit) * 24 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> return true
<mask> }
<mask>
<mask> func (s *statsCtx) loadUnitFromDB(tx *bolt.Tx, id int) *unitDB {
<mask> bkt := tx.Bucket(unitName(id))
<mask> if bkt == nil {
<mask> return nil
<mask> }
<mask>
</s> * stats: use uint32 or uint64 integer values, not int </s> remove func (s *statsCtx) deleteUnit(tx *bolt.Tx, id int) bool {
</s> add func (s *statsCtx) deleteUnit(tx *bolt.Tx, id uint32) bool { </s> remove func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id int, udb *unitDB) bool {
</s> add func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id uint32, udb *unitDB) bool { </s> remove s.limit = limit * 24
</s> add s.limit = uint32(limit) * 24 </s> remove func (s *statsCtx) initUnit(u *unit, id int) {
</s> add func (s *statsCtx) initUnit(u *unit, id uint32) { </s> remove func newUnitID() int {
return int(time.Now().Unix() / (60 * 60))
</s> add func newUnitID() uint32 {
return uint32(time.Now().Unix() / (60 * 60)) </s> remove func convertMapToArray(m map[string]int, max int) []countPair {
</s> add func convertMapToArray(m map[string]uint64, max int) []countPair { | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep replace replace keep replace keep keep keep keep | <mask> }
<mask>
<mask> func convertTopArray(a []countPair) []map[string]uint {
<mask> m := []map[string]uint{}
<mask> for _, it := range a {
<mask> ent := map[string]uint{}
<mask> ent[it.Name] = it.Count
<mask> m = append(m, ent)
<mask> }
<mask> return m
</s> * stats: use uint32 or uint64 integer values, not int </s> remove m[it.Name] = int(it.Count)
</s> add m[it.Name] = it.Count </s> remove func convertArrayToMap(a []countPair) map[string]int {
m := map[string]int{}
</s> add func convertArrayToMap(a []countPair) map[string]uint64 {
m := map[string]uint64{} </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func (s *statsCtx) Configure(limit int) {
<mask> if limit < 0 {
<mask> return
<mask> }
<mask> s.limit = limit * 24
<mask> log.Debug("Stats: set limit: %d", limit)
<mask> }
<mask>
<mask> func (s *statsCtx) Close() {
<mask> u := s.swapUnit(nil)
</s> * stats: use uint32 or uint64 integer values, not int </s> remove func (s *statsCtx) loadUnitFromDB(tx *bolt.Tx, id int) *unitDB {
</s> add func (s *statsCtx) loadUnitFromDB(tx *bolt.Tx, id uint32) *unitDB { </s> remove func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id int, udb *unitDB) bool {
</s> add func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id uint32, udb *unitDB) bool { </s> remove func (s *statsCtx) initUnit(u *unit, id int) {
</s> add func (s *statsCtx) initUnit(u *unit, id uint32) { </s> remove func newUnitID() int {
return int(time.Now().Unix() / (60 * 60))
</s> add func newUnitID() uint32 {
return uint32(time.Now().Unix() / (60 * 60)) </s> remove func (s *statsCtx) deleteUnit(tx *bolt.Tx, id int) bool {
</s> add func (s *statsCtx) deleteUnit(tx *bolt.Tx, id uint32) bool { </s> remove u.timeSum = int(udb.TimeAvg) * u.nTotal
</s> add u.timeSum = uint64(udb.TimeAvg) * u.nTotal | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> u.blockedDomains[e.Domain]++
<mask> }
<mask>
<mask> u.clients[client]++
<mask> u.timeSum += int(e.Time)
<mask> u.nTotal++
<mask> s.unitLock.Unlock()
<mask> }
<mask>
<mask> /* Algorithm:
</s> * stats: use uint32 or uint64 integer values, not int </s> remove u.timeSum = int(udb.TimeAvg) * u.nTotal
</s> add u.timeSum = uint64(udb.TimeAvg) * u.nTotal </s> remove func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id int, udb *unitDB) bool {
</s> add func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id uint32, udb *unitDB) bool { </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m = map[string]int{}
</s> add m = map[string]uint64{} | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> for i := firstID; i != lastID; i++ {
<mask> u := s.loadUnitFromDB(tx, i)
<mask> if u == nil {
<mask> u = &unitDB{}
<mask> u.NResult = make([]uint, rLast)
<mask> }
<mask> units = append(units, u)
<mask> }
<mask>
<mask> _ = tx.Rollback()
</s> * stats: use uint32 or uint64 integer values, not int </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> units = units[1:]
<mask> }
<mask> units = append(units, cu)
<mask>
<mask> if len(units) != s.limit {
<mask> log.Fatalf("len(units) != s.limit: %d %d", len(units), s.limit)
<mask> }
<mask>
<mask> // per time unit counters:
<mask>
</s> * stats: use uint32 or uint64 integer values, not int </s> remove if len(a) != s.limit/24 {
</s> add if len(a) != int(s.limit/24) { </s> remove u.NResult = make([]uint, rLast)
</s> add u.NResult = make([]uint64, rLast) </s> remove s.limit = limit * 24
</s> add s.limit = uint32(limit) * 24 </s> remove m := map[string]int{}
</s> add m := map[string]uint64{} </s> remove sum.NResult = make([]uint, rLast)
</s> add </s> remove func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id int, udb *unitDB) bool {
</s> add func (s *statsCtx) flushUnitToDB(tx *bolt.Tx, id uint32, udb *unitDB) bool { | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // 720 hours may span 31 days, so we skip data for the first day in this case
<mask> firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
<mask>
<mask> a := []uint{}
<mask> if timeUnit == Hours {
<mask> for _, u := range units {
<mask> a = append(a, u.NTotal)
<mask> }
<mask> } else {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove var sum uint
</s> add var sum uint64 </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep replace keep keep keep | <mask> for _, u := range units {
<mask> a = append(a, u.NTotal)
<mask> }
<mask> } else {
<mask> var sum uint
<mask> id := firstDayID
<mask> nextDayID := firstDayID + 24
<mask> for i := firstDayID - firstID; i != len(units); i++ {
<mask> sum += units[i].NTotal
<mask> if id == nextDayID {
<mask> a = append(a, sum)
</s> * stats: use uint32 or uint64 integer values, not int </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> if id < nextDayID {
<mask> a = append(a, sum)
<mask> }
<mask> if len(a) != s.limit/24 {
<mask> log.Fatalf("len(a) != s.limit: %d %d", len(a), s.limit)
<mask> }
<mask> }
<mask> d["dns_queries"] = a
<mask>
</s> * stats: use uint32 or uint64 integer values, not int </s> remove if len(units) != s.limit {
</s> add if len(units) != int(s.limit) { </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask> d["dns_queries"] = a
<mask>
<mask> a = []uint{}
<mask> if timeUnit == Hours {
<mask> for _, u := range units {
<mask> a = append(a, u.NResult[RFiltered])
<mask> }
<mask> } else {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a := []uint{}
</s> add a := []uint64{} </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep replace keep keep replace keep keep keep keep | <mask> a = append(a, u.NResult[RFiltered])
<mask> }
<mask> } else {
<mask> var sum uint
<mask> id := firstDayID
<mask> nextDayID := firstDayID + 24
<mask> for i := firstDayID - firstID; i != len(units); i++ {
<mask> sum += units[i].NResult[RFiltered]
<mask> if id == nextDayID {
<mask> a = append(a, sum)
<mask> sum = 0
</s> * stats: use uint32 or uint64 integer values, not int </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask> d["blocked_filtering"] = a
<mask>
<mask> a = []uint{}
<mask> if timeUnit == Hours {
<mask> for _, u := range units {
<mask> a = append(a, u.NResult[RSafeBrowsing])
<mask> }
<mask> } else {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a := []uint{}
</s> add a := []uint64{} </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep replace keep keep replace keep keep | <mask> a = append(a, u.NResult[RSafeBrowsing])
<mask> }
<mask> } else {
<mask> var sum uint
<mask> id := firstDayID
<mask> nextDayID := firstDayID + 24
<mask> for i := firstDayID - firstID; i != len(units); i++ {
<mask> sum += units[i].NResult[RSafeBrowsing]
<mask> if id == nextDayID {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask> d["replaced_safebrowsing"] = a
<mask>
<mask> a = []uint{}
<mask> if timeUnit == Hours {
<mask> for _, u := range units {
<mask> a = append(a, u.NResult[RParental])
<mask> }
<mask> } else {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a := []uint{}
</s> add a := []uint64{} </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep replace keep keep replace keep keep | <mask> }
<mask> } else {
<mask> var sum uint
<mask> id := firstDayID
<mask> nextDayID := firstDayID + 24
<mask> for i := firstDayID - firstID; i != len(units); i++ {
<mask> sum += units[i].NResult[RParental]
<mask> if id == nextDayID {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep replace keep keep replace keep keep keep | <mask>
<mask> // top counters:
<mask>
<mask> m := map[string]int{}
<mask> for _, u := range units {
<mask> for _, it := range u.Domains {
<mask> m[it.Name] += int(it.Count)
<mask> }
<mask> }
<mask> a2 := convertMapToArray(m, maxDomains)
</s> * stats: use uint32 or uint64 integer values, not int </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m = map[string]int{}
</s> add m = map[string]uint64{} </s> remove m = map[string]int{}
</s> add m = map[string]uint64{} </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m[it.Name] = int(it.Count)
</s> add m[it.Name] = it.Count | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep replace keep keep replace keep | <mask> a2 := convertMapToArray(m, maxDomains)
<mask> d["top_queried_domains"] = convertTopArray(a2)
<mask>
<mask> m = map[string]int{}
<mask> for _, u := range units {
<mask> for _, it := range u.BlockedDomains {
<mask> m[it.Name] += int(it.Count)
<mask> }
</s> * stats: use uint32 or uint64 integer values, not int </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m = map[string]int{}
</s> add m = map[string]uint64{} </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m := map[string]int{}
</s> add m := map[string]uint64{} </s> remove m[it.Name] = int(it.Count)
</s> add m[it.Name] = it.Count | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep replace keep keep replace keep keep keep | <mask> a2 = convertMapToArray(m, maxDomains)
<mask> d["top_blocked_domains"] = convertTopArray(a2)
<mask>
<mask> m = map[string]int{}
<mask> for _, u := range units {
<mask> for _, it := range u.Clients {
<mask> m[it.Name] += int(it.Count)
<mask> }
<mask> }
<mask> a2 = convertMapToArray(m, maxClients)
</s> * stats: use uint32 or uint64 integer values, not int </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m = map[string]int{}
</s> add m = map[string]uint64{} </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove m := map[string]int{}
</s> add m := map[string]uint64{} </s> remove m[it.Name] = int(it.Count)
</s> add m[it.Name] = it.Count | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep add keep keep keep keep | <mask>
<mask> // total counters:
<mask>
<mask> sum := unitDB{}
<mask> timeN := 0
<mask> for _, u := range units {
<mask> sum.NTotal += u.NTotal
<mask> sum.TimeAvg += u.TimeAvg
</s> * stats: use uint32 or uint64 integer values, not int </s> remove sum.NResult = make([]uint, rLast)
</s> add </s> remove m := map[string]int{}
</s> add m := map[string]uint64{} </s> remove m[it.Name] += int(it.Count)
</s> add m[it.Name] += it.Count </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 </s> remove var sum uint
</s> add var sum uint64 | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // total counters:
<mask>
<mask> sum := unitDB{}
<mask> timeN := 0
<mask> sum.NResult = make([]uint, rLast)
<mask> for _, u := range units {
<mask> sum.NTotal += u.NTotal
<mask> sum.TimeAvg += u.TimeAvg
<mask> if u.TimeAvg != 0 {
<mask> timeN++
</s> * stats: use uint32 or uint64 integer values, not int </s> add sum.NResult = make([]uint64, rLast) </s> remove m := map[string]int{}
</s> add m := map[string]uint64{} </s> remove u.NResult = make([]uint, rLast)
</s> add u.NResult = make([]uint64, rLast) </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { </s> remove for i := firstDayID - firstID; i != len(units); i++ {
</s> add for i := firstDayID - firstID; int(i) != len(units); i++ { | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> d["num_replaced_parental"] = sum.NResult[RParental]
<mask>
<mask> avgTime := float64(0)
<mask> if timeN != 0 {
<mask> avgTime = float64(sum.TimeAvg/uint(timeN)) / 1000000
<mask> }
<mask> d["avg_processing_time"] = avgTime
<mask>
<mask> d["time_units"] = "hours"
<mask> if timeUnit == Days {
</s> * stats: use uint32 or uint64 integer values, not int </s> remove udb.TimeAvg = uint(u.timeSum / u.nTotal)
</s> add udb.TimeAvg = uint32(u.timeSum / u.nTotal) </s> remove udb.NTotal = uint(u.nTotal)
</s> add udb.NTotal = u.nTotal </s> remove udb.NResult = append(udb.NResult, uint(it))
</s> add udb.NResult = append(udb.NResult, it) </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a = []uint{}
</s> add a = []uint64{} </s> remove a = []uint{}
</s> add a = []uint64{} | https://github.com/AdguardTeam/AdGuardHome/commit/04e2566e9e968f299e134e812ca88d24073de9ff | stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "blocking_mode_refused": "REFUSED: Antwoorden met REFUSED code",
<mask> "blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
<mask> "blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
<mask> "blocking_mode_custom_ip": "Aangepast IP: Reageer met een handmatige ingesteld IP adres",
<mask> "theme_auto": "Auto",
<mask> "theme_light": "Licht",
<mask> "theme_dark": "Donker",
<mask> "upstream_dns_client_desc": "Indien je dit veld leeglaat zal AdGuard Home de servers welke zijn ingesteld in de <0>DNS instellingen</0> gebruiken.",
<mask> "tracker_source": "Bron volger",
<mask> "source_label": "Bron",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add "version_request_error": "Updatecontrole mislukt. Controleer je internetverbinding.", </s> remove github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
</s> add </s> add github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= </s> remove github.com/lucas-clemente/quic-go v0.31.0 h1:MfNp3fk0wjWRajw6quMFA3ap1AVtlU+2mtwmbVogB2M=
github.com/lucas-clemente/quic-go v0.31.0/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g=
</s> add github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4=
github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g= </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its=
github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE=
github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= </s> remove github.com/mdlayher/netlink v1.1.2-0.20201013204415-ded538f7f4be/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
github.com/mdlayher/packet v1.0.0 h1:InhZJbdShQYt6XV2GPj5XHxChzOfhJJOMbvnGAmOfQ8=
</s> add github.com/mdlayher/netlink v1.7.1 h1:FdUaT/e33HjEXagwELR8R3/KL1Fq5x3G5jgHLp/BTmg=
github.com/mdlayher/netlink v1.7.1/go.mod h1:nKO5CSjE/DJjVhk/TNp6vCE1ktVxEA8VEh8drhZzxsQ= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | client/src/__locales/nl.json |
keep keep add keep keep keep keep keep | <mask> "updates_checked": "Een nieuwe versie van AdGuard Home is beschikbaar\n",
<mask> "updates_version_equal": "AdGuard Home is actueel",
<mask> "check_updates_now": "Controleer op updates",
<mask> "dns_privacy": "DNS Privacy",
<mask> "setup_dns_privacy_1": "<0>DNS-via-TLS:</0> Gebruik <1>{{address}}</1> string.",
<mask> "setup_dns_privacy_2": "<0>DNS-via-HTTPS:</0> Gebruik <1>{{address}}</1> string.",
<mask> "setup_dns_privacy_3": "<0>Hou er rekening mee dat het beveiligde DNS protocol alleen beschikbaar is voor Android 9. U moet dus extra software installeren voor andere besturingssystemen.</0><0>Hier is een lijst van te gebruiken software.</0>",
<mask> "setup_dns_privacy_4": "Op een iOS 14 of macOS Big Sur apparaat kan je een speciaal '.mobileconfig'-bestand downloaden dat <highlight>DNS-via-HTTPS</highlight> of <highlight>DNS-via-TLS</highlight> servers aan de DNS-instellingen toevoegt.",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove "theme_auto": "Auto",
</s> add "theme_auto": "Automatisch", </s> remove github.com/AdguardTeam/dnsproxy v0.46.5
</s> add // TODO(a.garipov): Return to a tagged version once DNS64 is in.
github.com/AdguardTeam/dnsproxy v0.46.6-0.20230125113741-98cb8a899e49 </s> remove github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c
</s> add github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 </s> add // nolint:looppointer // The subsilce is used for a safe cache lookup. </s> remove github.com/lucas-clemente/quic-go v0.31.0
</s> add github.com/lucas-clemente/quic-go v0.31.1 </s> remove github.com/mdlayher/netlink v1.6.2
</s> add github.com/mdlayher/netlink v1.7.1 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | client/src/__locales/nl.json |
keep add keep keep keep keep keep keep | <mask> "12": "extensions",
<mask> "13": "email",
<mask> "101": "mobile_analytics"
<mask> },
<mask> "trackers": {
<mask> "akamai_technologies": {
<mask> "name": "Akamai Technologies",
<mask> "categoryId": 9,
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add "||vocalodon.net^", </s> add "||mask-canary.icloud.com^$dnsrewrite=NXDOMAIN;;", </s> remove prefix := hash[0:2]
if !bytes.Equal(prefix, prevPrefix) {
</s> add // nolint:looppointer // The subsilce is used for a safe comparison.
if !bytes.Equal(hash[0:2], prevPrefix) { </s> remove key := k[0:2]
val := c.cache.Get(key)
</s> add // nolint:looppointer // The subsilce is used for a safe cache lookup.
val := c.cache.Get(k[0:2]) </s> remove // TODO(e.burkov, a.garipov): Find out and document why exactly
// this slice.
</s> add // nolint:looppointer // The subsilce is used for safe hex encoding. </s> add // nolint:looppointer // The subsilce is used for a safe cache lookup. | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | client/src/helpers/trackers/adguard.json |
keep keep keep add keep keep keep keep | <mask> "trackerDomains": {
<mask> "akadns.net": "akamai_technologies",
<mask> "akamaiedge.net": "akamai_technologies",
<mask> "apple.com": "apple",
<mask> "apple-dns.net": "apple",
<mask> "aaplimg.com": "apple",
<mask> "icloud.com": "apple",
<mask> "mzstatic.com": "apple",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove prefix := hash[0:2]
if !bytes.Equal(prefix, prevPrefix) {
</s> add // nolint:looppointer // The subsilce is used for a safe comparison.
if !bytes.Equal(hash[0:2], prevPrefix) { </s> add "14": "consent",
"15": "telemetry", </s> remove key := k[0:2]
val := c.cache.Get(key)
</s> add // nolint:looppointer // The subsilce is used for a safe cache lookup.
val := c.cache.Get(k[0:2]) </s> remove // TODO(e.burkov, a.garipov): Find out and document why exactly
// this slice.
</s> add // nolint:looppointer // The subsilce is used for safe hex encoding. </s> add // nolint:looppointer // The subsilce is used for a safe cache lookup. </s> add "||vocalodon.net^", | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | client/src/helpers/trackers/adguard.json |
keep keep replace keep replace keep | <mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.46.5
<mask> github.com/AdguardTeam/golibs v0.11.4
<mask> github.com/AdguardTeam/urlfilter v0.16.0
<mask> github.com/NYTimes/gziphandler v1.1.1
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/AdguardTeam/urlfilter v0.16.0 h1:IO29m+ZyQuuOnPLTzHuXj35V1DZOp1Dcryl576P2syg=
github.com/AdguardTeam/urlfilter v0.16.0/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
</s> add github.com/AdguardTeam/urlfilter v0.16.1 h1:ZPi0rjqo8cQf2FVdzo6cqumNoHZx2KPXj2yZa1A5BBw=
github.com/AdguardTeam/urlfilter v0.16.1/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI= </s> remove github.com/AdguardTeam/dnsproxy v0.46.5 h1:TiJZhwaIDDaKkqEfJ9AD9aroFjcHN8oEbKB8WfTjSIs=
github.com/AdguardTeam/dnsproxy v0.46.5/go.mod h1:yKBVgFlE6CqTQtye++3e7SATaMPc4Ixij+KkHsM6HhM=
</s> add github.com/AdguardTeam/dnsproxy v0.46.6-0.20230125113741-98cb8a899e49 h1:TDZsKB8BrKA2na6p5l20BvEu3MmgOWhIfTANz5laFuE=
github.com/AdguardTeam/dnsproxy v0.46.6-0.20230125113741-98cb8a899e49/go.mod h1:ZEkTmTJ2XInT3aVy0mHtEnSWSclpHHj/9hfNXDuAk5k= </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 </s> remove github.com/gordonklaus/ineffassign v0.0.0-20220928193011-d2c82e48359b
github.com/kisielk/errcheck v1.6.2
github.com/kyoh86/looppointer v0.1.9
</s> add github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28
github.com/kisielk/errcheck v1.6.3
github.com/kyoh86/looppointer v0.2.1 </s> add github.com/mdlayher/packet v1.1.1 h1:7Fv4OEMYqPl7//uBm04VgPpnSNi8fbBZznppgh6WMr8=
github.com/mdlayher/packet v1.1.1/go.mod h1:DRvYY5mH4M4lUqAnMg04E60U4fjUKMZ/4g2cHElZkKo= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.mod |
keep keep keep keep replace keep replace keep | <mask> github.com/google/go-cmp v0.5.9
<mask> github.com/google/gopacket v1.1.19
<mask> github.com/google/renameio v1.0.1
<mask> github.com/google/uuid v1.3.0
<mask> github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c
<mask> github.com/kardianos/service v1.2.2
<mask> github.com/lucas-clemente/quic-go v0.31.0
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
</s> add github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f h1:gl1DCiSk+mrXXBGPm6CEeS2MkJuMVzAOrXg34oVj1QI=
github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= </s> remove github.com/mdlayher/netlink v1.6.2
</s> add github.com/mdlayher/netlink v1.7.1 </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its=
github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE=
github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= </s> remove github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c h1:OCFM4+DXTWfNlyeoddrTwdup/ztkGSyAMR2UGcPckNQ=
github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 h1:Z72DOke2yOK0Ms4Z2LK1E1OrRJXOxSj5DllTz2FYTRg=
github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8/go.mod h1:m5WMe03WCvWcXjRnhvaAbAAXdCnu20J5P+mmH44ZzpE= </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.mod |
keep keep keep keep replace keep keep keep keep replace replace replace replace replace replace replace | <mask> github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c
<mask> github.com/kardianos/service v1.2.2
<mask> github.com/lucas-clemente/quic-go v0.31.0
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
<mask> github.com/mdlayher/netlink v1.6.2
<mask> // TODO(a.garipov): This package is deprecated; find a new one or use
<mask> // our own code for that. Perhaps, use gopacket.
<mask> github.com/mdlayher/raw v0.1.0
<mask> github.com/miekg/dns v1.1.50
<mask> github.com/stretchr/testify v1.8.0
<mask> github.com/ti-mo/netfilter v0.4.0
<mask> go.etcd.io/bbolt v1.3.6
<mask> golang.org/x/crypto v0.1.0
<mask> golang.org/x/exp v0.0.0-20221106115401-f9659909a136
<mask> golang.org/x/net v0.4.0
<mask> golang.org/x/sys v0.3.0
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/lucas-clemente/quic-go v0.31.0
</s> add github.com/lucas-clemente/quic-go v0.31.1 </s> remove github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c
</s> add github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 </s> remove golang.org/x/sys v0.2.0 // indirect
</s> add golang.org/x/sys v0.4.0 // indirect </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its=
github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE=
github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= </s> remove github.com/mdlayher/socket v0.2.3 h1:XZA2X2TjdOwNoNPVPclRCURoX/hokBY8nkTmRZFEheM=
github.com/mdlayher/socket v0.2.3/go.mod h1:bz12/FozYNH/VbvC3q7TRIK/Y6dH1kCKsXaUeXi/FmY=
</s> add github.com/mdlayher/socket v0.4.0 h1:280wsy40IC9M9q1uPGcLBwXpcTQDtoGwVt+BNoITxIw=
github.com/mdlayher/socket v0.4.0/go.mod h1:xxFqz5GRCUN3UEOm9CZqEJsAbe1C8OwSK46NlmWuVoc= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.mod |
keep keep keep keep replace replace keep replace replace replace replace replace keep keep keep keep | <mask> github.com/bluele/gcache v0.0.2 // indirect
<mask> github.com/davecgh/go-spew v1.1.1 // indirect
<mask> github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
<mask> github.com/golang/mock v1.6.0 // indirect
<mask> github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
<mask> github.com/josharian/native v1.0.0 // indirect
<mask> github.com/marten-seemann/qpack v0.3.0 // indirect
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
<mask> github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
<mask> github.com/mdlayher/packet v1.0.0 // indirect
<mask> github.com/mdlayher/socket v0.2.3 // indirect
<mask> github.com/onsi/ginkgo/v2 v2.5.0 // indirect
<mask> github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
<mask> github.com/pkg/errors v0.9.1 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
golang.org/x/mod v0.6.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect </s> remove golang.org/x/text v0.5.0 // indirect
golang.org/x/tools v0.2.0 // indirect
</s> add golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect </s> remove golang.org/x/exp v0.0.0-20221106115401-f9659909a136 // indirect
golang.org/x/exp/typeparams v0.0.0-20221106115401-f9659909a136 // indirect
golang.org/x/mod v0.6.0 // indirect
</s> add golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/mod v0.7.0 // indirect </s> remove golang.org/x/sys v0.2.0 // indirect
</s> add golang.org/x/sys v0.4.0 // indirect </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.mod |
keep keep replace replace keep replace replace | <mask> github.com/pkg/errors v0.9.1 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
<mask> golang.org/x/mod v0.6.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/text v0.5.0 // indirect
<mask> golang.org/x/tools v0.2.0 // indirect
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
github.com/mdlayher/packet v1.0.0 // indirect
github.com/mdlayher/socket v0.2.3 // indirect
github.com/onsi/ginkgo/v2 v2.5.0 // indirect
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
github.com/mdlayher/packet v1.1.1 // indirect
github.com/mdlayher/socket v0.4.0 // indirect
github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> remove golang.org/x/sys v0.2.0 // indirect
</s> add golang.org/x/sys v0.4.0 // indirect </s> remove golang.org/x/exp v0.0.0-20221106115401-f9659909a136 // indirect
golang.org/x/exp/typeparams v0.0.0-20221106115401-f9659909a136 // indirect
golang.org/x/mod v0.6.0 // indirect
</s> add golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/mod v0.7.0 // indirect </s> remove github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/josharian/native v1.0.0 // indirect
</s> add github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
github.com/josharian/native v1.1.0 // indirect </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.mod |
replace replace keep keep keep keep keep | <mask> github.com/AdguardTeam/dnsproxy v0.46.5 h1:TiJZhwaIDDaKkqEfJ9AD9aroFjcHN8oEbKB8WfTjSIs=
<mask> github.com/AdguardTeam/dnsproxy v0.46.5/go.mod h1:yKBVgFlE6CqTQtye++3e7SATaMPc4Ixij+KkHsM6HhM=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.11.4 h1:IltyvxwCTN+xxJF5sh6VadF8Zfbf8elgCm9dgijSVzM=
<mask> github.com/AdguardTeam/golibs v0.11.4/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/AdguardTeam/urlfilter v0.16.0 h1:IO29m+ZyQuuOnPLTzHuXj35V1DZOp1Dcryl576P2syg=
github.com/AdguardTeam/urlfilter v0.16.0/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
</s> add github.com/AdguardTeam/urlfilter v0.16.1 h1:ZPi0rjqo8cQf2FVdzo6cqumNoHZx2KPXj2yZa1A5BBw=
github.com/AdguardTeam/urlfilter v0.16.1/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI= </s> remove github.com/AdguardTeam/urlfilter v0.16.0
</s> add github.com/AdguardTeam/urlfilter v0.16.1 </s> remove github.com/AdguardTeam/dnsproxy v0.46.5
</s> add // TODO(a.garipov): Return to a tagged version once DNS64 is in.
github.com/AdguardTeam/dnsproxy v0.46.6-0.20230125113741-98cb8a899e49 </s> remove github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
</s> add </s> remove golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove github.com/ti-mo/netfilter v0.4.0 h1:rTN1nBYULDmMfDeBHZpKuNKX/bWEXQUhe02a/10orzg=
github.com/ti-mo/netfilter v0.4.0/go.mod h1:V54q75mUx8CNA2JnFl+wv9iZ5+JP9nCcRlaFS5OZSRM=
</s> add github.com/ti-mo/netfilter v0.5.0 h1:MZmsUw5bFRecOb0AeyjOPxTHg4UxYzyEs0Ek/6Lxoy8=
github.com/ti-mo/netfilter v0.5.0/go.mod h1:nt+8B9hx/QpqHr7Hazq+2qMCCA8u2OTkyc/7+U9ARz8= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.11.4 h1:IltyvxwCTN+xxJF5sh6VadF8Zfbf8elgCm9dgijSVzM=
<mask> github.com/AdguardTeam/golibs v0.11.4/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
<mask> github.com/AdguardTeam/urlfilter v0.16.0 h1:IO29m+ZyQuuOnPLTzHuXj35V1DZOp1Dcryl576P2syg=
<mask> github.com/AdguardTeam/urlfilter v0.16.0/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
<mask> github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
<mask> github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
<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=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/AdguardTeam/dnsproxy v0.46.5 h1:TiJZhwaIDDaKkqEfJ9AD9aroFjcHN8oEbKB8WfTjSIs=
github.com/AdguardTeam/dnsproxy v0.46.5/go.mod h1:yKBVgFlE6CqTQtye++3e7SATaMPc4Ixij+KkHsM6HhM=
</s> add github.com/AdguardTeam/dnsproxy v0.46.6-0.20230125113741-98cb8a899e49 h1:TDZsKB8BrKA2na6p5l20BvEu3MmgOWhIfTANz5laFuE=
github.com/AdguardTeam/dnsproxy v0.46.6-0.20230125113741-98cb8a899e49/go.mod h1:ZEkTmTJ2XInT3aVy0mHtEnSWSclpHHj/9hfNXDuAk5k= </s> remove github.com/AdguardTeam/urlfilter v0.16.0
</s> add github.com/AdguardTeam/urlfilter v0.16.1 </s> remove github.com/AdguardTeam/dnsproxy v0.46.5
</s> add // TODO(a.garipov): Return to a tagged version once DNS64 is in.
github.com/AdguardTeam/dnsproxy v0.46.6-0.20230125113741-98cb8a899e49 </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 </s> remove github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
</s> add </s> add github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 h1:0b2vaepXIfMsG++IsjHiI2p4bxALD1Y2nQKGMR5zDQM=
<mask> github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
<mask> github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
<mask> github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
<mask> github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
<mask> github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
<mask> github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
<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=
<mask> github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
<mask> github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
<mask> github.com/digineo/go-ipset/v2 v2.2.1 h1:k6skY+0fMqeUjjeWO/m5OuWPSZUAn7AucHMnQ1MX77g=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/josharian/native v1.0.0 // indirect
</s> add github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
github.com/josharian/native v1.1.0 // indirect </s> remove github.com/AdguardTeam/urlfilter v0.16.0
</s> add github.com/AdguardTeam/urlfilter v0.16.1 </s> remove github.com/AdguardTeam/dnsproxy v0.46.5
</s> add // TODO(a.garipov): Return to a tagged version once DNS64 is in.
github.com/AdguardTeam/dnsproxy v0.46.6-0.20230125113741-98cb8a899e49 </s> remove github.com/AdguardTeam/urlfilter v0.16.0 h1:IO29m+ZyQuuOnPLTzHuXj35V1DZOp1Dcryl576P2syg=
github.com/AdguardTeam/urlfilter v0.16.0/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI=
</s> add github.com/AdguardTeam/urlfilter v0.16.1 h1:ZPi0rjqo8cQf2FVdzo6cqumNoHZx2KPXj2yZa1A5BBw=
github.com/AdguardTeam/urlfilter v0.16.1/go.mod h1:46YZDOV1+qtdRDuhZKVPSSp7JWWes0KayqHrKAFBdEI= </s> add github.com/mdlayher/packet v1.1.1 h1:7Fv4OEMYqPl7//uBm04VgPpnSNi8fbBZznppgh6WMr8=
github.com/mdlayher/packet v1.1.1/go.mod h1:DRvYY5mH4M4lUqAnMg04E60U4fjUKMZ/4g2cHElZkKo= </s> remove github.com/mdlayher/netlink v1.1.2-0.20201013204415-ded538f7f4be/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
github.com/mdlayher/packet v1.0.0 h1:InhZJbdShQYt6XV2GPj5XHxChzOfhJJOMbvnGAmOfQ8=
</s> add github.com/mdlayher/netlink v1.7.1 h1:FdUaT/e33HjEXagwELR8R3/KL1Fq5x3G5jgHLp/BTmg=
github.com/mdlayher/netlink v1.7.1/go.mod h1:nKO5CSjE/DJjVhk/TNp6vCE1ktVxEA8VEh8drhZzxsQ= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
<mask> github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
<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=
<mask> github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
<mask> github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
<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/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
<mask> github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
<mask> github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c
</s> add github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 </s> remove github.com/gordonklaus/ineffassign v0.0.0-20220928193011-d2c82e48359b h1:TYNAU9lu7ggdAereRq0dzCIDzHu9mNyGLj/hd5PXq8I=
github.com/gordonklaus/ineffassign v0.0.0-20220928193011-d2c82e48359b/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c=
github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw=
</s> add github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 h1:9alfqbrhuD+9fLZ4iaAVwhlp5PEhmnBt7yvK2Oy5C1U=
github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
github.com/kisielk/errcheck v1.6.3 h1:dEKh+GLHcWm2oN34nMvDzn1sqI0i0WxPvrgiJA5JuM8=
github.com/kisielk/errcheck v1.6.3/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= </s> remove github.com/lucas-clemente/quic-go v0.31.0
</s> add github.com/lucas-clemente/quic-go v0.31.1 </s> remove github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c h1:OCFM4+DXTWfNlyeoddrTwdup/ztkGSyAMR2UGcPckNQ=
github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 h1:Z72DOke2yOK0Ms4Z2LK1E1OrRJXOxSj5DllTz2FYTRg=
github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8/go.mod h1:m5WMe03WCvWcXjRnhvaAbAAXdCnu20J5P+mmH44ZzpE= </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 </s> remove github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/josharian/native v1.0.0 // indirect
</s> add github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
github.com/josharian/native v1.1.0 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace replace keep replace keep keep | <mask> github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
<mask> github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
<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/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
<mask> github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c h1:OCFM4+DXTWfNlyeoddrTwdup/ztkGSyAMR2UGcPckNQ=
<mask> github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
<mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
<mask> github.com/josharian/native v1.0.0 h1:Ts/E8zCSEsG17dUqv7joXJFybuMLjQfWE04tsBODTxk=
<mask> github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= </s> remove github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c
</s> add github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 </s> remove github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
</s> add github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f h1:gl1DCiSk+mrXXBGPm6CEeS2MkJuMVzAOrXg34oVj1QI=
github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= </s> remove github.com/lucas-clemente/quic-go v0.31.0
</s> add github.com/lucas-clemente/quic-go v0.31.1 </s> remove github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/josharian/native v1.0.0 // indirect
</s> add github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
github.com/josharian/native v1.1.0 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep add keep keep keep keep keep keep | <mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
<mask> github.com/josharian/native v1.0.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
<mask> github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
<mask> github.com/kardianos/service v1.2.2 h1:ZvePhAHfvo0A7Mftk/tEzqEZ7Q4lgnR8sGz4xu1YX60=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/josharian/native v1.0.0 h1:Ts/E8zCSEsG17dUqv7joXJFybuMLjQfWE04tsBODTxk=
</s> add </s> remove github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c h1:OCFM4+DXTWfNlyeoddrTwdup/ztkGSyAMR2UGcPckNQ=
github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 h1:Z72DOke2yOK0Ms4Z2LK1E1OrRJXOxSj5DllTz2FYTRg=
github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8/go.mod h1:m5WMe03WCvWcXjRnhvaAbAAXdCnu20J5P+mmH44ZzpE= </s> remove github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c
</s> add github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 </s> remove github.com/mdlayher/netlink v1.6.2
</s> add github.com/mdlayher/netlink v1.7.1 </s> remove github.com/lucas-clemente/quic-go v0.31.0
</s> add github.com/lucas-clemente/quic-go v0.31.1 </s> remove github.com/mdlayher/netlink v1.1.2-0.20201013204415-ded538f7f4be/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
github.com/mdlayher/packet v1.0.0 h1:InhZJbdShQYt6XV2GPj5XHxChzOfhJJOMbvnGAmOfQ8=
</s> add github.com/mdlayher/netlink v1.7.1 h1:FdUaT/e33HjEXagwELR8R3/KL1Fq5x3G5jgHLp/BTmg=
github.com/mdlayher/netlink v1.7.1/go.mod h1:nKO5CSjE/DJjVhk/TNp6vCE1ktVxEA8VEh8drhZzxsQ= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep replace replace keep keep replace replace replace replace keep keep | <mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/lucas-clemente/quic-go v0.31.0 h1:MfNp3fk0wjWRajw6quMFA3ap1AVtlU+2mtwmbVogB2M=
<mask> github.com/lucas-clemente/quic-go v0.31.0/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g=
<mask> github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE=
<mask> github.com/marten-seemann/qpack v0.3.0/go.mod h1:cGfKPBiP4a9EQdxCwEwI/GEeWAsjSekBvx/X8mh58+g=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
<mask> github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
<mask> github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
github.com/mdlayher/packet v1.0.0 // indirect
github.com/mdlayher/socket v0.2.3 // indirect
github.com/onsi/ginkgo/v2 v2.5.0 // indirect
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
github.com/mdlayher/packet v1.1.1 // indirect
github.com/mdlayher/socket v0.4.0 // indirect
github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> remove github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/josharian/native v1.0.0 // indirect
</s> add github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
github.com/josharian/native v1.1.0 // indirect </s> remove github.com/lucas-clemente/quic-go v0.31.0
</s> add github.com/lucas-clemente/quic-go v0.31.1 </s> remove github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c
</s> add github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 </s> remove github.com/mdlayher/netlink v1.6.2
</s> add github.com/mdlayher/netlink v1.7.1 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
<mask> github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
<mask> github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
<mask> github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
<mask> github.com/mdlayher/netlink v1.1.2-0.20201013204415-ded538f7f4be/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
<mask> github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
<mask> github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
<mask> github.com/mdlayher/packet v1.0.0 h1:InhZJbdShQYt6XV2GPj5XHxChzOfhJJOMbvnGAmOfQ8=
<mask> github.com/mdlayher/packet v1.0.0/go.mod h1:eE7/ctqDhoiRhQ44ko5JZU2zxB88g+JH/6jmnjzPjOU=
<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.1.0 h1:K4PFMVy+AFsp0Zdlrts7yNhxc/uXoPVHi9RzRvtZF2Y=
<mask> github.com/mdlayher/raw v0.1.0/go.mod h1:yXnxvs6c0XoF/aK52/H5PjsVHmWBCFfZUfoh/Y5s9Sg=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add github.com/mdlayher/packet v1.1.1 h1:7Fv4OEMYqPl7//uBm04VgPpnSNi8fbBZznppgh6WMr8=
github.com/mdlayher/packet v1.1.1/go.mod h1:DRvYY5mH4M4lUqAnMg04E60U4fjUKMZ/4g2cHElZkKo= </s> remove github.com/mdlayher/netlink v1.6.2
</s> add github.com/mdlayher/netlink v1.7.1 </s> remove github.com/mdlayher/socket v0.2.3 h1:XZA2X2TjdOwNoNPVPclRCURoX/hokBY8nkTmRZFEheM=
github.com/mdlayher/socket v0.2.3/go.mod h1:bz12/FozYNH/VbvC3q7TRIK/Y6dH1kCKsXaUeXi/FmY=
</s> add github.com/mdlayher/socket v0.4.0 h1:280wsy40IC9M9q1uPGcLBwXpcTQDtoGwVt+BNoITxIw=
github.com/mdlayher/socket v0.4.0/go.mod h1:xxFqz5GRCUN3UEOm9CZqEJsAbe1C8OwSK46NlmWuVoc= </s> remove github.com/lucas-clemente/quic-go v0.31.0
</s> add github.com/lucas-clemente/quic-go v0.31.1 </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its=
github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE=
github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= </s> remove github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c
</s> add github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep add keep keep keep keep keep keep | <mask> github.com/mdlayher/netlink v1.7.1/go.mod h1:nKO5CSjE/DJjVhk/TNp6vCE1ktVxEA8VEh8drhZzxsQ=
<mask> github.com/mdlayher/packet v1.0.0/go.mod h1:eE7/ctqDhoiRhQ44ko5JZU2zxB88g+JH/6jmnjzPjOU=
<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.1.0 h1:K4PFMVy+AFsp0Zdlrts7yNhxc/uXoPVHi9RzRvtZF2Y=
<mask> github.com/mdlayher/raw v0.1.0/go.mod h1:yXnxvs6c0XoF/aK52/H5PjsVHmWBCFfZUfoh/Y5s9Sg=
<mask> github.com/mdlayher/socket v0.2.1/go.mod h1:QLlNPkFR88mRUNQIzRBMfXxwKal8H7u1h3bL1CV+f0E=
<mask> github.com/mdlayher/socket v0.4.0 h1:280wsy40IC9M9q1uPGcLBwXpcTQDtoGwVt+BNoITxIw=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/mdlayher/netlink v1.1.2-0.20201013204415-ded538f7f4be/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
github.com/mdlayher/packet v1.0.0 h1:InhZJbdShQYt6XV2GPj5XHxChzOfhJJOMbvnGAmOfQ8=
</s> add github.com/mdlayher/netlink v1.7.1 h1:FdUaT/e33HjEXagwELR8R3/KL1Fq5x3G5jgHLp/BTmg=
github.com/mdlayher/netlink v1.7.1/go.mod h1:nKO5CSjE/DJjVhk/TNp6vCE1ktVxEA8VEh8drhZzxsQ= </s> remove github.com/mdlayher/socket v0.2.3 h1:XZA2X2TjdOwNoNPVPclRCURoX/hokBY8nkTmRZFEheM=
github.com/mdlayher/socket v0.2.3/go.mod h1:bz12/FozYNH/VbvC3q7TRIK/Y6dH1kCKsXaUeXi/FmY=
</s> add github.com/mdlayher/socket v0.4.0 h1:280wsy40IC9M9q1uPGcLBwXpcTQDtoGwVt+BNoITxIw=
github.com/mdlayher/socket v0.4.0/go.mod h1:xxFqz5GRCUN3UEOm9CZqEJsAbe1C8OwSK46NlmWuVoc= </s> remove github.com/mdlayher/netlink v1.6.2
</s> add github.com/mdlayher/netlink v1.7.1 </s> remove github.com/lucas-clemente/quic-go v0.31.0
</s> add github.com/lucas-clemente/quic-go v0.31.1 </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
github.com/mdlayher/packet v1.0.0 // indirect
github.com/mdlayher/socket v0.2.3 // indirect
github.com/onsi/ginkgo/v2 v2.5.0 // indirect
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
github.com/mdlayher/packet v1.1.1 // indirect
github.com/mdlayher/socket v0.4.0 // indirect
github.com/onsi/ginkgo/v2 v2.8.0 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
<mask> github.com/mdlayher/raw v0.1.0 h1:K4PFMVy+AFsp0Zdlrts7yNhxc/uXoPVHi9RzRvtZF2Y=
<mask> github.com/mdlayher/raw v0.1.0/go.mod h1:yXnxvs6c0XoF/aK52/H5PjsVHmWBCFfZUfoh/Y5s9Sg=
<mask> github.com/mdlayher/socket v0.2.1/go.mod h1:QLlNPkFR88mRUNQIzRBMfXxwKal8H7u1h3bL1CV+f0E=
<mask> github.com/mdlayher/socket v0.2.3 h1:XZA2X2TjdOwNoNPVPclRCURoX/hokBY8nkTmRZFEheM=
<mask> github.com/mdlayher/socket v0.2.3/go.mod h1:bz12/FozYNH/VbvC3q7TRIK/Y6dH1kCKsXaUeXi/FmY=
<mask> github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
<mask> github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
<mask> github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
<mask> github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
<mask> github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add github.com/mdlayher/packet v1.1.1 h1:7Fv4OEMYqPl7//uBm04VgPpnSNi8fbBZznppgh6WMr8=
github.com/mdlayher/packet v1.1.1/go.mod h1:DRvYY5mH4M4lUqAnMg04E60U4fjUKMZ/4g2cHElZkKo= </s> remove github.com/onsi/ginkgo/v2 v2.5.0 h1:TRtrvv2vdQqzkwrQ1ke6vtXf7IK34RBUJafIy1wMwls=
github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
github.com/onsi/gomega v1.24.0 h1:+0glovB9Jd6z3VR+ScSwQqXVTIfJcGA9UBM8yzQxhqg=
</s> add github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> remove github.com/mdlayher/netlink v1.1.2-0.20201013204415-ded538f7f4be/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
github.com/mdlayher/packet v1.0.0 h1:InhZJbdShQYt6XV2GPj5XHxChzOfhJJOMbvnGAmOfQ8=
</s> add github.com/mdlayher/netlink v1.7.1 h1:FdUaT/e33HjEXagwELR8R3/KL1Fq5x3G5jgHLp/BTmg=
github.com/mdlayher/netlink v1.7.1/go.mod h1:nKO5CSjE/DJjVhk/TNp6vCE1ktVxEA8VEh8drhZzxsQ= </s> remove github.com/mdlayher/netlink v1.6.2
</s> add github.com/mdlayher/netlink v1.7.1 </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
github.com/mdlayher/packet v1.0.0 // indirect
github.com/mdlayher/socket v0.2.3 // indirect
github.com/onsi/ginkgo/v2 v2.5.0 // indirect
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
github.com/mdlayher/packet v1.1.1 // indirect
github.com/mdlayher/socket v0.4.0 // indirect
github.com/onsi/ginkgo/v2 v2.8.0 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
<mask> github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
<mask> github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
<mask> github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
<mask> github.com/onsi/ginkgo/v2 v2.5.0 h1:TRtrvv2vdQqzkwrQ1ke6vtXf7IK34RBUJafIy1wMwls=
<mask> github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
<mask> github.com/onsi/gomega v1.24.0 h1:+0glovB9Jd6z3VR+ScSwQqXVTIfJcGA9UBM8yzQxhqg=
<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: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/mdlayher/socket v0.2.3 h1:XZA2X2TjdOwNoNPVPclRCURoX/hokBY8nkTmRZFEheM=
github.com/mdlayher/socket v0.2.3/go.mod h1:bz12/FozYNH/VbvC3q7TRIK/Y6dH1kCKsXaUeXi/FmY=
</s> add github.com/mdlayher/socket v0.4.0 h1:280wsy40IC9M9q1uPGcLBwXpcTQDtoGwVt+BNoITxIw=
github.com/mdlayher/socket v0.4.0/go.mod h1:xxFqz5GRCUN3UEOm9CZqEJsAbe1C8OwSK46NlmWuVoc= </s> remove github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
golang.org/x/mod v0.6.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
github.com/mdlayher/packet v1.0.0 // indirect
github.com/mdlayher/socket v0.2.3 // indirect
github.com/onsi/ginkgo/v2 v2.5.0 // indirect
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
github.com/mdlayher/packet v1.1.1 // indirect
github.com/mdlayher/socket v0.4.0 // indirect
github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> remove github.com/mdlayher/netlink v1.6.2
</s> add github.com/mdlayher/netlink v1.7.1 </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 </s> remove github.com/kyoh86/looppointer v0.1.9 h1:siTt2dqv+pW3y5gvykZXhlVcTnUVMDf11bGlB9GL5PI=
github.com/kyoh86/looppointer v0.1.9/go.mod h1:q358WcM8cMWU+5vzqukvaZtnJi1kw/MpRHQm3xvTrjw=
</s> add github.com/kyoh86/looppointer v0.2.1 h1:Jx9fnkBj/JrIryBLMTYNTj9rvc2SrPS98Dg0w7fxdJg=
github.com/kyoh86/looppointer v0.2.1/go.mod h1:q358WcM8cMWU+5vzqukvaZtnJi1kw/MpRHQm3xvTrjw= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
<mask> github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
<mask> github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
<mask> github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
<mask> github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
<mask> github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
<mask> github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
<mask> github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= </s> remove github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
</s> add </s> add github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= </s> remove github.com/ti-mo/netfilter v0.4.0 h1:rTN1nBYULDmMfDeBHZpKuNKX/bWEXQUhe02a/10orzg=
github.com/ti-mo/netfilter v0.4.0/go.mod h1:V54q75mUx8CNA2JnFl+wv9iZ5+JP9nCcRlaFS5OZSRM=
</s> add github.com/ti-mo/netfilter v0.5.0 h1:MZmsUw5bFRecOb0AeyjOPxTHg4UxYzyEs0Ek/6Lxoy8=
github.com/ti-mo/netfilter v0.5.0/go.mod h1:nt+8B9hx/QpqHr7Hazq+2qMCCA8u2OTkyc/7+U9ARz8= </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 </s> remove github.com/mdlayher/netlink v1.6.2
</s> add github.com/mdlayher/netlink v1.7.1 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep add keep keep keep keep keep | <mask> github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
<mask> github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
<mask> github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
<mask> github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
<mask> github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
<mask> github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
</s> add </s> remove github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
</s> add </s> add github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= </s> remove github.com/ti-mo/netfilter v0.4.0 h1:rTN1nBYULDmMfDeBHZpKuNKX/bWEXQUhe02a/10orzg=
github.com/ti-mo/netfilter v0.4.0/go.mod h1:V54q75mUx8CNA2JnFl+wv9iZ5+JP9nCcRlaFS5OZSRM=
</s> add github.com/ti-mo/netfilter v0.5.0 h1:MZmsUw5bFRecOb0AeyjOPxTHg4UxYzyEs0Ek/6Lxoy8=
github.com/ti-mo/netfilter v0.5.0/go.mod h1:nt+8B9hx/QpqHr7Hazq+2qMCCA8u2OTkyc/7+U9ARz8= </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 </s> remove github.com/mdlayher/netlink v1.6.2
</s> add github.com/mdlayher/netlink v1.7.1 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
<mask> github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
<mask> github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
<mask> github.com/ti-mo/netfilter v0.2.0/go.mod h1:8GbBGsY/8fxtyIdfwy29JiluNcPK4K7wIT+x42ipqUU=
<mask> github.com/ti-mo/netfilter v0.4.0 h1:rTN1nBYULDmMfDeBHZpKuNKX/bWEXQUhe02a/10orzg=
<mask> github.com/ti-mo/netfilter v0.4.0/go.mod h1:V54q75mUx8CNA2JnFl+wv9iZ5+JP9nCcRlaFS5OZSRM=
<mask> github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/ti-mo/netfilter v0.4.0 h1:rTN1nBYULDmMfDeBHZpKuNKX/bWEXQUhe02a/10orzg=
github.com/ti-mo/netfilter v0.4.0/go.mod h1:V54q75mUx8CNA2JnFl+wv9iZ5+JP9nCcRlaFS5OZSRM=
</s> add github.com/ti-mo/netfilter v0.5.0 h1:MZmsUw5bFRecOb0AeyjOPxTHg4UxYzyEs0Ek/6Lxoy8=
github.com/ti-mo/netfilter v0.5.0/go.mod h1:nt+8B9hx/QpqHr7Hazq+2qMCCA8u2OTkyc/7+U9ARz8= </s> add github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= </s> add github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= </s> remove github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
</s> add </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 </s> remove github.com/mdlayher/netlink v1.6.2
</s> add github.com/mdlayher/netlink v1.7.1 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep add keep keep keep keep keep | <mask> github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
<mask> github.com/ti-mo/netfilter v0.2.0/go.mod h1:8GbBGsY/8fxtyIdfwy29JiluNcPK4K7wIT+x42ipqUU=
<mask> github.com/ti-mo/netfilter v0.5.0 h1:MZmsUw5bFRecOb0AeyjOPxTHg4UxYzyEs0Ek/6Lxoy8=
<mask> github.com/ti-mo/netfilter v0.5.0/go.mod h1:nt+8B9hx/QpqHr7Hazq+2qMCCA8u2OTkyc/7+U9ARz8=
<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=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/ti-mo/netfilter v0.4.0 h1:rTN1nBYULDmMfDeBHZpKuNKX/bWEXQUhe02a/10orzg=
github.com/ti-mo/netfilter v0.4.0/go.mod h1:V54q75mUx8CNA2JnFl+wv9iZ5+JP9nCcRlaFS5OZSRM=
</s> add github.com/ti-mo/netfilter v0.5.0 h1:MZmsUw5bFRecOb0AeyjOPxTHg4UxYzyEs0Ek/6Lxoy8=
github.com/ti-mo/netfilter v0.5.0/go.mod h1:nt+8B9hx/QpqHr7Hazq+2qMCCA8u2OTkyc/7+U9ARz8= </s> remove github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
</s> add </s> add github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= </s> remove github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
</s> add </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 </s> remove github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 h1:hl6sK6aFgTLISijk6xIzeqnPzQcsLqqvL6vEfTPinME=
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
</s> add github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww=
github.com/u-root/uio v0.0.0-20221213070652-c3537552635f/go.mod h1:IogEAUBXDEwX7oR/BMmCctShYs80ql4hF0ySdzGxf7E= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep replace replace keep keep keep keep replace replace replace keep keep keep keep | <mask> github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
<mask> github.com/ti-mo/netfilter v0.2.0/go.mod h1:8GbBGsY/8fxtyIdfwy29JiluNcPK4K7wIT+x42ipqUU=
<mask> github.com/ti-mo/netfilter v0.4.0 h1:rTN1nBYULDmMfDeBHZpKuNKX/bWEXQUhe02a/10orzg=
<mask> github.com/ti-mo/netfilter v0.4.0/go.mod h1:V54q75mUx8CNA2JnFl+wv9iZ5+JP9nCcRlaFS5OZSRM=
<mask> github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
<mask> github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
<mask> github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
<mask> github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
<mask> github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
<mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 h1:hl6sK6aFgTLISijk6xIzeqnPzQcsLqqvL6vEfTPinME=
<mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
<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> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
</s> add go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= </s> remove github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
</s> add </s> add github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 </s> remove golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
golang.org/x/exp v0.0.0-20221106115401-f9659909a136 h1:Fq7F/w7MAa1KJ5bt2aJ62ihqp9HDcRuyILskkpIAurw=
golang.org/x/exp v0.0.0-20221106115401-f9659909a136/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
</s> add golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 h1:BEABXpNXLEz0WxtA+6CQIz2xkg80e+1zrhWyMcq8VzE=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep replace replace keep keep keep replace replace replace replace keep keep keep | <mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 h1:hl6sK6aFgTLISijk6xIzeqnPzQcsLqqvL6vEfTPinME=
<mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
<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> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
<mask> golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
<mask> golang.org/x/exp v0.0.0-20221106115401-f9659909a136 h1:Fq7F/w7MAa1KJ5bt2aJ62ihqp9HDcRuyILskkpIAurw=
<mask> golang.org/x/exp v0.0.0-20221106115401-f9659909a136/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
<mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 h1:hl6sK6aFgTLISijk6xIzeqnPzQcsLqqvL6vEfTPinME=
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
</s> add github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww=
github.com/u-root/uio v0.0.0-20221213070652-c3537552635f/go.mod h1:IogEAUBXDEwX7oR/BMmCctShYs80ql4hF0ySdzGxf7E= </s> remove golang.org/x/exp v0.0.0-20221106115401-f9659909a136 h1:Fq7F/w7MAa1KJ5bt2aJ62ihqp9HDcRuyILskkpIAurw=
golang.org/x/exp v0.0.0-20221106115401-f9659909a136/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221106115401-f9659909a136 h1:962j4VxUJV3GKI6NxKDI9NjATh+tAixlH+9k9MvHSlU=
golang.org/x/exp/typeparams v0.0.0-20221106115401-f9659909a136/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 h1:BEABXpNXLEz0WxtA+6CQIz2xkg80e+1zrhWyMcq8VzE=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 h1:O1QcdQUR9htWjzzsXVFPX+RJ3n1P/u/5bsQR8dbs5BY=
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
</s> add golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 </s> remove golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
</s> add golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/exp v0.0.0-20221106115401-f9659909a136/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
<mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
<mask> golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
<mask> golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
</s> add golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
golang.org/x/exp v0.0.0-20221106115401-f9659909a136 h1:Fq7F/w7MAa1KJ5bt2aJ62ihqp9HDcRuyILskkpIAurw=
golang.org/x/exp v0.0.0-20221106115401-f9659909a136/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
</s> add golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 h1:BEABXpNXLEz0WxtA+6CQIz2xkg80e+1zrhWyMcq8VzE=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/exp v0.0.0-20221106115401-f9659909a136 h1:Fq7F/w7MAa1KJ5bt2aJ62ihqp9HDcRuyILskkpIAurw=
golang.org/x/exp v0.0.0-20221106115401-f9659909a136/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20221106115401-f9659909a136 h1:962j4VxUJV3GKI6NxKDI9NjATh+tAixlH+9k9MvHSlU=
golang.org/x/exp/typeparams v0.0.0-20221106115401-f9659909a136/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
</s> add golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 h1:BEABXpNXLEz0WxtA+6CQIz2xkg80e+1zrhWyMcq8VzE=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 h1:O1QcdQUR9htWjzzsXVFPX+RJ3n1P/u/5bsQR8dbs5BY=
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
</s> add </s> remove golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
</s> add golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= </s> remove golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
</s> add golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<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-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-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
<mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
<mask> golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
</s> add golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= </s> remove golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
</s> add golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
</s> add golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= </s> remove golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
</s> add golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> add </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep replace replace replace keep keep replace | <mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
<mask> golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
<mask> golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
<mask> golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
</s> add golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= </s> remove golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
</s> add </s> remove golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
</s> add golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
</s> add golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep replace keep replace keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add </s> remove golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> add </s> remove golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add </s> remove golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> add </s> remove golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
</s> add </s> remove golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace keep replace replace keep keep keep | <mask> golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
<mask> golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
</s> add </s> remove golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add </s> remove golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
<mask> golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
</s> add golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add </s> remove golang.org/x/text v0.5.0 // indirect
golang.org/x/tools v0.2.0 // indirect
</s> add golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
<mask> golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
<mask> golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
<mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
<mask> golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
<mask> golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
</s> add </s> remove golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
</s> add golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= </s> remove golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/text v0.5.0 // indirect
golang.org/x/tools v0.2.0 // indirect
</s> add golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect </s> remove golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
golang.org/x/vuln v0.0.0-20221103225512-4f561ca73b59 h1:eOOJSuIRc2QwKAgX5qOIhUZJAd2LLKSBfk839dv+Clo=
golang.org/x/vuln v0.0.0-20221103225512-4f561ca73b59/go.mod h1:F12iebNzxRMpJsm4W7ape+r/KdnXiSy3VC94WsyCG68=
</s> add golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ=
golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33 h1:je2aB5nnlseeGvJy5clg6EyC3jjbbCNsRDroC3qQJsA=
golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
<mask> golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
<mask> golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
<mask> golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
<mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
golang.org/x/vuln v0.0.0-20221103225512-4f561ca73b59 h1:eOOJSuIRc2QwKAgX5qOIhUZJAd2LLKSBfk839dv+Clo=
golang.org/x/vuln v0.0.0-20221103225512-4f561ca73b59/go.mod h1:F12iebNzxRMpJsm4W7ape+r/KdnXiSy3VC94WsyCG68=
</s> add golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ=
golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33 h1:je2aB5nnlseeGvJy5clg6EyC3jjbbCNsRDroC3qQJsA=
golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> remove golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
</s> add golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove golang.org/x/tools v0.2.0
golang.org/x/vuln v0.0.0-20221103225512-4f561ca73b59
</s> add golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2
golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33 </s> remove golang.org/x/text v0.5.0 // indirect
golang.org/x/tools v0.2.0 // indirect
</s> add golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 </s> remove github.com/gordonklaus/ineffassign v0.0.0-20220928193011-d2c82e48359b
github.com/kisielk/errcheck v1.6.2
github.com/kyoh86/looppointer v0.1.9
</s> add github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28
github.com/kisielk/errcheck v1.6.3
github.com/kyoh86/looppointer v0.2.1 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> func (c *sbCtx) getCached() int {
<mask> now := time.Now().Unix()
<mask> hashesToRequest := map[[32]byte]string{}
<mask> for k, v := range c.hashToHost {
<mask> key := k[0:2]
<mask> val := c.cache.Get(key)
<mask> if val == nil || now >= int64(binary.BigEndian.Uint32(val)) {
<mask> hashesToRequest[k] = v
<mask> continue
<mask> }
<mask> if hash32, found := c.findInHash(val); found {
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add // nolint:looppointer // The subsilce is used for a safe cache lookup. </s> remove // TODO(e.burkov, a.garipov): Find out and document why exactly
// this slice.
</s> add // nolint:looppointer // The subsilce is used for safe hex encoding. </s> remove prefix := hash[0:2]
if !bytes.Equal(prefix, prevPrefix) {
</s> add // nolint:looppointer // The subsilce is used for a safe comparison.
if !bytes.Equal(hash[0:2], prevPrefix) { </s> add "14": "consent",
"15": "telemetry", </s> add "||vocalodon.net^", </s> add "apple.news": "apple", | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/safebrowsing.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> func (c *sbCtx) getQuestion() string {
<mask> b := &strings.Builder{}
<mask>
<mask> for hash := range c.hashToHost {
<mask> // TODO(e.burkov, a.garipov): Find out and document why exactly
<mask> // this slice.
<mask> stringutil.WriteToBuilder(b, hex.EncodeToString(hash[0:2]), ".")
<mask> }
<mask>
<mask> if c.svc == "SafeBrowsing" {
<mask> stringutil.WriteToBuilder(b, sbTXTSuffix)
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove key := k[0:2]
val := c.cache.Get(key)
</s> add // nolint:looppointer // The subsilce is used for a safe cache lookup.
val := c.cache.Get(k[0:2]) </s> add // nolint:looppointer // The subsilce is used for a safe cache lookup. </s> remove prefix := hash[0:2]
if !bytes.Equal(prefix, prevPrefix) {
</s> add // nolint:looppointer // The subsilce is used for a safe comparison.
if !bytes.Equal(hash[0:2], prevPrefix) { </s> add "14": "consent",
"15": "telemetry", </s> add "||vocalodon.net^", </s> add "apple.news": "apple", | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/safebrowsing.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> var curData []byte
<mask> var prevPrefix []byte
<mask> for i, hash := range hashes {
<mask> prefix := hash[0:2]
<mask> if !bytes.Equal(prefix, prevPrefix) {
<mask> if i != 0 {
<mask> c.setCache(prevPrefix, curData)
<mask> curData = nil
<mask> }
<mask> prevPrefix = hashes[i][0:2]
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add // nolint:looppointer // The subsilce is used for a safe cache lookup. </s> remove key := k[0:2]
val := c.cache.Get(key)
</s> add // nolint:looppointer // The subsilce is used for a safe cache lookup.
val := c.cache.Get(k[0:2]) </s> remove // TODO(e.burkov, a.garipov): Find out and document why exactly
// this slice.
</s> add // nolint:looppointer // The subsilce is used for safe hex encoding. </s> add "14": "consent",
"15": "telemetry", </s> add }, {
ID: "xboxlive",
Name: "Xbox Live",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 84 84\" xml:space=\"preserve\"><g transform=\"translate(-59.355 -42.513)\"><g transform=\"matrix(.26458 0 0 .26458 -145.88 -71.438)\" fill=\"currentColor\"><path d=\"m936.09 559.48s0.4 0 0 0c48.4 36.8 130.4 127.2 105.6 152.8-28.4 24.8-65.2 39.6-105.6 39.6s-77.6-14.8-105.6-39.6c-25.2-25.6 57.2-116 105.2-152.4 0-0.4 0.4-0.4 0.4-0.4zm83.6-105.2c-24.4-14.8-51.2-23.6-83.6-23.6s-59.2 8.8-83.6 23.6c-0.4 0-0.4 0.4-0.4 0.8s0.4 0.4 0.8 0.4c31.2-6.8 78.4 20 82.8 22.8h0.8c4.4-2.8 51.6-29.6 82.8-22.8 0.4 0 0.8 0 0.8-0.4s0-0.8-0.4-0.8zm-196 22.4c-0.4 0-0.4 0.4-0.8 0.4-29.2 29.2-47.2 69.6-47.2 114 0 36.4 12.4 70.4 32.8 97.2 0 0.4 0.4 0.4 0.8 0.4s0.4-0.4 0-0.8c-12.4-38 50.4-129.6 82.8-168l0.4-0.4c0-0.4 0-0.4-0.4-0.4-49.2-48.8-65.6-43.6-68.4-42.4zm156.4 42-0.4 0.4s0 0.4 0.4 0.4c32.4 38.4 94.8 130 82.8 168v0.8c0.4 0 0.8 0 0.8-0.4 20.4-26.8 32.8-60.8 32.8-97.2 0-44.4-18-84.8-47.6-114-0.4-0.4-0.4-0.4-0.8-0.4-2.4-0.8-18.8-6-68 42.4z\"/></g></g></svg>"),
Rules: []string{
"||gamepass.com^",
"||xbox-global.ifs.windows.com^",
"||xbox-guide-public.rec.mp.microsoft.com^",
"||xbox.ipv6.microsoft.com^",
"||xboxab.com^",
"||xboxab.net^",
"||xboxlive.com^",
"||xboxservices.com^",
}, </s> add "||vocalodon.net^", | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/safebrowsing.go |
keep keep keep add keep keep keep keep keep keep | <mask> c.setCache(prevPrefix, curData)
<mask> }
<mask>
<mask> for hash := range c.hashToHost {
<mask> prefix := hash[0:2]
<mask> val := c.cache.Get(prefix)
<mask> if val == nil {
<mask> c.setCache(prefix, nil)
<mask> }
<mask> }
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove key := k[0:2]
val := c.cache.Get(key)
</s> add // nolint:looppointer // The subsilce is used for a safe cache lookup.
val := c.cache.Get(k[0:2]) </s> remove prefix := hash[0:2]
if !bytes.Equal(prefix, prevPrefix) {
</s> add // nolint:looppointer // The subsilce is used for a safe comparison.
if !bytes.Equal(hash[0:2], prevPrefix) { </s> remove // TODO(e.burkov, a.garipov): Find out and document why exactly
// this slice.
</s> add // nolint:looppointer // The subsilce is used for safe hex encoding. </s> add "14": "consent",
"15": "telemetry", </s> add "||vocalodon.net^", </s> add "apple.news": "apple", | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/safebrowsing.go |
keep add keep keep keep keep | <mask> IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M395.748 272.046c-.646-64.841 52.88-95.938 55.271-97.483-30.075-44.01-76.925-50.039-93.62-50.736-39.871-4.037-77.798 23.474-98.033 23.474-20.184 0-51.409-22.877-84.476-22.276-43.458.646-83.529 25.269-105.906 64.19-45.152 78.35-11.563 194.42 32.445 257.963 21.504 31.104 47.146 66.038 80.813 64.79 32.421-1.294 44.681-20.979 83.878-20.979 39.196 0 50.215 20.979 84.524 20.335 34.888-.648 56.991-31.699 78.347-62.898 24.694-36.084 34.862-71.019 35.462-72.812-.775-.354-68.031-26.119-68.705-103.568zM331.28 81.761C349.149 60.082 361.21 30.005 357.92 0c-25.739 1.048-56.938 17.145-75.405 38.775-16.57 19.188-31.075 49.813-27.188 79.218 28.734 2.242 58.065-14.602 75.953-36.232z\" /></svg>"),
<mask> Rules: []string{
<mask> "||mask-h2.icloud.com^$dnsrewrite=NXDOMAIN;;",
<mask> "||mask.icloud.com^$dnsrewrite=NXDOMAIN;;",
<mask> },
<mask> }, {
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add }, {
ID: "xboxlive",
Name: "Xbox Live",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 84 84\" xml:space=\"preserve\"><g transform=\"translate(-59.355 -42.513)\"><g transform=\"matrix(.26458 0 0 .26458 -145.88 -71.438)\" fill=\"currentColor\"><path d=\"m936.09 559.48s0.4 0 0 0c48.4 36.8 130.4 127.2 105.6 152.8-28.4 24.8-65.2 39.6-105.6 39.6s-77.6-14.8-105.6-39.6c-25.2-25.6 57.2-116 105.2-152.4 0-0.4 0.4-0.4 0.4-0.4zm83.6-105.2c-24.4-14.8-51.2-23.6-83.6-23.6s-59.2 8.8-83.6 23.6c-0.4 0-0.4 0.4-0.4 0.8s0.4 0.4 0.8 0.4c31.2-6.8 78.4 20 82.8 22.8h0.8c4.4-2.8 51.6-29.6 82.8-22.8 0.4 0 0.8 0 0.8-0.4s0-0.8-0.4-0.8zm-196 22.4c-0.4 0-0.4 0.4-0.8 0.4-29.2 29.2-47.2 69.6-47.2 114 0 36.4 12.4 70.4 32.8 97.2 0 0.4 0.4 0.4 0.8 0.4s0.4-0.4 0-0.8c-12.4-38 50.4-129.6 82.8-168l0.4-0.4c0-0.4 0-0.4-0.4-0.4-49.2-48.8-65.6-43.6-68.4-42.4zm156.4 42-0.4 0.4s0 0.4 0.4 0.4c32.4 38.4 94.8 130 82.8 168v0.8c0.4 0 0.8 0 0.8-0.4 20.4-26.8 32.8-60.8 32.8-97.2 0-44.4-18-84.8-47.6-114-0.4-0.4-0.4-0.4-0.8-0.4-2.4-0.8-18.8-6-68 42.4z\"/></g></g></svg>"),
Rules: []string{
"||gamepass.com^",
"||xbox-global.ifs.windows.com^",
"||xbox-guide-public.rec.mp.microsoft.com^",
"||xbox.ipv6.microsoft.com^",
"||xboxab.com^",
"||xboxab.net^",
"||xboxlive.com^",
"||xboxservices.com^",
}, </s> add }, {
ID: "leagueoflegends",
Name: "League of Legends",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\" width=\"60px\" height=\"60px\"><path d=\"M 7 4 L 9 7.25 L 9 22.75 L 6.875 26 L 21.957031 26 L 25 22 L 14 22 L 14 4 L 7 4 z M 16 4.0507812 L 16 6.0585938 C 20.493 6.5575937 24 10.375 24 15 C 24 16.849 23.438516 18.569 22.478516 20 L 24.785156 20 C 25.556156 18.498 26 16.801 26 15 C 26 9.272 21.598 4.5577812 16 4.0507812 z M 6.8730469 7.6113281 C 5.0940469 9.5663281 4 12.155 4 15 C 4 17.837 5.0884219 20.418094 6.8574219 22.371094 L 7 22.154297 L 7 19.105469 C 6.365 17.872469 6 16.479 6 15 C 6 13.521 6.365 12.127531 7 10.894531 L 7 7.8164062 L 6.8730469 7.6113281 z\"/></svg>"),
Rules: []string{
"||leagueoflegends.co.kr^",
"||leagueoflegends.com^",
"||lol.riotgames.com^",
"||lolstatic.com^",
"||lolusercontent.com^",
}, </s> add "||cupoftea.social^", </s> remove IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.0\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"),
</s> add IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"), </s> add "||vocalodon.net^", </s> add "14": "consent",
"15": "telemetry", | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/servicelist.go |
keep keep keep add keep keep keep keep keep keep | <mask> Rules: []string{
<mask> "||iq.com^",
<mask> "||iqiyi.com^",
<mask> },
<mask> }, {
<mask> ID: "mail_ru",
<mask> Name: "Mail.ru",
<mask> IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M256 141.176c-63.306 0-114.809 51.503-114.809 114.809S192.694 370.795 256 370.795s114.809-51.503 114.809-114.809S319.306 141.176 256 141.176zm0 188.254c-40.498 0-73.445-32.947-73.445-73.445 0-40.498 32.947-73.445 73.445-73.445 40.499 0 73.445 32.947 73.445 73.445 0 40.498-32.946 73.445-73.445 73.445z\" /><path d=\"M437.008 74.97C388.656 26.623 324.375 0 256 0h-.017C187.603.004 123.318 26.637 74.97 74.992 26.62 123.347-.005 187.637 0 256.017c.004 68.379 26.637 132.666 74.992 181.014C123.344 485.377 187.625 512.001 256 512h.017c55.945-.004 111.216-18.738 155.631-52.752 9.07-6.945 10.792-19.927 3.846-28.995-6.945-9.069-19.926-10.794-28.995-3.846-37.24 28.518-83.58 44.224-130.486 44.228h-.014c-57.324 0-111.224-22.324-151.761-62.856-40.542-40.536-62.871-94.435-62.875-151.766-.006-118.35 96.273-214.641 214.623-214.649H256c118.34 0 214.628 96.279 214.636 214.622v23.532c0 27.523-22.39 49.913-49.913 49.913-27.523 0-49.913-22.391-49.913-49.913v-23.532c0-11.422-9.259-20.682-20.682-20.682s-20.682 9.26-20.682 20.682v23.532c0 50.33 40.947 91.278 91.278 91.278S512 329.848 512 279.518v-23.534c-.005-68.38-26.638-132.666-74.992-181.014z\" /></svg>"),
<mask> Rules: []string{
<mask> "||imgsmail.ru^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add }, {
ID: "xboxlive",
Name: "Xbox Live",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 84 84\" xml:space=\"preserve\"><g transform=\"translate(-59.355 -42.513)\"><g transform=\"matrix(.26458 0 0 .26458 -145.88 -71.438)\" fill=\"currentColor\"><path d=\"m936.09 559.48s0.4 0 0 0c48.4 36.8 130.4 127.2 105.6 152.8-28.4 24.8-65.2 39.6-105.6 39.6s-77.6-14.8-105.6-39.6c-25.2-25.6 57.2-116 105.2-152.4 0-0.4 0.4-0.4 0.4-0.4zm83.6-105.2c-24.4-14.8-51.2-23.6-83.6-23.6s-59.2 8.8-83.6 23.6c-0.4 0-0.4 0.4-0.4 0.8s0.4 0.4 0.8 0.4c31.2-6.8 78.4 20 82.8 22.8h0.8c4.4-2.8 51.6-29.6 82.8-22.8 0.4 0 0.8 0 0.8-0.4s0-0.8-0.4-0.8zm-196 22.4c-0.4 0-0.4 0.4-0.8 0.4-29.2 29.2-47.2 69.6-47.2 114 0 36.4 12.4 70.4 32.8 97.2 0 0.4 0.4 0.4 0.8 0.4s0.4-0.4 0-0.8c-12.4-38 50.4-129.6 82.8-168l0.4-0.4c0-0.4 0-0.4-0.4-0.4-49.2-48.8-65.6-43.6-68.4-42.4zm156.4 42-0.4 0.4s0 0.4 0.4 0.4c32.4 38.4 94.8 130 82.8 168v0.8c0.4 0 0.8 0 0.8-0.4 20.4-26.8 32.8-60.8 32.8-97.2 0-44.4-18-84.8-47.6-114-0.4-0.4-0.4-0.4-0.8-0.4-2.4-0.8-18.8-6-68 42.4z\"/></g></g></svg>"),
Rules: []string{
"||gamepass.com^",
"||xbox-global.ifs.windows.com^",
"||xbox-guide-public.rec.mp.microsoft.com^",
"||xbox.ipv6.microsoft.com^",
"||xboxab.com^",
"||xboxab.net^",
"||xboxlive.com^",
"||xboxservices.com^",
}, </s> add "||mask-canary.icloud.com^$dnsrewrite=NXDOMAIN;;", </s> add "||cupoftea.social^", </s> remove IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.0\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"),
</s> add IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"), </s> remove prefix := hash[0:2]
if !bytes.Equal(prefix, prevPrefix) {
</s> add // nolint:looppointer // The subsilce is used for a safe comparison.
if !bytes.Equal(hash[0:2], prevPrefix) { </s> add "||vocalodon.net^", | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/servicelist.go |
keep keep keep add keep keep keep keep keep | <mask> IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M433 179.11c0-97.2-63.71-125.7-63.71-125.7-62.52-28.7-228.56-28.4-290.48 0 0 0-63.72 28.5-63.72 125.7 0 115.7-6.6 259.4 105.63 289.1 40.51 10.7 75.32 13 103.33 11.4 50.81-2.8 79.32-18.1 79.32-18.1l-1.7-36.9s-36.31 11.4-77.12 10.1c-40.41-1.4-83-4.4-89.63-54a102.54 102.54 0 0 1-.9-13.9c85.63 20.9 158.65 9.1 178.75 6.7 56.12-6.7 105-41.3 111.23-72.9 9.8-49.8 9-121.5 9-121.5zm-75.12 125.2h-46.63v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.33V197c0-58.5-64-56.6-64-6.9v114.2H90.19c0-122.1-5.2-147.9 18.41-175 25.9-28.9 79.82-30.8 103.83 6.1l11.6 19.5 11.6-19.5c24.11-37.1 78.12-34.8 103.83-6.1 23.71 27.3 18.4 53 18.4 175z\"/></svg>"),
<mask> Rules: []string{
<mask> "||aus.social^",
<mask> "||awscommunity.social^",
<mask> "||cyberplace.social^",
<mask> "||defcon.social^",
<mask> "||det.social^",
<mask> "||fosstodon.org^",
<mask> "||glasgow.social^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add }, {
ID: "xboxlive",
Name: "Xbox Live",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 84 84\" xml:space=\"preserve\"><g transform=\"translate(-59.355 -42.513)\"><g transform=\"matrix(.26458 0 0 .26458 -145.88 -71.438)\" fill=\"currentColor\"><path d=\"m936.09 559.48s0.4 0 0 0c48.4 36.8 130.4 127.2 105.6 152.8-28.4 24.8-65.2 39.6-105.6 39.6s-77.6-14.8-105.6-39.6c-25.2-25.6 57.2-116 105.2-152.4 0-0.4 0.4-0.4 0.4-0.4zm83.6-105.2c-24.4-14.8-51.2-23.6-83.6-23.6s-59.2 8.8-83.6 23.6c-0.4 0-0.4 0.4-0.4 0.8s0.4 0.4 0.8 0.4c31.2-6.8 78.4 20 82.8 22.8h0.8c4.4-2.8 51.6-29.6 82.8-22.8 0.4 0 0.8 0 0.8-0.4s0-0.8-0.4-0.8zm-196 22.4c-0.4 0-0.4 0.4-0.8 0.4-29.2 29.2-47.2 69.6-47.2 114 0 36.4 12.4 70.4 32.8 97.2 0 0.4 0.4 0.4 0.8 0.4s0.4-0.4 0-0.8c-12.4-38 50.4-129.6 82.8-168l0.4-0.4c0-0.4 0-0.4-0.4-0.4-49.2-48.8-65.6-43.6-68.4-42.4zm156.4 42-0.4 0.4s0 0.4 0.4 0.4c32.4 38.4 94.8 130 82.8 168v0.8c0.4 0 0.8 0 0.8-0.4 20.4-26.8 32.8-60.8 32.8-97.2 0-44.4-18-84.8-47.6-114-0.4-0.4-0.4-0.4-0.8-0.4-2.4-0.8-18.8-6-68 42.4z\"/></g></g></svg>"),
Rules: []string{
"||gamepass.com^",
"||xbox-global.ifs.windows.com^",
"||xbox-guide-public.rec.mp.microsoft.com^",
"||xbox.ipv6.microsoft.com^",
"||xboxab.com^",
"||xboxab.net^",
"||xboxlive.com^",
"||xboxservices.com^",
}, </s> add "||mask-canary.icloud.com^$dnsrewrite=NXDOMAIN;;", </s> add }, {
ID: "leagueoflegends",
Name: "League of Legends",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\" width=\"60px\" height=\"60px\"><path d=\"M 7 4 L 9 7.25 L 9 22.75 L 6.875 26 L 21.957031 26 L 25 22 L 14 22 L 14 4 L 7 4 z M 16 4.0507812 L 16 6.0585938 C 20.493 6.5575937 24 10.375 24 15 C 24 16.849 23.438516 18.569 22.478516 20 L 24.785156 20 C 25.556156 18.498 26 16.801 26 15 C 26 9.272 21.598 4.5577812 16 4.0507812 z M 6.8730469 7.6113281 C 5.0940469 9.5663281 4 12.155 4 15 C 4 17.837 5.0884219 20.418094 6.8574219 22.371094 L 7 22.154297 L 7 19.105469 C 6.365 17.872469 6 16.479 6 15 C 6 13.521 6.365 12.127531 7 10.894531 L 7 7.8164062 L 6.8730469 7.6113281 z\"/></svg>"),
Rules: []string{
"||leagueoflegends.co.kr^",
"||leagueoflegends.com^",
"||lol.riotgames.com^",
"||lolstatic.com^",
"||lolusercontent.com^",
}, </s> remove "||fedibird.com^",
</s> add </s> remove IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.0\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"),
</s> add IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"), </s> remove prefix := hash[0:2]
if !bytes.Equal(prefix, prevPrefix) {
</s> add // nolint:looppointer // The subsilce is used for a safe comparison.
if !bytes.Equal(hash[0:2], prevPrefix) { | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/servicelist.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "||awscommunity.social^",
<mask> "||cyberplace.social^",
<mask> "||defcon.social^",
<mask> "||det.social^",
<mask> "||fedibird.com^",
<mask> "||fosstodon.org^",
<mask> "||glasgow.social^",
<mask> "||h4.io^",
<mask> "||hachyderm.io^",
<mask> "||hessen.social^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add "||cupoftea.social^", </s> remove go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
</s> add go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= </s> add github.com/mdlayher/packet v1.1.1 h1:7Fv4OEMYqPl7//uBm04VgPpnSNi8fbBZznppgh6WMr8=
github.com/mdlayher/packet v1.1.1/go.mod h1:DRvYY5mH4M4lUqAnMg04E60U4fjUKMZ/4g2cHElZkKo= </s> remove github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c h1:OCFM4+DXTWfNlyeoddrTwdup/ztkGSyAMR2UGcPckNQ=
github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
</s> add github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 h1:Z72DOke2yOK0Ms4Z2LK1E1OrRJXOxSj5DllTz2FYTRg=
github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8/go.mod h1:m5WMe03WCvWcXjRnhvaAbAAXdCnu20J5P+mmH44ZzpE= </s> remove github.com/josharian/native v1.0.0 h1:Ts/E8zCSEsG17dUqv7joXJFybuMLjQfWE04tsBODTxk=
</s> add </s> add github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/servicelist.go |
keep keep keep add keep keep keep keep | <mask> "||mastodon.social^",
<mask> "||mastodon.top^",
<mask> "||mastodon.uno^",
<mask> "||mastodon.world^",
<mask> "||mastodonapp.uk^",
<mask> "||mastodonners.nl^",
<mask> "||mastodont.cat^",
<mask> "||mastodontech.de^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/onsi/ginkgo/v2 v2.5.0 h1:TRtrvv2vdQqzkwrQ1ke6vtXf7IK34RBUJafIy1wMwls=
github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
github.com/onsi/gomega v1.24.0 h1:+0glovB9Jd6z3VR+ScSwQqXVTIfJcGA9UBM8yzQxhqg=
</s> add github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> remove github.com/josharian/native v1.0.0 h1:Ts/E8zCSEsG17dUqv7joXJFybuMLjQfWE04tsBODTxk=
</s> add </s> add github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= </s> remove github.com/lucas-clemente/quic-go v0.31.0 h1:MfNp3fk0wjWRajw6quMFA3ap1AVtlU+2mtwmbVogB2M=
github.com/lucas-clemente/quic-go v0.31.0/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g=
</s> add github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4=
github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g= </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its=
github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE=
github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= </s> remove github.com/mdlayher/netlink v1.1.2-0.20201013204415-ded538f7f4be/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
github.com/mdlayher/packet v1.0.0 h1:InhZJbdShQYt6XV2GPj5XHxChzOfhJJOMbvnGAmOfQ8=
</s> add github.com/mdlayher/netlink v1.7.1 h1:FdUaT/e33HjEXagwELR8R3/KL1Fq5x3G5jgHLp/BTmg=
github.com/mdlayher/netlink v1.7.1/go.mod h1:nKO5CSjE/DJjVhk/TNp6vCE1ktVxEA8VEh8drhZzxsQ= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/servicelist.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> "||metalhead.club^",
<mask> "||mindly.social^",
<mask> "||mstdn.ca^",
<mask> "||mstdn.jp^",
<mask> "||mstdn.party^",
<mask> "||mstdn.plus^",
<mask> "||mstdn.social^",
<mask> "||muenchen.social^",
<mask> "||muenster.im^",
<mask> "||newsie.social^",
<mask> "||noc.social^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820 h1:fggBTMFbBz7CMny3mWZphe0B/6D8ILBunvvB1cNNHi8=
mvdan.cc/unparam v0.0.0-20220926085101-66de63301820/go.mod h1:7fKhD/gH+APJ9Y27S2PYO7+oVWtb3XPrw9W5ayxVq2A=
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 h1:n/xhncJPSt0YzfOhnyn41XxUdrWQNgmLBG72FE27Fqw=
mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95/go.mod h1:2vU506e8nGWodqcci641NLi4im2twWSq4Lod756epHQ= </s> remove github.com/onsi/ginkgo/v2 v2.5.0 h1:TRtrvv2vdQqzkwrQ1ke6vtXf7IK34RBUJafIy1wMwls=
github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
github.com/onsi/gomega v1.24.0 h1:+0glovB9Jd6z3VR+ScSwQqXVTIfJcGA9UBM8yzQxhqg=
</s> add github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= </s> remove github.com/lucas-clemente/quic-go v0.31.0 h1:MfNp3fk0wjWRajw6quMFA3ap1AVtlU+2mtwmbVogB2M=
github.com/lucas-clemente/quic-go v0.31.0/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g=
</s> add github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4=
github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g= </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI=
github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its=
github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE=
github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= </s> remove github.com/mdlayher/netlink v1.1.2-0.20201013204415-ded538f7f4be/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
github.com/mdlayher/netlink v1.6.2/go.mod h1:O1HXX2sIWSMJ3Qn1BYZk1yZM+7iMki/uYGGiwGyq/iU=
github.com/mdlayher/packet v1.0.0 h1:InhZJbdShQYt6XV2GPj5XHxChzOfhJJOMbvnGAmOfQ8=
</s> add github.com/mdlayher/netlink v1.7.1 h1:FdUaT/e33HjEXagwELR8R3/KL1Fq5x3G5jgHLp/BTmg=
github.com/mdlayher/netlink v1.7.1/go.mod h1:nKO5CSjE/DJjVhk/TNp6vCE1ktVxEA8VEh8drhZzxsQ= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/servicelist.go |
keep add keep keep keep keep | <mask> "||universeodon.com^",
<mask> "||urbanists.social^",
<mask> "||wxw.moe^",
<mask> },
<mask> }, {
<mask> ID: "minecraft",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add "14": "consent",
"15": "telemetry", </s> add }, {
ID: "xboxlive",
Name: "Xbox Live",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 84 84\" xml:space=\"preserve\"><g transform=\"translate(-59.355 -42.513)\"><g transform=\"matrix(.26458 0 0 .26458 -145.88 -71.438)\" fill=\"currentColor\"><path d=\"m936.09 559.48s0.4 0 0 0c48.4 36.8 130.4 127.2 105.6 152.8-28.4 24.8-65.2 39.6-105.6 39.6s-77.6-14.8-105.6-39.6c-25.2-25.6 57.2-116 105.2-152.4 0-0.4 0.4-0.4 0.4-0.4zm83.6-105.2c-24.4-14.8-51.2-23.6-83.6-23.6s-59.2 8.8-83.6 23.6c-0.4 0-0.4 0.4-0.4 0.8s0.4 0.4 0.8 0.4c31.2-6.8 78.4 20 82.8 22.8h0.8c4.4-2.8 51.6-29.6 82.8-22.8 0.4 0 0.8 0 0.8-0.4s0-0.8-0.4-0.8zm-196 22.4c-0.4 0-0.4 0.4-0.8 0.4-29.2 29.2-47.2 69.6-47.2 114 0 36.4 12.4 70.4 32.8 97.2 0 0.4 0.4 0.4 0.8 0.4s0.4-0.4 0-0.8c-12.4-38 50.4-129.6 82.8-168l0.4-0.4c0-0.4 0-0.4-0.4-0.4-49.2-48.8-65.6-43.6-68.4-42.4zm156.4 42-0.4 0.4s0 0.4 0.4 0.4c32.4 38.4 94.8 130 82.8 168v0.8c0.4 0 0.8 0 0.8-0.4 20.4-26.8 32.8-60.8 32.8-97.2 0-44.4-18-84.8-47.6-114-0.4-0.4-0.4-0.4-0.8-0.4-2.4-0.8-18.8-6-68 42.4z\"/></g></g></svg>"),
Rules: []string{
"||gamepass.com^",
"||xbox-global.ifs.windows.com^",
"||xbox-guide-public.rec.mp.microsoft.com^",
"||xbox.ipv6.microsoft.com^",
"||xboxab.com^",
"||xboxab.net^",
"||xboxlive.com^",
"||xboxservices.com^",
}, </s> add }, {
ID: "leagueoflegends",
Name: "League of Legends",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\" width=\"60px\" height=\"60px\"><path d=\"M 7 4 L 9 7.25 L 9 22.75 L 6.875 26 L 21.957031 26 L 25 22 L 14 22 L 14 4 L 7 4 z M 16 4.0507812 L 16 6.0585938 C 20.493 6.5575937 24 10.375 24 15 C 24 16.849 23.438516 18.569 22.478516 20 L 24.785156 20 C 25.556156 18.498 26 16.801 26 15 C 26 9.272 21.598 4.5577812 16 4.0507812 z M 6.8730469 7.6113281 C 5.0940469 9.5663281 4 12.155 4 15 C 4 17.837 5.0884219 20.418094 6.8574219 22.371094 L 7 22.154297 L 7 19.105469 C 6.365 17.872469 6 16.479 6 15 C 6 13.521 6.365 12.127531 7 10.894531 L 7 7.8164062 L 6.8730469 7.6113281 z\"/></svg>"),
Rules: []string{
"||leagueoflegends.co.kr^",
"||leagueoflegends.com^",
"||lol.riotgames.com^",
"||lolstatic.com^",
"||lolusercontent.com^",
}, </s> add "||mask-canary.icloud.com^$dnsrewrite=NXDOMAIN;;", </s> remove IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.0\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"),
</s> add IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"), </s> remove prefix := hash[0:2]
if !bytes.Equal(prefix, prevPrefix) {
</s> add // nolint:looppointer // The subsilce is used for a safe comparison.
if !bytes.Equal(hash[0:2], prevPrefix) { | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/servicelist.go |
keep keep keep keep replace keep keep keep keep keep | <mask> },
<mask> }, {
<mask> ID: "onlyfans",
<mask> Name: "OnlyFans",
<mask> IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.0\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"),
<mask> Rules: []string{
<mask> "||onlyfans.com^",
<mask> },
<mask> }, {
<mask> ID: "origin",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add }, {
ID: "leagueoflegends",
Name: "League of Legends",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\" width=\"60px\" height=\"60px\"><path d=\"M 7 4 L 9 7.25 L 9 22.75 L 6.875 26 L 21.957031 26 L 25 22 L 14 22 L 14 4 L 7 4 z M 16 4.0507812 L 16 6.0585938 C 20.493 6.5575937 24 10.375 24 15 C 24 16.849 23.438516 18.569 22.478516 20 L 24.785156 20 C 25.556156 18.498 26 16.801 26 15 C 26 9.272 21.598 4.5577812 16 4.0507812 z M 6.8730469 7.6113281 C 5.0940469 9.5663281 4 12.155 4 15 C 4 17.837 5.0884219 20.418094 6.8574219 22.371094 L 7 22.154297 L 7 19.105469 C 6.365 17.872469 6 16.479 6 15 C 6 13.521 6.365 12.127531 7 10.894531 L 7 7.8164062 L 6.8730469 7.6113281 z\"/></svg>"),
Rules: []string{
"||leagueoflegends.co.kr^",
"||leagueoflegends.com^",
"||lol.riotgames.com^",
"||lolstatic.com^",
"||lolusercontent.com^",
}, </s> add }, {
ID: "xboxlive",
Name: "Xbox Live",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 84 84\" xml:space=\"preserve\"><g transform=\"translate(-59.355 -42.513)\"><g transform=\"matrix(.26458 0 0 .26458 -145.88 -71.438)\" fill=\"currentColor\"><path d=\"m936.09 559.48s0.4 0 0 0c48.4 36.8 130.4 127.2 105.6 152.8-28.4 24.8-65.2 39.6-105.6 39.6s-77.6-14.8-105.6-39.6c-25.2-25.6 57.2-116 105.2-152.4 0-0.4 0.4-0.4 0.4-0.4zm83.6-105.2c-24.4-14.8-51.2-23.6-83.6-23.6s-59.2 8.8-83.6 23.6c-0.4 0-0.4 0.4-0.4 0.8s0.4 0.4 0.8 0.4c31.2-6.8 78.4 20 82.8 22.8h0.8c4.4-2.8 51.6-29.6 82.8-22.8 0.4 0 0.8 0 0.8-0.4s0-0.8-0.4-0.8zm-196 22.4c-0.4 0-0.4 0.4-0.8 0.4-29.2 29.2-47.2 69.6-47.2 114 0 36.4 12.4 70.4 32.8 97.2 0 0.4 0.4 0.4 0.8 0.4s0.4-0.4 0-0.8c-12.4-38 50.4-129.6 82.8-168l0.4-0.4c0-0.4 0-0.4-0.4-0.4-49.2-48.8-65.6-43.6-68.4-42.4zm156.4 42-0.4 0.4s0 0.4 0.4 0.4c32.4 38.4 94.8 130 82.8 168v0.8c0.4 0 0.8 0 0.8-0.4 20.4-26.8 32.8-60.8 32.8-97.2 0-44.4-18-84.8-47.6-114-0.4-0.4-0.4-0.4-0.8-0.4-2.4-0.8-18.8-6-68 42.4z\"/></g></g></svg>"),
Rules: []string{
"||gamepass.com^",
"||xbox-global.ifs.windows.com^",
"||xbox-guide-public.rec.mp.microsoft.com^",
"||xbox.ipv6.microsoft.com^",
"||xboxab.com^",
"||xboxab.net^",
"||xboxlive.com^",
"||xboxservices.com^",
}, </s> add "||mask-canary.icloud.com^$dnsrewrite=NXDOMAIN;;", </s> add "||cupoftea.social^", </s> add "||vocalodon.net^", </s> add "14": "consent",
"15": "telemetry", | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/servicelist.go |
keep keep keep keep replace keep keep keep keep keep | <mask> },
<mask> }, {
<mask> ID: "rakuten_viki",
<mask> Name: "Rakuten Viki",
<mask> IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><path d=\"M 5 5 L 5 45 L 45 45 L 45 5 L 5 5 z M 19.435547 14 L 19.4375 14 L 20.587891 14 L 20.587891 17.21875 L 21.929688 15.570312 L 23.496094 15.570312 L 21.578125 17.789062 L 23.802734 20.302734 L 22.236328 20.302734 L 20.587891 18.357422 L 20.587891 20.302734 L 19.435547 20.302734 L 19.435547 14 z M 10.001953 14.390625 L 11.933594 14.390625 C 13.105594 14.390625 14.056641 15.304687 14.056641 16.429688 C 14.056641 17.114687 13.701109 17.719797 13.162109 18.091797 L 14.892578 20.302734 L 13.427734 20.302734 L 11.996094 18.470703 L 11.169922 18.470703 L 11.169922 20.302734 L 10.001953 20.302734 L 10.001953 14.390625 z M 28.746094 14.390625 L 29.865234 14.390625 L 29.865234 15.568359 L 30.820312 15.568359 L 30.820312 16.691406 L 29.865234 16.691406 L 29.865234 18.716797 C 29.865234 19.163797 30.210578 19.298828 30.392578 19.298828 C 30.538578 19.298828 30.665625 19.246641 30.765625 19.181641 L 31.501953 20.123047 C 31.150953 20.323047 30.719203 20.421875 30.408203 20.421875 C 29.574203 20.421875 28.746094 19.791375 28.746094 18.734375 L 28.746094 16.691406 L 28.154297 16.691406 L 28.154297 15.570312 L 28.15625 15.570312 L 28.746094 15.570312 L 28.746094 14.390625 z M 33.347656 15.449219 C 34.620656 15.449219 35.762281 16.566578 35.488281 18.267578 L 32.269531 18.267578 C 32.416531 19.349578 33.688172 19.898406 34.451172 18.816406 L 35.439453 19.363281 C 34.804453 20.229281 34.048984 20.423828 33.458984 20.423828 C 32.290984 20.423828 31.126953 19.401547 31.126953 17.935547 C 31.126953 16.541547 32.053656 15.449219 33.347656 15.449219 z M 16.628906 15.453125 C 17.041906 15.453125 17.344641 15.573297 17.681641 15.779297 L 17.681641 15.570312 L 18.800781 15.570312 L 18.800781 20.302734 L 17.681641 20.302734 L 17.681641 20.09375 C 17.344641 20.29975 17.042906 20.419922 16.628906 20.419922 C 15.357906 20.419922 14.392578 19.3055 14.392578 17.9375 C 14.391578 16.5695 15.356906 15.453125 16.628906 15.453125 z M 38 15.453125 C 39.187 15.453125 40 16.379484 40 17.521484 L 40 20.302734 L 38.882812 20.302734 L 38.882812 17.521484 C 38.882812 17.000484 38.509797 16.560547 37.966797 16.560547 C 37.423797 16.560547 37.050781 17.000484 37.050781 17.521484 L 37.050781 20.302734 C 37.050781 20.302734 35.931641 20.303734 35.931641 20.302734 L 35.931641 15.570312 L 37.050781 15.570312 L 37.050781 15.744141 C 37.050781 15.744141 37.45 15.453125 38 15.453125 z M 11.169922 15.513672 L 11.169922 17.345703 L 11.931641 17.345703 C 12.456641 17.346703 12.886719 16.936688 12.886719 16.429688 C 12.886719 15.924687 12.456641 15.513672 11.931641 15.513672 L 11.169922 15.513672 z M 23.685547 15.570312 L 24.802734 15.570312 L 24.802734 18.351562 C 24.802734 18.872563 25.17575 19.314453 25.71875 19.314453 C 26.26175 19.314453 26.634766 18.872563 26.634766 18.351562 L 26.634766 15.570312 L 27.753906 15.570312 L 27.753906 20.304688 L 26.634766 20.304688 L 26.634766 20.128906 C 26.634766 20.128906 26.235547 20.421875 25.685547 20.421875 C 24.498547 20.421875 23.685547 19.493562 23.685547 18.351562 L 23.685547 15.570312 z M 33.324219 16.470703 C 32.877344 16.478703 32.428047 16.772172 32.310547 17.326172 L 34.324219 17.326172 C 34.215219 16.740172 33.771094 16.462703 33.324219 16.470703 z M 16.628906 16.59375 C 16.001906 16.59375 15.542969 17.1885 15.542969 17.9375 C 15.542969 18.6875 16.001906 19.279297 16.628906 19.279297 C 17.255906 19.279297 17.698219 18.6865 17.699219 17.9375 C 17.699219 17.1875 17.255906 16.59375 16.628906 16.59375 z M 16.240234 21.587891 L 34.472656 21.587891 L 17.693359 23.046875 L 16.240234 21.587891 z M 10 25.466797 L 13.179688 25.466797 L 15.326172 32.365234 L 17.441406 25.466797 L 20.607422 25.466797 L 16.578125 36 L 14.074219 36 L 10 25.466797 z M 21.617188 25.466797 L 24.628906 25.466797 L 24.628906 36 L 21.617188 36 L 21.617188 25.466797 z M 26.335938 25.466797 L 29.347656 25.466797 L 29.347656 29.470703 L 32.681641 25.466797 L 36.078125 25.466797 L 32.095703 30.183594 L 36.355469 36 L 32.896484 36 L 30.179688 32.126953 L 29.347656 32.957031 L 29.347656 36 L 26.335938 36 L 26.335938 25.466797 z M 36.988281 25.466797 L 40 25.466797 L 40 36 L 36.988281 36 L 36.988281 25.466797 z\"/></svg>"),
<mask> Rules: []string{
<mask> "||m-content-viki.s.llnwi.net^",
<mask> "||viki.com^",
<mask> "||viki.io^",
<mask> },
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add }, {
ID: "leagueoflegends",
Name: "League of Legends",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\" width=\"60px\" height=\"60px\"><path d=\"M 7 4 L 9 7.25 L 9 22.75 L 6.875 26 L 21.957031 26 L 25 22 L 14 22 L 14 4 L 7 4 z M 16 4.0507812 L 16 6.0585938 C 20.493 6.5575937 24 10.375 24 15 C 24 16.849 23.438516 18.569 22.478516 20 L 24.785156 20 C 25.556156 18.498 26 16.801 26 15 C 26 9.272 21.598 4.5577812 16 4.0507812 z M 6.8730469 7.6113281 C 5.0940469 9.5663281 4 12.155 4 15 C 4 17.837 5.0884219 20.418094 6.8574219 22.371094 L 7 22.154297 L 7 19.105469 C 6.365 17.872469 6 16.479 6 15 C 6 13.521 6.365 12.127531 7 10.894531 L 7 7.8164062 L 6.8730469 7.6113281 z\"/></svg>"),
Rules: []string{
"||leagueoflegends.co.kr^",
"||leagueoflegends.com^",
"||lol.riotgames.com^",
"||lolstatic.com^",
"||lolusercontent.com^",
}, </s> add }, {
ID: "xboxlive",
Name: "Xbox Live",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 84 84\" xml:space=\"preserve\"><g transform=\"translate(-59.355 -42.513)\"><g transform=\"matrix(.26458 0 0 .26458 -145.88 -71.438)\" fill=\"currentColor\"><path d=\"m936.09 559.48s0.4 0 0 0c48.4 36.8 130.4 127.2 105.6 152.8-28.4 24.8-65.2 39.6-105.6 39.6s-77.6-14.8-105.6-39.6c-25.2-25.6 57.2-116 105.2-152.4 0-0.4 0.4-0.4 0.4-0.4zm83.6-105.2c-24.4-14.8-51.2-23.6-83.6-23.6s-59.2 8.8-83.6 23.6c-0.4 0-0.4 0.4-0.4 0.8s0.4 0.4 0.8 0.4c31.2-6.8 78.4 20 82.8 22.8h0.8c4.4-2.8 51.6-29.6 82.8-22.8 0.4 0 0.8 0 0.8-0.4s0-0.8-0.4-0.8zm-196 22.4c-0.4 0-0.4 0.4-0.8 0.4-29.2 29.2-47.2 69.6-47.2 114 0 36.4 12.4 70.4 32.8 97.2 0 0.4 0.4 0.4 0.8 0.4s0.4-0.4 0-0.8c-12.4-38 50.4-129.6 82.8-168l0.4-0.4c0-0.4 0-0.4-0.4-0.4-49.2-48.8-65.6-43.6-68.4-42.4zm156.4 42-0.4 0.4s0 0.4 0.4 0.4c32.4 38.4 94.8 130 82.8 168v0.8c0.4 0 0.8 0 0.8-0.4 20.4-26.8 32.8-60.8 32.8-97.2 0-44.4-18-84.8-47.6-114-0.4-0.4-0.4-0.4-0.8-0.4-2.4-0.8-18.8-6-68 42.4z\"/></g></g></svg>"),
Rules: []string{
"||gamepass.com^",
"||xbox-global.ifs.windows.com^",
"||xbox-guide-public.rec.mp.microsoft.com^",
"||xbox.ipv6.microsoft.com^",
"||xboxab.com^",
"||xboxab.net^",
"||xboxlive.com^",
"||xboxservices.com^",
}, </s> add "||mask-canary.icloud.com^$dnsrewrite=NXDOMAIN;;", </s> remove IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.0\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"),
</s> add IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"), </s> add "||vocalodon.net^", </s> add "||cupoftea.social^", | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/servicelist.go |
keep add keep keep keep keep keep keep | <mask> "||whatsappbrand.com^",
<mask> },
<mask> }, {
<mask> ID: "youtube",
<mask> Name: "YouTube",
<mask> IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 24 24\"><path d=\"M19.695 4.04S15.348 3.2 12 3.2s-7.695.84-7.695.84L1.602 7.2v9.6l2.703 3.16s4.347.84 7.695.84 7.695-.84 7.695-.84l2.703-3.16V12 7.2zM9.602 15.68V8.32L16 12zm0 0\" /><path d=\"M19.2 4a3.198 3.198 0 1 0 0 6.398c1.769 0 3.198-1.43 3.198-3.199C22.398 5.434 20.968 4 19.2 4zm0 9.602a3.198 3.198 0 1 0 0 6.398c1.769 0 3.198-1.434 3.198-3.2 0-1.769-1.43-3.198-3.199-3.198zM1.601 7.199c0 1.77 1.43 3.2 3.199 3.2 1.765 0 2.398-1.43 2.398-3.2C7.2 5.434 6.566 4 4.801 4 3.03 4 1.6 5.434 1.6 7.2zM4.8 13.602c-1.77 0-3.2 1.43-3.2 3.199A3.198 3.198 0 1 0 8 16.8c0-1.77-1.434-3.2-3.2-3.2zm0 0\" /></svg>"),
<mask> Rules: []string{
<mask> "||ggpht.cn^",
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> add }, {
ID: "leagueoflegends",
Name: "League of Legends",
IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\" width=\"60px\" height=\"60px\"><path d=\"M 7 4 L 9 7.25 L 9 22.75 L 6.875 26 L 21.957031 26 L 25 22 L 14 22 L 14 4 L 7 4 z M 16 4.0507812 L 16 6.0585938 C 20.493 6.5575937 24 10.375 24 15 C 24 16.849 23.438516 18.569 22.478516 20 L 24.785156 20 C 25.556156 18.498 26 16.801 26 15 C 26 9.272 21.598 4.5577812 16 4.0507812 z M 6.8730469 7.6113281 C 5.0940469 9.5663281 4 12.155 4 15 C 4 17.837 5.0884219 20.418094 6.8574219 22.371094 L 7 22.154297 L 7 19.105469 C 6.365 17.872469 6 16.479 6 15 C 6 13.521 6.365 12.127531 7 10.894531 L 7 7.8164062 L 6.8730469 7.6113281 z\"/></svg>"),
Rules: []string{
"||leagueoflegends.co.kr^",
"||leagueoflegends.com^",
"||lol.riotgames.com^",
"||lolstatic.com^",
"||lolusercontent.com^",
}, </s> add "||cupoftea.social^", </s> add "||mask-canary.icloud.com^$dnsrewrite=NXDOMAIN;;", </s> remove IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.0\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"),
</s> add IconSVG: []byte("<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"currentColor\" viewBox=\"0 0 512 512\"><path d=\"M157 97c-23.9 3.1-43.2 9.7-63.5 21.8-24.7 14.7-47.6 39.5-60.8 65.8-5.3 10.5-12 30-13.7 39.4-.6 3.6-1.4 7.6-1.7 9-1 4.8-1.2 35.6-.2 43 1.2 9.1 5.8 29.1 7 30.4.5.6.9 1.6.9 2.4 0 2.5 8.2 20.3 12.9 28.2 8.8 14.6 12.9 19.8 25.7 32.6 21.9 22 49.5 36.9 79.4 43.1 17.9 3.7 42.5 4.2 60 1.2 30.9-5.2 60.2-19.9 83.1-41.7 14.3-13.6 25.2-28.6 35.4-48.7 1.8-3.6 2.4-4 6.5-4.3 7.4-.5 23.9-4.1 33.2-7.2 20-6.7 39.1-19.1 52.3-34.1 13.5-15.3 21.7-30.3 28.1-50.9 1.8-5.8 3.1-10.6 3-10.8-.2-.1-2.7.3-5.7.8-13.7 2.7-19.5 3.2-38.9 3.5-16.5.3-27.8-.7-39-3.4-4.1-1-3.5-1.2 7-3.6 13.7-3.2 31.3-9.5 44.5-16 16.4-8.1 17.5-8.8 28.2-16.7 19.7-14.7 33.7-31.5 44.4-53.3 4.1-8.5 10.9-27.6 10.9-30.7 0-1-129.5-.6-133.5.4-1.1.3-4.7.9-8 1.2-31 3.6-52.9 13.4-69.6 31.3l-4.6 4.9-3.9-3.3c-16.8-14.3-43.9-27.1-67.4-32-14.2-2.9-38.6-4-52-2.3zm33.6 113.4c6.8 2.1 16 8.2 21.3 14.2 4.7 5.2 9.6 14.7 10.7 20.4 3.3 17.8-1.3 33.1-13.6 45.1-3.8 3.8-7.5 6.9-8.2 6.9-.6 0-1.9.6-2.7 1.3-2.8 2.4-13.1 5-20.8 5.2-13.9.5-25-4-35-14.1-4.1-4-7.4-8.5-9.3-12.6-10.5-22.7-2.6-49 18.6-61.8 11-6.6 26.5-8.4 39-4.6z\"/></svg>"), </s> remove prefix := hash[0:2]
if !bytes.Equal(prefix, prevPrefix) {
</s> add // nolint:looppointer // The subsilce is used for a safe comparison.
if !bytes.Equal(hash[0:2], prevPrefix) { </s> add "||vocalodon.net^", | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/filtering/servicelist.go |
keep keep keep replace replace replace keep replace replace keep keep keep | <mask> require (
<mask> github.com/fzipp/gocyclo v0.6.0
<mask> github.com/golangci/misspell v0.4.0
<mask> github.com/gordonklaus/ineffassign v0.0.0-20220928193011-d2c82e48359b
<mask> github.com/kisielk/errcheck v1.6.2
<mask> github.com/kyoh86/looppointer v0.1.9
<mask> github.com/securego/gosec/v2 v2.14.0
<mask> golang.org/x/tools v0.2.0
<mask> golang.org/x/vuln v0.0.0-20221103225512-4f561ca73b59
<mask> honnef.co/go/tools v0.3.3
<mask> mvdan.cc/gofumpt v0.4.0
<mask> mvdan.cc/unparam v0.0.0-20220926085101-66de63301820
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820 h1:fggBTMFbBz7CMny3mWZphe0B/6D8ILBunvvB1cNNHi8=
mvdan.cc/unparam v0.0.0-20220926085101-66de63301820/go.mod h1:7fKhD/gH+APJ9Y27S2PYO7+oVWtb3XPrw9W5ayxVq2A=
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 h1:n/xhncJPSt0YzfOhnyn41XxUdrWQNgmLBG72FE27Fqw=
mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95/go.mod h1:2vU506e8nGWodqcci641NLi4im2twWSq4Lod756epHQ= </s> remove github.com/gordonklaus/ineffassign v0.0.0-20220928193011-d2c82e48359b h1:TYNAU9lu7ggdAereRq0dzCIDzHu9mNyGLj/hd5PXq8I=
github.com/gordonklaus/ineffassign v0.0.0-20220928193011-d2c82e48359b/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c=
github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw=
</s> add github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 h1:9alfqbrhuD+9fLZ4iaAVwhlp5PEhmnBt7yvK2Oy5C1U=
github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
github.com/kisielk/errcheck v1.6.3 h1:dEKh+GLHcWm2oN34nMvDzn1sqI0i0WxPvrgiJA5JuM8=
github.com/kisielk/errcheck v1.6.3/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= </s> remove github.com/kyoh86/looppointer v0.1.9 h1:siTt2dqv+pW3y5gvykZXhlVcTnUVMDf11bGlB9GL5PI=
github.com/kyoh86/looppointer v0.1.9/go.mod h1:q358WcM8cMWU+5vzqukvaZtnJi1kw/MpRHQm3xvTrjw=
</s> add github.com/kyoh86/looppointer v0.2.1 h1:Jx9fnkBj/JrIryBLMTYNTj9rvc2SrPS98Dg0w7fxdJg=
github.com/kyoh86/looppointer v0.2.1/go.mod h1:q358WcM8cMWU+5vzqukvaZtnJi1kw/MpRHQm3xvTrjw= </s> remove golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
golang.org/x/vuln v0.0.0-20221103225512-4f561ca73b59 h1:eOOJSuIRc2QwKAgX5qOIhUZJAd2LLKSBfk839dv+Clo=
golang.org/x/vuln v0.0.0-20221103225512-4f561ca73b59/go.mod h1:F12iebNzxRMpJsm4W7ape+r/KdnXiSy3VC94WsyCG68=
</s> add golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ=
golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33 h1:je2aB5nnlseeGvJy5clg6EyC3jjbbCNsRDroC3qQJsA=
golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/tools/go.mod |
keep keep keep keep replace keep keep keep keep keep | <mask> golang.org/x/tools v0.2.0
<mask> golang.org/x/vuln v0.0.0-20221103225512-4f561ca73b59
<mask> honnef.co/go/tools v0.3.3
<mask> mvdan.cc/gofumpt v0.4.0
<mask> mvdan.cc/unparam v0.0.0-20220926085101-66de63301820
<mask> )
<mask>
<mask> require (
<mask> github.com/BurntSushi/toml v1.2.1 // indirect
<mask> github.com/google/go-cmp v0.5.9 // indirect
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/tools v0.2.0
golang.org/x/vuln v0.0.0-20221103225512-4f561ca73b59
</s> add golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2
golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33 </s> remove github.com/gordonklaus/ineffassign v0.0.0-20220928193011-d2c82e48359b
github.com/kisielk/errcheck v1.6.2
github.com/kyoh86/looppointer v0.1.9
</s> add github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28
github.com/kisielk/errcheck v1.6.3
github.com/kyoh86/looppointer v0.2.1 </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820 h1:fggBTMFbBz7CMny3mWZphe0B/6D8ILBunvvB1cNNHi8=
mvdan.cc/unparam v0.0.0-20220926085101-66de63301820/go.mod h1:7fKhD/gH+APJ9Y27S2PYO7+oVWtb3XPrw9W5ayxVq2A=
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 h1:n/xhncJPSt0YzfOhnyn41XxUdrWQNgmLBG72FE27Fqw=
mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95/go.mod h1:2vU506e8nGWodqcci641NLi4im2twWSq4Lod756epHQ= </s> remove golang.org/x/text v0.5.0 // indirect
golang.org/x/tools v0.2.0 // indirect
</s> add golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
golang.org/x/mod v0.6.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect </s> remove golang.org/x/sys v0.2.0 // indirect
</s> add golang.org/x/sys v0.4.0 // indirect | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/tools/go.mod |
keep keep replace replace replace keep replace | <mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
<mask> github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
<mask> golang.org/x/exp v0.0.0-20221106115401-f9659909a136 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20221106115401-f9659909a136 // indirect
<mask> golang.org/x/mod v0.6.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/sys v0.2.0 // indirect
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/text v0.5.0 // indirect
golang.org/x/tools v0.2.0 // indirect
</s> add golang.org/x/text v0.6.0 // indirect
golang.org/x/tools v0.5.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
golang.org/x/mod v0.6.0 // indirect
</s> add github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
golang.org/x/mod v0.7.0 // indirect </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
github.com/mdlayher/packet v1.0.0 // indirect
github.com/mdlayher/socket v0.2.3 // indirect
github.com/onsi/ginkgo/v2 v2.5.0 // indirect
</s> add github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect
github.com/mdlayher/packet v1.1.1 // indirect
github.com/mdlayher/socket v0.4.0 // indirect
github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> remove github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/josharian/native v1.0.0 // indirect
</s> add github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
github.com/josharian/native v1.1.0 // indirect </s> remove mvdan.cc/unparam v0.0.0-20220926085101-66de63301820
</s> add mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/tools/go.mod |
keep keep keep replace replace replace replace keep keep replace replace keep keep keep keep | <mask> github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
<mask> github.com/gookit/color v1.5.2 h1:uLnfXcaFjlrDnQDT+NCBcfhrXqYTx/rcCa6xn01Y8yI=
<mask> github.com/gookit/color v1.5.2/go.mod h1:w8h4bGiHeeBpvQVePTutdbERIUf3oJE5lZ8HM0UgXyg=
<mask> github.com/gordonklaus/ineffassign v0.0.0-20220928193011-d2c82e48359b h1:TYNAU9lu7ggdAereRq0dzCIDzHu9mNyGLj/hd5PXq8I=
<mask> github.com/gordonklaus/ineffassign v0.0.0-20220928193011-d2c82e48359b/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
<mask> github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c=
<mask> github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw=
<mask> github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
<mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kyoh86/looppointer v0.1.9 h1:siTt2dqv+pW3y5gvykZXhlVcTnUVMDf11bGlB9GL5PI=
<mask> github.com/kyoh86/looppointer v0.1.9/go.mod h1:q358WcM8cMWU+5vzqukvaZtnJi1kw/MpRHQm3xvTrjw=
<mask> github.com/kyoh86/nolint v0.0.1 h1:GjNxDEkVn2wAxKHtP7iNTrRxytRZ1wXxLV5j4XzGfRU=
<mask> github.com/kyoh86/nolint v0.0.1/go.mod h1:1ZiZZ7qqrZ9dZegU96phwVcdQOMKIqRzFJL3ewq9gtI=
<mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6FxaNu/BnU2OAaLF86eTVhP2hjTB6iMvItA=
<mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove github.com/gordonklaus/ineffassign v0.0.0-20220928193011-d2c82e48359b
github.com/kisielk/errcheck v1.6.2
github.com/kyoh86/looppointer v0.1.9
</s> add github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28
github.com/kisielk/errcheck v1.6.3
github.com/kyoh86/looppointer v0.2.1 </s> remove golang.org/x/tools v0.2.0
golang.org/x/vuln v0.0.0-20221103225512-4f561ca73b59
</s> add golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2
golang.org/x/vuln v0.0.0-20230130175424-dd534eeddf33 </s> remove golang.org/x/exp v0.0.0-20221106115401-f9659909a136 // indirect
golang.org/x/exp/typeparams v0.0.0-20221106115401-f9659909a136 // indirect
golang.org/x/mod v0.6.0 // indirect
</s> add golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/mod v0.7.0 // indirect </s> remove github.com/lucas-clemente/quic-go v0.31.0 h1:MfNp3fk0wjWRajw6quMFA3ap1AVtlU+2mtwmbVogB2M=
github.com/lucas-clemente/quic-go v0.31.0/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g=
</s> add github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4=
github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g= </s> remove github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
</s> add github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f h1:gl1DCiSk+mrXXBGPm6CEeS2MkJuMVzAOrXg34oVj1QI=
github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/tools/go.sum |
keep replace replace replace replace keep keep keep replace replace keep | <mask> golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
<mask> golang.org/x/exp v0.0.0-20221106115401-f9659909a136 h1:Fq7F/w7MAa1KJ5bt2aJ62ihqp9HDcRuyILskkpIAurw=
<mask> golang.org/x/exp v0.0.0-20221106115401-f9659909a136/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
<mask> golang.org/x/exp/typeparams v0.0.0-20221106115401-f9659909a136 h1:962j4VxUJV3GKI6NxKDI9NjATh+tAixlH+9k9MvHSlU=
<mask> golang.org/x/exp/typeparams v0.0.0-20221106115401-f9659909a136/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
<mask> golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
<mask> golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
</s> add golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
golang.org/x/exp v0.0.0-20221106115401-f9659909a136 h1:Fq7F/w7MAa1KJ5bt2aJ62ihqp9HDcRuyILskkpIAurw=
golang.org/x/exp v0.0.0-20221106115401-f9659909a136/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
</s> add golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 h1:BEABXpNXLEz0WxtA+6CQIz2xkg80e+1zrhWyMcq8VzE=
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/exp v0.0.0-20221106115401-f9659909a136 // indirect
golang.org/x/exp/typeparams v0.0.0-20221106115401-f9659909a136 // indirect
golang.org/x/mod v0.6.0 // indirect
</s> add golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/exp/typeparams v0.0.0-20230131160201-f062dba9d201 // indirect
golang.org/x/mod v0.7.0 // indirect </s> remove golang.org/x/sys v0.2.0 // indirect
</s> add golang.org/x/sys v0.4.0 // indirect </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/tools/go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
<mask> golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
<mask> golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
</s> add golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= </s> remove golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
</s> add </s> remove golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
</s> add golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
</s> add </s> remove golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
</s> add golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove github.com/stretchr/testify v1.8.0
github.com/ti-mo/netfilter v0.4.0
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.1.0
golang.org/x/exp v0.0.0-20221106115401-f9659909a136
golang.org/x/net v0.4.0
golang.org/x/sys v0.3.0
</s> add github.com/stretchr/testify v1.8.1
github.com/ti-mo/netfilter v0.5.0
go.etcd.io/bbolt v1.3.7
golang.org/x/crypto v0.5.0
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
golang.org/x/net v0.5.0
golang.org/x/sys v0.4.0 | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/tools/go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
<mask> golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
</s> Pull request: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 1c71e4586daa7502f5dadd5ba4dc58a12a01f3b8
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 1 13:37:50 2023 +0300
all: imp chlog; upd deps, i18n, services, trackers </s> remove golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
</s> add </s> remove golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add </s> remove golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
</s> add golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d | internal/tools/go.sum |