docstring_tokens
stringlengths
18
16.9k
code_tokens
stringlengths
75
1.81M
html_url
stringlengths
74
116
file_name
stringlengths
3
311
keep keep add keep keep keep keep keep
<mask> // Clear filter rules <mask> func (filter *filter) unload() { <mask> filter.RulesCount = 0 <mask> } <mask> <mask> // Path to the filter contents <mask> func (filter *filter) Path() string { <mask> return filepath.Join(Context.getDataDir(), filterDir, strconv.FormatInt(filter.ID, 10)+".txt") </s> Merge: * DNS filters: optimize filter update Close #1463 Squashed commit of the following: commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92 Author: Simon Zolin <[email protected]> Date: Mon Mar 16 16:39:17 2020 +0300 minor commit e15b56a0d9db182f9d30b434584018cb1bf038d5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:39:07 2020 +0300 minor commit 77bf59ca6e556b75af48c5987866af6d5025dae8 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:30:04 2020 +0300 minor commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:24:50 2020 +0300 minor commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:02:06 2020 +0300 minor commit 70283e329e32def3375e893f806a2a02d8ca9f57 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:35:11 2020 +0300 logical module Filtering commit 837a255c6a04941e9fc007a56d71faf4c4213257 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:11:37 2020 +0300 minor commit 1853ed2b57a86dd49508023f47218219399b4fe5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 12:59:28 2020 +0300 refactor commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4 Author: Simon Zolin <[email protected]> Date: Wed Mar 11 20:12:53 2020 +0300 * filters: optimize update procedure </s> remove filter.Data = nil </s> add </s> remove err := file.SafeWrite(filterFilePath, filter.Data) // update LastUpdated field after saving the file filter.LastUpdated = filter.LastTimeUpdated() return err } func (filter *filter) saveAndBackupOld() error { filterFilePath := filter.Path() err := os.Rename(filterFilePath, filterFilePath+".old") if err != nil && !os.IsNotExist(err) { return err </s> add err = os.Rename(tmpfile.Name(), filterFilePath) if err != nil { return false, err </s> remove func (filter *filter) load() error { </s> add func (f *Filtering) load(filter *filter) error { </s> remove return true, nil } // saves filter contents to the file in dataDir // This method is safe to call during filters update, // because it creates a new file and then renames it, // so the currently opened file descriptors to the old filter file remain valid. func (filter *filter) save() error { </s> add </s> remove return filter.save() </s> add tmpfile.Close() tmpfile = nil return true, nil </s> remove // Perform upgrade on a filter func (filter *filter) update() (bool, error) { </s> add func (f *Filtering) updateIntl(filter *filter) (bool, error) {
https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80
home/filter.go
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> Context = homeContext{} <mask> Context.workDir = dir <mask> Context.client = &http.Client{ <mask> Timeout: time.Minute * 5, <mask> } <mask> <mask> f := filter{ <mask> URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", <mask> } </s> Merge: * DNS filters: optimize filter update Close #1463 Squashed commit of the following: commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92 Author: Simon Zolin <[email protected]> Date: Mon Mar 16 16:39:17 2020 +0300 minor commit e15b56a0d9db182f9d30b434584018cb1bf038d5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:39:07 2020 +0300 minor commit 77bf59ca6e556b75af48c5987866af6d5025dae8 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:30:04 2020 +0300 minor commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:24:50 2020 +0300 minor commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:02:06 2020 +0300 minor commit 70283e329e32def3375e893f806a2a02d8ca9f57 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:35:11 2020 +0300 logical module Filtering commit 837a255c6a04941e9fc007a56d71faf4c4213257 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:11:37 2020 +0300 minor commit 1853ed2b57a86dd49508023f47218219399b4fe5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 12:59:28 2020 +0300 refactor commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4 Author: Simon Zolin <[email protected]> Date: Wed Mar 11 20:12:53 2020 +0300 * filters: optimize update procedure </s> add Context.filters.Init() </s> remove f := filter{ </s> add filt := filter{ </s> remove f := filter{ </s> add filt := filter{ </s> remove ok, err := f.update() assert.True(t, ok && err == nil) </s> add ok, err := Context.filters.update(&f) assert.Equal(t, nil, err) assert.True(t, ok) </s> remove if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) { refreshLock.Lock() _, isNetworkErr = refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists) refreshLock.Unlock() refreshStatus = 0 </s> add if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) { f.refreshLock.Lock() _, isNetworkErr = f.refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists) f.refreshLock.Unlock() f.refreshStatus = 0 </s> remove func handleFilteringStatus(w http.ResponseWriter, r *http.Request) { </s> add func (f *Filtering) handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80
home/filter_test.go
keep keep add keep keep keep keep
<mask> Context.client = &http.Client{ <mask> Timeout: 5 * time.Second, <mask> } <mask> <mask> f := filter{ <mask> URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", <mask> } </s> Merge: * DNS filters: optimize filter update Close #1463 Squashed commit of the following: commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92 Author: Simon Zolin <[email protected]> Date: Mon Mar 16 16:39:17 2020 +0300 minor commit e15b56a0d9db182f9d30b434584018cb1bf038d5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:39:07 2020 +0300 minor commit 77bf59ca6e556b75af48c5987866af6d5025dae8 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:30:04 2020 +0300 minor commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:24:50 2020 +0300 minor commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:02:06 2020 +0300 minor commit 70283e329e32def3375e893f806a2a02d8ca9f57 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:35:11 2020 +0300 logical module Filtering commit 837a255c6a04941e9fc007a56d71faf4c4213257 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:11:37 2020 +0300 minor commit 1853ed2b57a86dd49508023f47218219399b4fe5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 12:59:28 2020 +0300 refactor commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4 Author: Simon Zolin <[email protected]> Date: Wed Mar 11 20:12:53 2020 +0300 * filters: optimize update procedure </s> remove Timeout: time.Minute * 5, </s> add Timeout: 5 * time.Second, </s> remove f := filter{ </s> add filt := filter{ </s> remove f := filter{ </s> add filt := filter{ </s> remove if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) { refreshLock.Lock() _, isNetworkErr = refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists) refreshLock.Unlock() refreshStatus = 0 </s> add if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) { f.refreshLock.Lock() _, isNetworkErr = f.refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists) f.refreshLock.Unlock() f.refreshStatus = 0 </s> remove func periodicallyRefreshFilters() { </s> add func (f *Filtering) periodicallyRefreshFilters() { </s> remove ok, err := f.update() assert.True(t, ok && err == nil) </s> add ok, err := Context.filters.update(&f) assert.Equal(t, nil, err) assert.True(t, ok)
https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80
home/filter_test.go
keep replace replace keep keep replace keep keep keep
<mask> // download <mask> ok, err := f.update() <mask> assert.True(t, ok && err == nil) <mask> <mask> // refresh <mask> ok, err = f.update() <mask> assert.True(t, !ok && err == nil) <mask> <mask> err = f.save() </s> Merge: * DNS filters: optimize filter update Close #1463 Squashed commit of the following: commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92 Author: Simon Zolin <[email protected]> Date: Mon Mar 16 16:39:17 2020 +0300 minor commit e15b56a0d9db182f9d30b434584018cb1bf038d5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:39:07 2020 +0300 minor commit 77bf59ca6e556b75af48c5987866af6d5025dae8 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:30:04 2020 +0300 minor commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:24:50 2020 +0300 minor commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:02:06 2020 +0300 minor commit 70283e329e32def3375e893f806a2a02d8ca9f57 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:35:11 2020 +0300 logical module Filtering commit 837a255c6a04941e9fc007a56d71faf4c4213257 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:11:37 2020 +0300 minor commit 1853ed2b57a86dd49508023f47218219399b4fe5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 12:59:28 2020 +0300 refactor commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4 Author: Simon Zolin <[email protected]> Date: Wed Mar 11 20:12:53 2020 +0300 * filters: optimize update procedure </s> remove err = f.save() assert.True(t, err == nil) err = f.load() </s> add err = Context.filters.load(&f) </s> remove ok, err := f.update() </s> add ok, err := f.update(&filt) </s> remove f.ID = assignUniqueFilterID() </s> add filt.ID = assignUniqueFilterID() </s> remove httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err) return } if f.RulesCount == 0 { httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL) </s> add httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) </s> remove return filter.save() </s> add tmpfile.Close() tmpfile = nil return true, nil
https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80
home/filter_test.go
keep keep keep keep replace replace replace replace keep keep keep keep keep
<mask> // refresh <mask> ok, err = f.update() <mask> assert.True(t, !ok && err == nil) <mask> <mask> err = f.save() <mask> assert.True(t, err == nil) <mask> <mask> err = f.load() <mask> assert.True(t, err == nil) <mask> <mask> f.unload() <mask> _ = os.Remove(f.Path()) <mask> } </s> Merge: * DNS filters: optimize filter update Close #1463 Squashed commit of the following: commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92 Author: Simon Zolin <[email protected]> Date: Mon Mar 16 16:39:17 2020 +0300 minor commit e15b56a0d9db182f9d30b434584018cb1bf038d5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:39:07 2020 +0300 minor commit 77bf59ca6e556b75af48c5987866af6d5025dae8 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:30:04 2020 +0300 minor commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:24:50 2020 +0300 minor commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:02:06 2020 +0300 minor commit 70283e329e32def3375e893f806a2a02d8ca9f57 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:35:11 2020 +0300 logical module Filtering commit 837a255c6a04941e9fc007a56d71faf4c4213257 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:11:37 2020 +0300 minor commit 1853ed2b57a86dd49508023f47218219399b4fe5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 12:59:28 2020 +0300 refactor commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4 Author: Simon Zolin <[email protected]> Date: Wed Mar 11 20:12:53 2020 +0300 * filters: optimize update procedure </s> remove ok, err = f.update() </s> add ok, err = Context.filters.update(&f) </s> remove ok, err := f.update() assert.True(t, ok && err == nil) </s> add ok, err := Context.filters.update(&f) assert.Equal(t, nil, err) assert.True(t, ok) </s> remove ok, err := f.update() </s> add ok, err := f.update(&filt) </s> remove f.ID = assignUniqueFilterID() </s> add filt.ID = assignUniqueFilterID() </s> add tmpfile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "") if err != nil { return false, err } defer func() { if tmpfile != nil { _ = tmpfile.Close() _ = os.Remove(tmpfile.Name()) } }() </s> remove log.Tracef("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents)) rulesCount, _ := parseFilterContents(filterFileContents) </s> add log.Tracef("File %s, id %d, length %d", filterFilePath, filter.ID, st.Size()) rulesCount, checksum, _ := f.parseFilterContents(file)
https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80
home/filter_test.go
keep keep add keep keep keep keep
<mask> auth *Auth // HTTP authentication module <mask> httpServer *http.Server // HTTP module <mask> httpsServer HTTPSServer // HTTPS module <mask> <mask> // Runtime properties <mask> // -- <mask> </s> Merge: * DNS filters: optimize filter update Close #1463 Squashed commit of the following: commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92 Author: Simon Zolin <[email protected]> Date: Mon Mar 16 16:39:17 2020 +0300 minor commit e15b56a0d9db182f9d30b434584018cb1bf038d5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:39:07 2020 +0300 minor commit 77bf59ca6e556b75af48c5987866af6d5025dae8 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:30:04 2020 +0300 minor commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:24:50 2020 +0300 minor commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:02:06 2020 +0300 minor commit 70283e329e32def3375e893f806a2a02d8ca9f57 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:35:11 2020 +0300 logical module Filtering commit 837a255c6a04941e9fc007a56d71faf4c4213257 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:11:37 2020 +0300 minor commit 1853ed2b57a86dd49508023f47218219399b4fe5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 12:59:28 2020 +0300 refactor commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4 Author: Simon Zolin <[email protected]> Date: Wed Mar 11 20:12:53 2020 +0300 * filters: optimize update procedure </s> remove nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`) </s> add nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID ) // type FilteringConf struct { // BlockLists []filter // AllowLists []filter // UserRules []string // } // Filtering - module object type Filtering struct { // conf FilteringConf </s> remove func startFiltering() { </s> add // Start - start the module func (f *Filtering) Start() { f.RegisterFilteringHandlers() </s> remove func initFiltering() { loadFilters(config.Filters) loadFilters(config.WhitelistFilters) </s> add // Init - initialize the module func (f *Filtering) Init() { f.filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`) _ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755) f.loadFilters(config.Filters) f.loadFilters(config.WhitelistFilters) </s> remove go periodicallyRefreshFilters() </s> add go f.periodicallyRefreshFilters() } // Close - close the module func (f *Filtering) Close() { </s> remove f := filter{ </s> add filt := filter{ </s> remove func filterSetProperties(url string, newf filter, whitelist bool) int { </s> add func (f *Filtering) filterSetProperties(url string, newf filter, whitelist bool) int {
https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80
home/home.go
keep keep keep keep replace replace replace replace keep keep keep keep keep
<mask> "runtime" <mask> "strings" <mask> ) <mask> <mask> // --------------------- <mask> // general helpers <mask> // --------------------- <mask> <mask> // fileExists returns TRUE if file exists <mask> func FileExists(fn string) bool { <mask> _, err := os.Stat(fn) <mask> if err != nil { <mask> return false </s> Merge: * DNS filters: optimize filter update Close #1463 Squashed commit of the following: commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92 Author: Simon Zolin <[email protected]> Date: Mon Mar 16 16:39:17 2020 +0300 minor commit e15b56a0d9db182f9d30b434584018cb1bf038d5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:39:07 2020 +0300 minor commit 77bf59ca6e556b75af48c5987866af6d5025dae8 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:30:04 2020 +0300 minor commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:24:50 2020 +0300 minor commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:02:06 2020 +0300 minor commit 70283e329e32def3375e893f806a2a02d8ca9f57 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:35:11 2020 +0300 logical module Filtering commit 837a255c6a04941e9fc007a56d71faf4c4213257 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:11:37 2020 +0300 minor commit 1853ed2b57a86dd49508023f47218219399b4fe5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 12:59:28 2020 +0300 refactor commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4 Author: Simon Zolin <[email protected]> Date: Wed Mar 11 20:12:53 2020 +0300 * filters: optimize update procedure </s> remove // --------------------- // debug logging helpers // --------------------- </s> add </s> remove func parseFilterContents(contents []byte) (int, string) { data := string(contents) </s> add func (f *Filtering) parseFilterContents(file io.Reader) (int, uint32, string) { </s> remove func (filter *filter) load() error { </s> add func (f *Filtering) load(filter *filter) error { </s> remove err := file.SafeWrite(filterFilePath, filter.Data) // update LastUpdated field after saving the file filter.LastUpdated = filter.LastTimeUpdated() return err } func (filter *filter) saveAndBackupOld() error { filterFilePath := filter.Path() err := os.Rename(filterFilePath, filterFilePath+".old") if err != nil && !os.IsNotExist(err) { return err </s> add err = os.Rename(tmpfile.Name(), filterFilePath) if err != nil { return false, err </s> remove return filter.save() </s> add tmpfile.Close() tmpfile = nil return true, nil </s> remove filterFileContents, err := ioutil.ReadFile(filterFilePath) </s> add file, err := os.Open(filterFilePath)
https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80
util/helpers.go
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> <mask> return cmd.ProcessState.ExitCode(), string(out), nil <mask> } <mask> <mask> // --------------------- <mask> // debug logging helpers <mask> // --------------------- <mask> func FuncName() string { <mask> pc := make([]uintptr, 10) // at least 1 entry needed <mask> runtime.Callers(2, pc) <mask> f := runtime.FuncForPC(pc[0]) <mask> return path.Base(f.Name()) </s> Merge: * DNS filters: optimize filter update Close #1463 Squashed commit of the following: commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92 Author: Simon Zolin <[email protected]> Date: Mon Mar 16 16:39:17 2020 +0300 minor commit e15b56a0d9db182f9d30b434584018cb1bf038d5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:39:07 2020 +0300 minor commit 77bf59ca6e556b75af48c5987866af6d5025dae8 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:30:04 2020 +0300 minor commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:24:50 2020 +0300 minor commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:02:06 2020 +0300 minor commit 70283e329e32def3375e893f806a2a02d8ca9f57 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:35:11 2020 +0300 logical module Filtering commit 837a255c6a04941e9fc007a56d71faf4c4213257 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:11:37 2020 +0300 minor commit 1853ed2b57a86dd49508023f47218219399b4fe5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 12:59:28 2020 +0300 refactor commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4 Author: Simon Zolin <[email protected]> Date: Wed Mar 11 20:12:53 2020 +0300 * filters: optimize update procedure </s> remove // --------------------- // general helpers // --------------------- </s> add </s> remove nUpdated, _ := refreshFilters(flags, true) </s> add nUpdated, _ := f.refreshFilters(flags, true) </s> remove f := filter{ </s> add filt := filter{ </s> remove func periodicallyRefreshFilters() { </s> add func (f *Filtering) periodicallyRefreshFilters() { </s> remove func handleFilteringStatus(w http.ResponseWriter, r *http.Request) { </s> add func (f *Filtering) handleFilteringStatus(w http.ResponseWriter, r *http.Request) { </s> remove func handleCheckHost(w http.ResponseWriter, r *http.Request) { </s> add func (f *Filtering) handleCheckHost(w http.ResponseWriter, r *http.Request) {
https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80
util/helpers.go
keep keep keep add
<mask> *str = "" <mask> } <mask> return strings.TrimSpace(s) <mask> } </s> Merge: * DNS filters: optimize filter update Close #1463 Squashed commit of the following: commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92 Author: Simon Zolin <[email protected]> Date: Mon Mar 16 16:39:17 2020 +0300 minor commit e15b56a0d9db182f9d30b434584018cb1bf038d5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:39:07 2020 +0300 minor commit 77bf59ca6e556b75af48c5987866af6d5025dae8 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:30:04 2020 +0300 minor commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:24:50 2020 +0300 minor commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 14:02:06 2020 +0300 minor commit 70283e329e32def3375e893f806a2a02d8ca9f57 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:35:11 2020 +0300 logical module Filtering commit 837a255c6a04941e9fc007a56d71faf4c4213257 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 13:11:37 2020 +0300 minor commit 1853ed2b57a86dd49508023f47218219399b4fe5 Author: Simon Zolin <[email protected]> Date: Thu Mar 12 12:59:28 2020 +0300 refactor commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4 Author: Simon Zolin <[email protected]> Date: Wed Mar 11 20:12:53 2020 +0300 * filters: optimize update procedure </s> remove filter.Data = body </s> add </s> remove var firstChunk []byte if len(body) <= 4096 { firstChunk = body } else { firstChunk = body[:4096] } if !isPrintableText(firstChunk) { return false, fmt.Errorf("Data contains non-printable characters") } s := strings.ToLower(string(firstChunk)) if strings.Index(s, "<html") >= 0 || strings.Index(s, "<!doctype") >= 0 { return false, fmt.Errorf("Data is HTML, not plain text") } // Extract filter name and count number of rules rulesCount, filterName := parseFilterContents(body) log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount) </s> add log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, total, rulesCount) </s> add r := bufio.NewReader(file) checksum := uint32(0) for { line, err := r.ReadString('\n') if err != nil { break } </s> remove userFilter := userFilter() err = userFilter.save() if err != nil { log.Error("Couldn't save the user filter: %s", err) return err } </s> add </s> remove // Count lines in the filter for len(data) != 0 { line := util.SplitNext(&data, '\n') </s> add checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line)) line = strings.TrimSpace(line) </s> remove uf.LastUpdated = now </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80
util/helpers.go
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> go 1.17 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.39.13 <mask> github.com/AdguardTeam/golibs v0.10.3 <mask> github.com/AdguardTeam/urlfilter v0.15.1 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/ameshkov/dnscrypt/v2 v2.2.3 <mask> github.com/digineo/go-ipset/v2 v2.2.1 </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.39.13 h1:7YM5Mr4EpFZ8UO4/4xd6zBG3lZ6AzZO6Xq29Cr4ydOY= github.com/AdguardTeam/dnsproxy v0.39.13/go.mod h1:g7zjF1TWpKNeDVh6h3YrjQN8565zsWRd7zo++C/935c= </s> add github.com/AdguardTeam/dnsproxy v0.40.0 h1:4JeOCG7aOEQxXhvAZwI7VknuHjXYJlwehO5ufkkrJaQ= github.com/AdguardTeam/dnsproxy v0.40.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= </s> add </s> remove github.com/joomcode/errorx v1.0.3 // indirect </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= </s> add </s> add golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.mod
keep keep keep keep replace keep keep keep keep keep
<mask> github.com/cheekybits/genny v1.0.0 // 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/google/uuid v1.3.0 // indirect <mask> github.com/joomcode/errorx v1.0.3 // indirect <mask> github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect <mask> github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect <mask> github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect <mask> github.com/mdlayher/socket v0.1.1 // indirect <mask> github.com/nxadm/tail v1.4.8 // indirect </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect </s> remove github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw= github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= </s> add github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= </s> add </s> remove github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= </s> add </s> remove github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= </s> add </s> remove github.com/AdguardTeam/dnsproxy v0.39.13 </s> add github.com/AdguardTeam/dnsproxy v0.40.0
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.mod
keep keep keep keep replace keep keep
<mask> golang.org/x/text v0.3.7 // indirect <mask> golang.org/x/tools v0.1.8 // indirect <mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect <mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect <mask> gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect <mask> honnef.co/go/tools v0.2.2 // indirect <mask> ) </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove github.com/joomcode/errorx v1.0.3 // indirect </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= </s> add </s> add golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add </s> remove golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.mod
keep keep keep keep replace replace keep keep keep keep keep
<mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= <mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= <mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= <mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= <mask> github.com/AdguardTeam/dnsproxy v0.39.13 h1:7YM5Mr4EpFZ8UO4/4xd6zBG3lZ6AzZO6Xq29Cr4ydOY= <mask> github.com/AdguardTeam/dnsproxy v0.39.13/go.mod h1:g7zjF1TWpKNeDVh6h3YrjQN8565zsWRd7zo++C/935c= <mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= <mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4= <mask> github.com/AdguardTeam/golibs v0.9.2/go.mod h1:fCAMwPBJ8S7YMYbTWvYS+eeTLblP5E04IDtNAo7y7IY= <mask> github.com/AdguardTeam/golibs v0.10.3 h1:FBgk17zf35ESVWQKIqEUiqqB2bDaCBC8X5vMU760yB4= <mask> github.com/AdguardTeam/golibs v0.10.3/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.39.13 </s> add github.com/AdguardTeam/dnsproxy v0.40.0 </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= </s> add </s> add golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add </s> remove golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep keep keep keep replace keep keep keep keep keep
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw= <mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us= <mask> github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= <mask> github.com/ameshkov/dnscrypt/v2 v2.2.3 h1:X9UP5AHtwp46Ji+sGFfF/1Is6OPI/SjxLqhKpx0P5UI= <mask> github.com/ameshkov/dnscrypt/v2 v2.2.3/go.mod h1:xJB9cE1/GF+NB6EEQqRlkoa4bjcV2w7VYn1G+zVq7Bs= <mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A= <mask> github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo= <mask> github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.39.13 </s> add github.com/AdguardTeam/dnsproxy v0.40.0 </s> remove github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw= github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= </s> add github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= </s> add github.com/miekg/dns v1.1.44/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= </s> add </s> remove github.com/joomcode/errorx v1.0.3 // indirect </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep keep keep keep replace keep keep keep keep keep
<mask> github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 h1:dhy9OQKGBh4zVXbjwbxxHjRxMJtLXj3zfgpBYQaR4Q4= <mask> github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk= <mask> github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= <mask> github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= <mask> github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= <mask> github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= <mask> github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= <mask> github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= <mask> github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= <mask> github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove github.com/joomcode/errorx v1.0.3 // indirect </s> add </s> remove golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= </s> add </s> add golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep keep keep keep replace replace keep keep keep keep keep
<mask> github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 h1:jhdHqd7DxBrzfuFSoPxjD6nUVaV/1RIn9aHA0WCf/as= <mask> github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= <mask> github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= <mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= <mask> github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw= <mask> github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo= <mask> github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 h1:uhL5Gw7BINiiPAo24A2sxkcDI0Jt/sqp1v5xQCniEFA= <mask> github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/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= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove github.com/joomcode/errorx v1.0.3 // indirect </s> add </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= </s> add </s> add golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep keep keep keep replace keep keep keep keep keep
<mask> github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= <mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= <mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= <mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= <mask> github.com/lucas-clemente/quic-go v0.21.1/go.mod h1:U9kFi5LKbNIlU30dkuM9vxmTxWq4Bvzee/MjBI+07UA= <mask> github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g= <mask> github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= <mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= <mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= <mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= </s> add </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= </s> add </s> add golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep keep keep replace keep keep replace keep keep keep keep
<mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= <mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= <mask> github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= <mask> github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= <mask> github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco= <mask> github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= <mask> github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= <mask> github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk= <mask> github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= <mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= <mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove github.com/lucas-clemente/quic-go v0.21.1/go.mod h1:U9kFi5LKbNIlU30dkuM9vxmTxWq4Bvzee/MjBI+07UA= </s> add </s> remove github.com/joomcode/errorx v1.0.3 // indirect </s> add </s> add github.com/miekg/dns v1.1.44/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep keep add keep keep keep keep keep keep
<mask> github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= <mask> github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= <mask> github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= <mask> github.com/miekg/dns v1.1.45 h1:g5fRIhm9nx7g8osrAvgb16QJfmyMsyOCb+J7LSv+Qzk= <mask> github.com/miekg/dns v1.1.45/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= <mask> github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= <mask> github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= <mask> github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= <mask> github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= </s> add </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo= </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= </s> add </s> add golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep keep keep keep replace keep keep keep keep keep
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= <mask> golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= <mask> golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= <mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= <mask> golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= <mask> golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M= <mask> golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= <mask> golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= <mask> golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= <mask> golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= </s> add </s> add golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add </s> add github.com/miekg/dns v1.1.44/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep keep keep keep replace keep 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-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= <mask> golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/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-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= <mask> golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/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-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= <mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= <mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> add golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= </s> add </s> add github.com/miekg/dns v1.1.44/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep add keep keep keep keep
<mask> golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/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= <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= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= </s> add </s> add github.com/miekg/dns v1.1.44/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep keep keep keep replace keep keep keep keep keep
<mask> golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= <mask> golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= <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.1-0.20180807135948-17ff2d5776d2/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= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> add golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= </s> add </s> add github.com/miekg/dns v1.1.44/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep keep keep keep replace replace keep keep keep keep keep
<mask> gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= <mask> gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= <mask> gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= <mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= <mask> gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= <mask> gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= <mask> grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= <mask> honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= <mask> honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= <mask> honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= <mask> honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= </s> Pull request: all: upd dnsproxy Updates #3977. Squashed commit of the following: commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147 Author: Ainar Garipov <[email protected]> Date: Thu Dec 23 16:15:11 2021 +0300 all: upd dnsproxy </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect </s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect </s> remove github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= </s> add </s> remove github.com/lucas-clemente/quic-go v0.21.1/go.mod h1:U9kFi5LKbNIlU30dkuM9vxmTxWq4Bvzee/MjBI+07UA= </s> add </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= </s> add </s> add golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c
go.sum
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> "name": "dashboard", <mask> "version": "0.1.0", <mask> "private": true, <mask> "scripts": { <mask> "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js", <mask> "watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch", <mask> "build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js", <mask> "lint": "eslint client/" <mask> }, <mask> "dependencies": { <mask> "@nivo/line": "^0.49.1", <mask> "axios": "^0.19.0", </s> *: added cross-env to npm scripts </s> remove "webpack-merge": "^4.1.3", "svg-url-loader": "^2.3.2" </s> add "webpack-merge": "^4.1.3" </s> add "svg-url-loader": "^2.3.2", </s> add "cross-env": "^7.0.2",
https://github.com/AdguardTeam/AdGuardHome/commit/6503bab1aaa27ff43175d069413630a420093be0
client/package.json
keep add keep keep keep keep keep keep
<mask> "compression-webpack-plugin": "^1.1.11", <mask> "copy-webpack-plugin": "^4.6.0", <mask> "css-loader": "^2.1.1", <mask> "eslint": "^4.19.1", <mask> "eslint-config-airbnb-base": "^12.1.0", <mask> "eslint-config-react-app": "^2.1.0", <mask> "eslint-import-resolver-webpack": "^0.12.1", <mask> "eslint-loader": "1.9.0", </s> *: added cross-env to npm scripts </s> remove "webpack-merge": "^4.1.3", "svg-url-loader": "^2.3.2" </s> add "webpack-merge": "^4.1.3" </s> add "svg-url-loader": "^2.3.2", </s> remove "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js", "watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch", "build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js", </s> add "build-dev": "cross-env NODE_ENV=development webpack --config webpack.dev.js", "watch": "cross-env NODE_ENV=development webpack --config webpack.dev.js --watch", "build-prod": "cross-env NODE_ENV=production webpack --config webpack.prod.js",
https://github.com/AdguardTeam/AdGuardHome/commit/6503bab1aaa27ff43175d069413630a420093be0
client/package.json
keep add keep keep keep keep keep keep
<mask> "stylelint": "^9.10.1", <mask> "stylelint-webpack-plugin": "0.10.4", <mask> "uglifyjs-webpack-plugin": "^1.2.7", <mask> "url-loader": "^1.0.1", <mask> "webpack": "3.8.1", <mask> "webpack-dev-server": "^3.1.14", <mask> "webpack-merge": "^4.1.3" <mask> } </s> *: added cross-env to npm scripts </s> remove "webpack-merge": "^4.1.3", "svg-url-loader": "^2.3.2" </s> add "webpack-merge": "^4.1.3" </s> add "cross-env": "^7.0.2", </s> remove "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js", "watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch", "build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js", </s> add "build-dev": "cross-env NODE_ENV=development webpack --config webpack.dev.js", "watch": "cross-env NODE_ENV=development webpack --config webpack.dev.js --watch", "build-prod": "cross-env NODE_ENV=production webpack --config webpack.prod.js",
https://github.com/AdguardTeam/AdGuardHome/commit/6503bab1aaa27ff43175d069413630a420093be0
client/package.json
keep keep keep keep replace replace keep keep
<mask> "uglifyjs-webpack-plugin": "^1.2.7", <mask> "url-loader": "^1.0.1", <mask> "webpack": "3.8.1", <mask> "webpack-dev-server": "^3.1.14", <mask> "webpack-merge": "^4.1.3", <mask> "svg-url-loader": "^2.3.2" <mask> } <mask> } </s> *: added cross-env to npm scripts </s> add "svg-url-loader": "^2.3.2", </s> add "cross-env": "^7.0.2", </s> remove "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js", "watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch", "build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js", </s> add "build-dev": "cross-env NODE_ENV=development webpack --config webpack.dev.js", "watch": "cross-env NODE_ENV=development webpack --config webpack.dev.js --watch", "build-prod": "cross-env NODE_ENV=production webpack --config webpack.prod.js",
https://github.com/AdguardTeam/AdGuardHome/commit/6503bab1aaa27ff43175d069413630a420093be0
client/package.json
keep keep keep add keep keep keep keep keep
<mask> return nil <mask> } <mask> } <mask> <mask> d.filtersInitializerChan = make(chan filtersInitializerParams, 1) <mask> go d.filtersInitializer() <mask> <mask> if d.Config.HTTPRegister != nil { // for tests <mask> d.registerSecurityHandlers() </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> remove return d </s> add </s> add return &l } func (l *queryLog) Start() { </s> remove return &l </s> add </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil } </s> remove Context.dnsServer.Close() </s> add if Context.dnsServer != nil { Context.dnsServer.Close() Context.dnsServer = nil } if Context.dnsFilter != nil { Context.dnsFilter.Close() Context.dnsFilter = nil } </s> add closeDNSServer() return nil } func closeDNSServer() {
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
dnsfilter/dnsfilter.go
keep keep keep keep replace keep keep keep keep keep
<mask> if d.Config.HTTPRegister != nil { // for tests <mask> d.registerSecurityHandlers() <mask> d.registerRewritesHandlers() <mask> } <mask> return d <mask> } <mask> <mask> // <mask> // stats <mask> // </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add return d } func (d *Dnsfilter) Start() { </s> add closeDNSServer() return nil } func closeDNSServer() { </s> remove Context.dnsServer.Close() </s> add if Context.dnsServer != nil { Context.dnsServer.Close() Context.dnsServer = nil } if Context.dnsFilter != nil { Context.dnsFilter.Close() Context.dnsFilter = nil } </s> remove Context.dnsFilter.Close() Context.dnsFilter = nil </s> add if Context.stats != nil { Context.stats.Close() Context.stats = nil } </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil { s.webRegistered = true </s> add if !webRegistered && s.conf.HTTPRegister != nil { webRegistered = true </s> add Context.dnsFilter.Start()
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
dnsfilter/dnsfilter.go
keep keep keep add keep keep keep keep keep
<mask> "https://dns.quad9.net/dns-query", <mask> } <mask> var defaultBootstrap = []string{"9.9.9.9", "149.112.112.112"} <mask> <mask> // Server is the main way to start a DNS server. <mask> // <mask> // Example: <mask> // s := dnsforward.Server{} <mask> // err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add Start() </s> add Context.dnsFilter.Start() </s> add Start() </s> add Context.stats.Start() Context.queryLog.Start() </s> remove webRegistered bool isRunning bool </s> add isRunning bool </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil { s.webRegistered = true </s> add if !webRegistered && s.conf.HTTPRegister != nil { webRegistered = true
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
dnsforward/dnsforward.go
keep keep keep keep replace replace keep keep keep keep keep
<mask> // DNS proxy instance for internal usage <mask> // We don't Start() it and so no listen port is required. <mask> internalProxy *proxy.Proxy <mask> <mask> webRegistered bool <mask> isRunning bool <mask> <mask> sync.RWMutex <mask> conf ServerConfig <mask> } <mask> </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add var webRegistered bool </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil { s.webRegistered = true </s> add if !webRegistered && s.conf.HTTPRegister != nil { webRegistered = true </s> add func (s *statsCtx) Start() { s.initWeb() go s.periodicFlush() } </s> add Start() </s> remove return d </s> add </s> add return d } func (d *Dnsfilter) Start() {
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
dnsforward/dnsforward.go
keep keep keep keep replace replace keep keep keep keep keep
<mask> if len(proxyConfig.Upstreams) == 0 { <mask> log.Fatal("len(proxyConfig.Upstreams) == 0") <mask> } <mask> <mask> if !s.webRegistered && s.conf.HTTPRegister != nil { <mask> s.webRegistered = true <mask> s.registerHandlers() <mask> } <mask> <mask> // Initialize and start the DNS proxy <mask> s.dnsProxy = &proxy.Proxy{Config: proxyConfig} </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add if err2 != nil { closeDNSServer() } </s> add Context.dnsFilter.Start() </s> add closeDNSServer() </s> add closeDNSServer() </s> remove Context.dnsServer.Close() </s> add if Context.dnsServer != nil { Context.dnsServer.Close() Context.dnsServer = nil } if Context.dnsFilter != nil { Context.dnsFilter.Close() Context.dnsFilter = nil } </s> add return &l } func (l *queryLog) Start() {
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
dnsforward/dnsforward.go
keep keep add keep keep keep keep keep keep
<mask> var err2 error <mask> if err == nil { <mask> err2 = startDNSServer() <mask> } <mask> if err != nil || err2 != nil { <mask> config.firstRun = true <mask> copyInstallSettings(&config, &curConfig) <mask> if err != nil { <mask> httpError(w, http.StatusInternalServerError, "Couldn't initialize DNS server: %s", err) </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add closeDNSServer() </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil { s.webRegistered = true </s> add if !webRegistered && s.conf.HTTPRegister != nil { webRegistered = true </s> add func (s *statsCtx) Start() { s.initWeb() go s.periodicFlush() } </s> add Context.dnsFilter.Start() </s> remove Context.dnsServer.Close() </s> add if Context.dnsServer != nil { Context.dnsServer.Close() Context.dnsServer = nil } if Context.dnsFilter != nil { Context.dnsFilter.Close() Context.dnsFilter = nil } </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil }
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
home/control_install.go
keep keep add keep keep keep keep keep keep
<mask> dnsConfig := generateServerConfig() <mask> err = Context.dnsServer.Prepare(&dnsConfig) <mask> if err != nil { <mask> return fmt.Errorf("dnsServer.Prepare: %s", err) <mask> } <mask> <mask> sessFilename := filepath.Join(baseDir, "sessions.db") <mask> config.auth = InitAuth(sessFilename, config.Users, config.WebSessionTTLHours*60*60) <mask> if config.auth == nil { </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add closeDNSServer() </s> add if err2 != nil { closeDNSServer() } </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil } </s> add Context.dnsFilter.Start() </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil { s.webRegistered = true </s> add if !webRegistered && s.conf.HTTPRegister != nil { webRegistered = true </s> remove config.auth.Close() config.auth = nil return nil </s> add log.Debug("Closed all DNS modules")
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
home/dns.go
keep keep keep add keep keep keep keep keep keep
<mask> <mask> sessFilename := filepath.Join(baseDir, "sessions.db") <mask> config.auth = InitAuth(sessFilename, config.Users, config.WebSessionTTLHours*60*60) <mask> if config.auth == nil { <mask> return fmt.Errorf("Couldn't initialize Auth module") <mask> } <mask> config.Users = nil <mask> <mask> Context.rdns = InitRDNS(Context.dnsServer, &Context.clients) <mask> Context.whois = initWhois(&Context.clients) </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add closeDNSServer() </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil } </s> remove config.auth.Close() config.auth = nil return nil </s> add log.Debug("Closed all DNS modules") </s> add if err2 != nil { closeDNSServer() } </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil { s.webRegistered = true </s> add if !webRegistered && s.conf.HTTPRegister != nil { webRegistered = true </s> remove Context.stats.Close() Context.stats = nil </s> add if Context.queryLog != nil { Context.queryLog.Close() Context.queryLog = nil }
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
home/dns.go
keep keep keep add keep keep keep keep keep keep
<mask> if err != nil { <mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server") <mask> } <mask> <mask> startFiltering() <mask> Context.stats.Start() <mask> Context.queryLog.Start() <mask> <mask> const topClientsNumber = 100 // the number of clients to get <mask> topClients := Context.stats.GetTopClientsIP(topClientsNumber) </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add Context.stats.Start() Context.queryLog.Start() </s> remove Context.dnsServer.Close() </s> add if Context.dnsServer != nil { Context.dnsServer.Close() Context.dnsServer = nil } if Context.dnsFilter != nil { Context.dnsFilter.Close() Context.dnsFilter = nil } </s> add var webRegistered bool </s> add if err2 != nil { closeDNSServer() } </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil { s.webRegistered = true </s> add if !webRegistered && s.conf.HTTPRegister != nil { webRegistered = true </s> add closeDNSServer()
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
home/dns.go
keep add keep keep keep keep keep keep
<mask> Context.dnsFilter.Start() <mask> startFiltering() <mask> <mask> const topClientsNumber = 100 // the number of clients to get <mask> topClients := Context.stats.GetTopClientsIP(topClientsNumber) <mask> for _, ip := range topClients { <mask> ipAddr := net.ParseIP(ip) <mask> if !ipAddr.IsLoopback() { </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add Context.dnsFilter.Start() </s> add var webRegistered bool </s> add closeDNSServer() </s> add closeDNSServer() </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil { s.webRegistered = true </s> add if !webRegistered && s.conf.HTTPRegister != nil { webRegistered = true </s> remove return d </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
home/dns.go
keep add keep keep keep keep keep
<mask> } <mask> <mask> // DNS forward module must be closed BEFORE stats or queryLog because it depends on them <mask> if Context.dnsServer != nil { <mask> Context.dnsServer.Close() <mask> Context.dnsServer = nil <mask> } </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> remove Context.dnsServer.Close() </s> add if Context.dnsServer != nil { Context.dnsServer.Close() Context.dnsServer = nil } if Context.dnsFilter != nil { Context.dnsFilter.Close() Context.dnsFilter = nil } </s> remove Context.dnsFilter.Close() Context.dnsFilter = nil </s> add if Context.stats != nil { Context.stats.Close() Context.stats = nil } </s> remove return d </s> add </s> add if err2 != nil { closeDNSServer() } </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil { s.webRegistered = true </s> add if !webRegistered && s.conf.HTTPRegister != nil { webRegistered = true </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil }
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
home/dns.go
keep keep keep keep replace keep keep keep keep keep
<mask> return errorx.Decorate(err, "Couldn't stop forwarding DNS server") <mask> } <mask> <mask> // DNS forward module must be closed BEFORE stats or queryLog because it depends on them <mask> Context.dnsServer.Close() <mask> <mask> Context.dnsFilter.Close() <mask> Context.dnsFilter = nil <mask> <mask> Context.stats.Close() </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> remove Context.dnsFilter.Close() Context.dnsFilter = nil </s> add if Context.stats != nil { Context.stats.Close() Context.stats = nil } </s> add closeDNSServer() return nil } func closeDNSServer() { </s> add Context.dnsFilter.Start() </s> remove Context.stats.Close() Context.stats = nil </s> add if Context.queryLog != nil { Context.queryLog.Close() Context.queryLog = nil } </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil } </s> remove return d </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
home/dns.go
keep keep keep keep replace replace keep keep keep keep keep
<mask> <mask> // DNS forward module must be closed BEFORE stats or queryLog because it depends on them <mask> Context.dnsServer.Close() <mask> <mask> Context.dnsFilter.Close() <mask> Context.dnsFilter = nil <mask> <mask> Context.stats.Close() <mask> Context.stats = nil <mask> <mask> Context.queryLog.Close() </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> remove Context.dnsServer.Close() </s> add if Context.dnsServer != nil { Context.dnsServer.Close() Context.dnsServer = nil } if Context.dnsFilter != nil { Context.dnsFilter.Close() Context.dnsFilter = nil } </s> add closeDNSServer() return nil } func closeDNSServer() { </s> remove Context.stats.Close() Context.stats = nil </s> add if Context.queryLog != nil { Context.queryLog.Close() Context.queryLog = nil } </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil } </s> remove config.auth.Close() config.auth = nil return nil </s> add log.Debug("Closed all DNS modules") </s> remove return d </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
home/dns.go
keep keep keep keep replace replace keep keep keep keep keep
<mask> <mask> Context.dnsFilter.Close() <mask> Context.dnsFilter = nil <mask> <mask> Context.stats.Close() <mask> Context.stats = nil <mask> <mask> Context.queryLog.Close() <mask> Context.queryLog = nil <mask> <mask> config.auth.Close() </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil } </s> remove Context.dnsFilter.Close() Context.dnsFilter = nil </s> add if Context.stats != nil { Context.stats.Close() Context.stats = nil } </s> remove config.auth.Close() config.auth = nil return nil </s> add log.Debug("Closed all DNS modules") </s> remove Context.dnsServer.Close() </s> add if Context.dnsServer != nil { Context.dnsServer.Close() Context.dnsServer = nil } if Context.dnsFilter != nil { Context.dnsFilter.Close() Context.dnsFilter = nil } </s> add closeDNSServer() </s> add if err2 != nil { closeDNSServer() }
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
home/dns.go
keep keep keep keep replace replace keep keep keep keep keep
<mask> <mask> Context.stats.Close() <mask> Context.stats = nil <mask> <mask> Context.queryLog.Close() <mask> Context.queryLog = nil <mask> <mask> config.auth.Close() <mask> config.auth = nil <mask> return nil <mask> } </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> remove Context.stats.Close() Context.stats = nil </s> add if Context.queryLog != nil { Context.queryLog.Close() Context.queryLog = nil } </s> remove config.auth.Close() config.auth = nil return nil </s> add log.Debug("Closed all DNS modules") </s> remove Context.dnsFilter.Close() Context.dnsFilter = nil </s> add if Context.stats != nil { Context.stats.Close() Context.stats = nil } </s> add closeDNSServer() </s> add closeDNSServer() </s> remove Context.dnsServer.Close() </s> add if Context.dnsServer != nil { Context.dnsServer.Close() Context.dnsServer = nil } if Context.dnsFilter != nil { Context.dnsFilter.Close() Context.dnsFilter = nil }
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
home/dns.go
keep keep keep keep replace replace replace keep
<mask> <mask> Context.queryLog.Close() <mask> Context.queryLog = nil <mask> <mask> config.auth.Close() <mask> config.auth = nil <mask> return nil <mask> } </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil } </s> remove Context.stats.Close() Context.stats = nil </s> add if Context.queryLog != nil { Context.queryLog.Close() Context.queryLog = nil } </s> add closeDNSServer() </s> add closeDNSServer() </s> remove Context.dnsFilter.Close() Context.dnsFilter = nil </s> add if Context.stats != nil { Context.stats.Close() Context.stats = nil } </s> remove Context.dnsServer.Close() </s> add if Context.dnsServer != nil { Context.dnsServer.Close() Context.dnsServer = nil } if Context.dnsFilter != nil { Context.dnsFilter.Close() Context.dnsFilter = nil }
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
home/dns.go
keep keep add keep keep keep keep keep keep
<mask> if !checkInterval(l.conf.Interval) { <mask> l.conf.Interval = 1 <mask> } <mask> if l.conf.HTTPRegister != nil { <mask> l.initWeb() <mask> } <mask> go l.periodicRotate() <mask> } <mask> </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> remove return &l </s> add </s> add return d } func (d *Dnsfilter) Start() { </s> add if err2 != nil { closeDNSServer() } </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil { s.webRegistered = true </s> add if !webRegistered && s.conf.HTTPRegister != nil { webRegistered = true </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil } </s> remove Context.dnsServer.Close() </s> add if Context.dnsServer != nil { Context.dnsServer.Close() Context.dnsServer = nil } if Context.dnsFilter != nil { Context.dnsFilter.Close() Context.dnsFilter = nil }
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
querylog/qlog.go
keep keep keep keep replace keep keep keep keep keep
<mask> if l.conf.HTTPRegister != nil { <mask> l.initWeb() <mask> } <mask> go l.periodicRotate() <mask> return &l <mask> } <mask> <mask> func (l *queryLog) Close() { <mask> _ = l.flushLogBuffer(true) <mask> } </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add return &l } func (l *queryLog) Start() { </s> add return d } func (d *Dnsfilter) Start() { </s> remove s.initWeb() go s.periodicFlush() </s> add </s> add closeDNSServer() return nil } func closeDNSServer() { </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil } </s> add func (s *statsCtx) Start() { s.initWeb() go s.periodicFlush() }
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
querylog/qlog.go
keep keep keep add keep keep keep keep
<mask> } <mask> <mask> // QueryLog - main interface <mask> type QueryLog interface { <mask> // Close query log object <mask> Close() <mask> <mask> // Add a log entry </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add Start() </s> add var webRegistered bool </s> remove return d </s> add </s> remove return &l </s> add </s> add return d } func (d *Dnsfilter) Start() { </s> add closeDNSServer() return nil } func closeDNSServer() {
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
querylog/querylog.go
keep keep keep add keep keep keep keep
<mask> } <mask> <mask> // Stats - main interface <mask> type Stats interface { <mask> // Close object. <mask> // This function is not thread safe <mask> // (can't be called in parallel with any other function of this interface). <mask> Close() </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add Start() </s> add var webRegistered bool </s> remove return d </s> add </s> remove webRegistered bool isRunning bool </s> add isRunning bool </s> add closeDNSServer() return nil } func closeDNSServer() { </s> add Context.dnsFilter.Start()
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
stats/stats.go
keep keep keep keep replace replace replace replace keep keep keep keep keep
<mask> deserialize(&u, udb) <mask> } <mask> s.unit = &u <mask> <mask> s.initWeb() <mask> <mask> go s.periodicFlush() <mask> <mask> log.Debug("Stats: initialized") <mask> return &s, nil <mask> } <mask> <mask> func checkInterval(days uint32) bool { </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> add func (s *statsCtx) Start() { s.initWeb() go s.periodicFlush() } </s> remove return &l </s> add </s> add return &l } func (l *queryLog) Start() { </s> add return d } func (d *Dnsfilter) Start() { </s> add closeDNSServer() return nil } func closeDNSServer() { </s> remove Context.queryLog.Close() Context.queryLog = nil </s> add if config.auth != nil { config.auth.Close() config.auth = nil }
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
stats/stats_unit.go
keep keep keep add keep keep keep keep keep keep
<mask> log.Debug("Stats: initialized") <mask> return &s, nil <mask> } <mask> <mask> func checkInterval(days uint32) bool { <mask> return days == 1 || days == 7 || days == 30 || days == 90 <mask> } <mask> <mask> func (s *statsCtx) dbOpen() bool { <mask> var err error </s> Merge: - install: recover from error on DNS server start Close #1293 Squashed commit of the following: commit 0981754c5c2c67f2567ee4af0d9ab24377c53413 Merge: ef81f2c8 a6d75118 Author: Simon Zolin <[email protected]> Date: Thu Jan 16 14:19:20 2020 +0300 Merge remote-tracking branch 'origin/master' into 1293-install commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 18:32:11 2019 +0300 linter commit 9e205be53d9de25bd2ad63398644e14b09f95238 Author: Simon Zolin <[email protected]> Date: Mon Dec 30 17:22:17 2019 +0300 - install: recover from error on DNS server start Close all modules properly Don't register HTTP handlers twice </s> remove s.initWeb() go s.periodicFlush() </s> add </s> add if err2 != nil { closeDNSServer() } </s> add closeDNSServer() </s> add return &l } func (l *queryLog) Start() { </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil { s.webRegistered = true </s> add if !webRegistered && s.conf.HTTPRegister != nil { webRegistered = true </s> add closeDNSServer()
https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a
stats/stats_unit.go
keep keep keep replace keep keep keep keep keep
<mask> 'name': 'build' <mask> <mask> 'env': <mask> 'GO_VERSION': '1.19.5' <mask> 'NODE_VERSION': '14' <mask> <mask> 'on': <mask> 'push': <mask> 'branches': </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove 'GO_VERSION': '1.19.5' </s> add 'GO_VERSION': '1.19.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww= </s> add </s> add github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
.github/workflows/build.yml
keep keep keep replace keep keep keep keep keep
<mask> 'name': 'lint' <mask> <mask> 'env': <mask> 'GO_VERSION': '1.19.5' <mask> <mask> 'on': <mask> 'push': <mask> 'tags': <mask> - 'v*' </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove 'GO_VERSION': '1.19.5' </s> add 'GO_VERSION': '1.19.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
.github/workflows/lint.yml
keep keep keep keep replace keep keep keep keep keep
<mask> 'name': 'AdGuard Home - Build and publish release' <mask> # Make sure to sync any changes with the branch overrides below. <mask> 'variables': <mask> 'channel': 'edge' <mask> 'dockerGo': 'adguard/golang-ubuntu:6.0' <mask> <mask> 'stages': <mask> - 'Build frontend': <mask> 'manual': false <mask> 'final': false </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'GO_VERSION': '1.19.5' </s> add 'GO_VERSION': '1.19.6' </s> add * </s> remove 'GO_VERSION': '1.19.5' </s> add 'GO_VERSION': '1.19.6'
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
bamboo-specs/release.yaml
keep keep keep keep replace keep keep keep keep keep
<mask> # Set the default release channel on the release branch to beta, as we may <mask> # need to build a few of these. <mask> 'variables': <mask> 'channel': 'beta' <mask> 'dockerGo': 'adguard/golang-ubuntu:6.0' <mask> # release-vX.Y.Z branches are the branches from which the actual final release <mask> # is built. <mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+': <mask> # Disable integration branches for release branches. <mask> 'branch-config': </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> add * </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> add * </s> remove 'GO_VERSION': '1.19.5' </s> add 'GO_VERSION': '1.19.6'
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
bamboo-specs/release.yaml
keep keep keep keep replace
<mask> # Set the default release channel on the final branch to release, as these <mask> # are the ones that actually get released. <mask> 'variables': <mask> 'channel': 'release' <mask> 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> add * </s> add * </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
bamboo-specs/release.yaml
keep keep keep keep replace keep keep keep keep keep
<mask> 'project-key': 'AGH' <mask> 'key': 'AHBRTSPECS' <mask> 'name': 'AdGuard Home - Build and run tests' <mask> 'variables': <mask> 'dockerGo': 'adguard/golang-ubuntu:6.0' <mask> <mask> 'stages': <mask> - 'Tests': <mask> 'manual': false <mask> 'final': false </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'GO_VERSION': '1.19.5' </s> add 'GO_VERSION': '1.19.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'GO_VERSION': '1.19.5' </s> add 'GO_VERSION': '1.19.6' </s> add *
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
bamboo-specs/test.yaml
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
<mask> "categoryId": "other", <mask> "homepage": "https://github.com/DandelionSprout/adfilt", <mask> "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_6.txt" <mask> }, <mask> "energized_spark": { <mask> "name": "Energized Spark", <mask> "categoryId": "general", <mask> "homepage": "https://energized.pro/", <mask> "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_28.txt" <mask> }, <mask> "hagezi_personal": { <mask> "name": "HaGeZi Personal Black \u0026 White", <mask> "categoryId": "general", <mask> "homepage": "https://github.com/hagezi/dns-blocklists", <mask> "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_34.txt" </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> add * </s> add * </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww= </s> add </s> add github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q=
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
client/src/helpers/filters/filters.js
keep keep keep add keep keep keep keep keep
<mask> }; <mask> <mask> /** <mask> * Gets the source metadata for the specified tracker <mask> * @param {TrackerData} trackerData tracker data <mask> * @returns {source} source metadata or null if no matching tracker found <mask> */ <mask> export const getSourceData = (trackerData) => { <mask> if (!trackerData || !trackerData.source) { </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> add * </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove "energized_spark": { "name": "Energized Spark", "categoryId": "general", "homepage": "https://energized.pro/", "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_28.txt" }, </s> add </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
client/src/helpers/trackers/trackers.js
keep keep keep add keep keep keep keep keep
<mask> }; <mask> <mask> /** <mask> * Converts the JSON string source into numeric source for AdGuard Home <mask> * @param {TrackerData} trackerData tracker data <mask> * @returns {number} source number <mask> */ <mask> const convertSource = (sourceStr) => { <mask> if (!sourceStr || sourceStr !== 'AdGuard') { </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> add * </s> remove "energized_spark": { "name": "Energized Spark", "categoryId": "general", "homepage": "https://energized.pro/", "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_28.txt" }, </s> add </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0' </s> add 'dockerGo': 'adguard/golang-ubuntu:6.1'
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
client/src/helpers/trackers/trackers.js
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> github.com/quic-go/quic-go v0.32.0 <mask> github.com/stretchr/testify v1.8.1 <mask> github.com/ti-mo/netfilter v0.5.0 <mask> go.etcd.io/bbolt v1.3.7 <mask> golang.org/x/crypto v0.5.0 <mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771 <mask> golang.org/x/net v0.5.0 <mask> golang.org/x/sys v0.5.0 <mask> gopkg.in/natefinch/lumberjack.v2 v2.2.1 <mask> gopkg.in/yaml.v3 v3.0.1 <mask> howett.net/plist v1.0.0 <mask> ) </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/mod v0.7.0 // indirect </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> add golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= </s> add golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= </s> add golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s= golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU= golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
go.mod
keep keep keep keep replace keep keep keep keep keep
<mask> github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect <mask> github.com/josharian/native v1.1.0 // indirect <mask> github.com/mdlayher/packet v1.1.1 // indirect <mask> github.com/mdlayher/socket v0.4.0 // indirect <mask> github.com/onsi/ginkgo/v2 v2.8.0 // indirect <mask> github.com/patrickmn/go-cache v2.1.0+incompatible // indirect <mask> github.com/pkg/errors v0.9.1 // indirect <mask> github.com/pmezard/go-difflib v1.0.0 // indirect <mask> github.com/quic-go/qpack v0.4.0 // indirect <mask> github.com/quic-go/qtls-go1-18 v0.2.0 // indirect </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/mod v0.7.0 // indirect </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> add github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
go.mod
keep keep add keep keep keep keep keep keep
<mask> github.com/mdlayher/socket v0.4.0 // indirect <mask> github.com/onsi/ginkgo/v2 v2.8.1 // indirect <mask> github.com/patrickmn/go-cache v2.1.0+incompatible // indirect <mask> github.com/pkg/errors v0.9.1 // indirect <mask> github.com/pmezard/go-difflib v1.0.0 // indirect <mask> github.com/quic-go/qpack v0.4.0 // indirect <mask> github.com/quic-go/qtls-go1-18 v0.2.0 // indirect <mask> github.com/quic-go/qtls-go1-19 v0.2.0 // indirect <mask> github.com/quic-go/qtls-go1-20 v0.1.0 // indirect </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/mod v0.7.0 // indirect </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/mod v0.8.0 // indirect </s> add github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q=
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
go.mod
keep keep replace replace keep replace replace
<mask> github.com/quic-go/qtls-go1-19 v0.2.0 // indirect <mask> github.com/quic-go/qtls-go1-20 v0.1.0 // indirect <mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect <mask> golang.org/x/mod v0.7.0 // indirect <mask> golang.org/x/sync v0.1.0 // indirect <mask> golang.org/x/text v0.6.0 // indirect <mask> golang.org/x/tools v0.5.0 // indirect </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/mod v0.7.0 // indirect </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/mod v0.8.0 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> add golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= </s> add golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q=
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
go.mod
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.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= <mask> github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= <mask> github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= <mask> github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= <mask> github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= <mask> github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= <mask> github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= <mask> github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> add github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8= honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo= honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/net v0.5.0 </s> add golang.org/x/crypto v0.6.0 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
go.sum
keep keep add keep keep keep keep
<mask> github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= <mask> github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= <mask> github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= <mask> github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= <mask> github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= <mask> github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= <mask> github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/net v0.5.0 </s> add golang.org/x/crypto v0.6.0 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8= honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo= honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
go.sum
keep keep keep keep replace keep keep keep keep keep
<mask> github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo= <mask> github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= <mask> github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ= <mask> github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= <mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww= <mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f/go.mod h1:IogEAUBXDEwX7oR/BMmCctShYs80ql4hF0ySdzGxf7E= <mask> github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= <mask> go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= <mask> go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= <mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c h1:PHoGTnweZP+KIg/8Zc6+iOesrIF5yHkpb4GBDxHm7yE= github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264= </s> remove golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> add golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/net v0.5.0 </s> add golang.org/x/crypto v0.6.0 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s= golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU= golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
go.sum
keep keep keep add keep keep keep keep
<mask> github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= <mask> github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ= <mask> github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= <mask> github.com/u-root/uio v0.0.0-20221213070652-c3537552635f/go.mod h1:IogEAUBXDEwX7oR/BMmCctShYs80ql4hF0ySdzGxf7E= <mask> github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= <mask> go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= <mask> go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= <mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww= </s> add </s> remove golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> add golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/net v0.5.0 </s> add golang.org/x/crypto v0.6.0 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s= golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU= golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
go.sum
keep replace replace replace replace keep keep keep replace replace keep
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= <mask> golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= <mask> golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= <mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= <mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= <mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= <mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= <mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= <mask> golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= <mask> golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= <mask> golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s= golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU= golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/net v0.5.0 </s> add golang.org/x/crypto v0.6.0 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/mod v0.7.0 // indirect </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= </s> add golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
go.sum
keep keep keep keep replace replace keep keep keep keep keep
<mask> golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= <mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= <mask> golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= <mask> golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= <mask> golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= <mask> golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= <mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= <mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= <mask> golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= <mask> golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= <mask> golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= </s> add golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/net v0.5.0 </s> add golang.org/x/crypto v0.6.0 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/mod v0.7.0 // indirect </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/mod v0.8.0 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
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.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= <mask> golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= <mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= <mask> golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= <mask> golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= <mask> golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= <mask> golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4= golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= </s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ= golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 h1:HRexnHfiDA2hkPNMDgf3vxabRMeC+XeS8tCKP9olVbs= golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y= golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 honnef.co/go/tools v0.4.0 </s> add golang.org/x/tools v0.6.0 golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 honnef.co/go/tools v0.4.1 </s> remove golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> add golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
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.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4= <mask> golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= <mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= <mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= <mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= <mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= <mask> google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ= golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 h1:HRexnHfiDA2hkPNMDgf3vxabRMeC+XeS8tCKP9olVbs= golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y= golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> remove golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> add golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 honnef.co/go/tools v0.4.0 </s> add golang.org/x/tools v0.6.0 golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 honnef.co/go/tools v0.4.1 </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= </s> add golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
go.sum
keep keep keep replace keep replace keep
<mask> Rules: []string{ <mask> "||aus.social^", <mask> "||awscommunity.social^", <mask> "||cupoftea.social^", <mask> "||cyberplace.social^", <mask> "||defcon.social^", <mask> "||det.social^", </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8= honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo= honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c h1:PHoGTnweZP+KIg/8Zc6+iOesrIF5yHkpb4GBDxHm7yE= github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264= </s> add github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/filtering/servicelist.go
keep keep keep keep replace keep keep keep keep keep
<mask> "||masto.pt^", <mask> "||mastodon.au^", <mask> "||mastodon.bida.im^", <mask> "||mastodon.com.tr^", <mask> "||mastodon.eus^", <mask> "||mastodon.green^", <mask> "||mastodon.ie^", <mask> "||mastodon.iriseden.eu^", <mask> "||mastodon.nl^", <mask> "||mastodon.nu^", </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8= honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo= honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/net v0.5.0 </s> add golang.org/x/crypto v0.6.0 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 </s> add github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/filtering/servicelist.go
keep add keep keep keep keep
<mask> "||mastodon.nz^", <mask> "||mastodon.online^", <mask> "||mastodon.scot^", <mask> "||mastodon.sdf.org^", <mask> "||mastodon.social^", <mask> "||mastodon.social^", </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> add "||mastodon.social^", </s> remove "||mastodon.zaclys.com^", </s> add "||mastodon.xyz^", </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/filtering/servicelist.go
keep keep add keep keep keep keep keep keep
<mask> "||mastodon.scot^", <mask> "||mastodon.sdf.org^", <mask> "||mastodon.social^", <mask> "||mastodon.top^", <mask> "||mastodon.uno^", <mask> "||mastodon.world^", <mask> "||mastodon.xyz^", <mask> "||mastodonapp.uk^", <mask> "||mastodonners.nl^", </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove "||mastodon.zaclys.com^", </s> add "||mastodon.xyz^", </s> add "||mastodon.online^", </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/filtering/servicelist.go
keep keep keep keep replace keep keep keep keep keep
<mask> "||mastodon.social^", <mask> "||mastodon.top^", <mask> "||mastodon.uno^", <mask> "||mastodon.world^", <mask> "||mastodon.zaclys.com^", <mask> "||mastodonapp.uk^", <mask> "||mastodonners.nl^", <mask> "||mastodont.cat^", <mask> "||mastodontech.de^", <mask> "||mastodontti.fi^", </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> add "||mastodon.social^", </s> add "||mastodon.online^", </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/filtering/servicelist.go
keep keep keep add keep keep keep keep
<mask> "||metalhead.club^", <mask> "||mindly.social^", <mask> "||mstdn.ca^", <mask> "||mstdn.jp^", <mask> "||mstdn.social^", <mask> "||muenchen.social^", <mask> "||nerdculture.de^", <mask> "||newsie.social^", </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove "||muenster.im^", </s> add "||nerdculture.de^", </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8= honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo= honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add * </s> add github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/filtering/servicelist.go
keep keep keep keep replace keep keep keep keep keep
<mask> "||mstdn.ca^", <mask> "||mstdn.jp^", <mask> "||mstdn.social^", <mask> "||muenchen.social^", <mask> "||muenster.im^", <mask> "||newsie.social^", <mask> "||noc.social^", <mask> "||norden.social^", <mask> "||nrw.social^", <mask> "||o3o.ca^", </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> add "||mstdn.party^", </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8= honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo= honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add * </s> add github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= </s> remove github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= </s> add github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/filtering/servicelist.go
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 <mask> github.com/kisielk/errcheck v1.6.3 <mask> github.com/kyoh86/looppointer v0.2.1 <mask> github.com/securego/gosec/v2 v2.15.0 <mask> golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 <mask> golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 <mask> honnef.co/go/tools v0.4.0 <mask> mvdan.cc/gofumpt v0.4.0 <mask> mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 <mask> ) <mask> <mask> require ( </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8= honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo= honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ= golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 h1:HRexnHfiDA2hkPNMDgf3vxabRMeC+XeS8tCKP9olVbs= golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y= golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/tools/go.mod
keep keep keep keep replace replace replace keep keep keep keep
<mask> github.com/gookit/color v1.5.2 // indirect <mask> github.com/kyoh86/nolint v0.0.1 // indirect <mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect <mask> github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect <mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect <mask> golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect <mask> golang.org/x/mod v0.7.0 // indirect <mask> golang.org/x/sync v0.1.0 // indirect <mask> golang.org/x/sys v0.5.0 // indirect <mask> gopkg.in/yaml.v3 v3.0.1 // indirect <mask> ) </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/net v0.5.0 </s> add golang.org/x/crypto v0.6.0 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s= golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb h1:WGs/bGIWYyAY5PVgGGMXqGGCxSJz4fpoUExb/vgqNCU= golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/tools/go.mod
keep keep keep keep replace replace replace replace keep keep keep replace replace keep keep
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= <mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= <mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= <mask> golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= <mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= <mask> golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= <mask> golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 h1:k+aVvDl4NAHQwLMtHN6wB0DL0737J8ScFNIufmap3/s= <mask> golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= <mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= <mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= <mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= <mask> golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= <mask> golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= <mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= <mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> add golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/net v0.5.0 </s> add golang.org/x/crypto v0.6.0 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/mod v0.7.0 // indirect </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/mod v0.8.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww= </s> add
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
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.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= <mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= <mask> golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= <mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= <mask> golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= <mask> golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= </s> add golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> add golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/net v0.5.0 </s> add golang.org/x/crypto v0.6.0 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/tools/go.sum
keep keep keep keep replace replace 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-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= <mask> golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= <mask> golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= <mask> golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ= <mask> golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= <mask> golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 h1:HRexnHfiDA2hkPNMDgf3vxabRMeC+XeS8tCKP9olVbs= <mask> golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= <mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= <mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= <mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= <mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= <mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4= golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= </s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 honnef.co/go/tools v0.4.0 </s> add golang.org/x/tools v0.6.0 golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 honnef.co/go/tools v0.4.1 </s> remove golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> add golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= </s> remove golang.org/x/text v0.6.0 // indirect golang.org/x/tools v0.5.0 // indirect </s> add golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.6.0 // indirect </s> remove honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8= honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> add honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo= honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect golang.org/x/mod v0.7.0 // indirect </s> add github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect golang.org/x/mod v0.8.0 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/tools/go.sum
keep keep keep keep replace replace keep keep keep keep
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= <mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= <mask> gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= <mask> gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= <mask> honnef.co/go/tools v0.4.0 h1:lyXVV1c8wUBJRKqI8JgIpT8TW1VDagfYYaxbKa/HoL8= <mask> honnef.co/go/tools v0.4.0/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= <mask> mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM= <mask> mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ= <mask> mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 h1:n/xhncJPSt0YzfOhnyn41XxUdrWQNgmLBG72FE27Fqw= <mask> mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95/go.mod h1:2vU506e8nGWodqcci641NLi4im2twWSq4Lod756epHQ= </s> Pull request 1737: upd-all Merge in DNS/adguard-home from upd-all to master Squashed commit of the following: commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2 Author: Ainar Garipov <[email protected]> Date: Wed Feb 15 14:16:54 2023 +0300 all: upd go, deps, i18n, flt lists </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 honnef.co/go/tools v0.4.0 </s> add golang.org/x/tools v0.6.0 golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 honnef.co/go/tools v0.4.1 </s> remove golang.org/x/crypto v0.5.0 golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/net v0.5.0 </s> add golang.org/x/crypto v0.6.0 golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb golang.org/x/net v0.7.0 </s> remove golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2 h1:v0FhRDmSCNH/0EurAT6T8KRY4aNuUhz6/WwBMxG+gvQ= golang.org/x/tools v0.5.1-0.20230117180257-8aba49bb5ea2/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1 h1:HRexnHfiDA2hkPNMDgf3vxabRMeC+XeS8tCKP9olVbs= golang.org/x/vuln v0.0.0-20230201222900-4c848edceff1/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> add golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y= golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= </s> remove golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/exp/typeparams v0.0.0-20230206171751-46f607a40771 // indirect golang.org/x/mod v0.7.0 // indirect </s> add golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/exp/typeparams v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/mod v0.8.0 // indirect </s> add github.com/pierrec/lz4/v4 v4.1.17 // indirect </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect </s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect
https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832
internal/tools/go.sum
keep keep replace keep replace keep
<mask> } <mask> <mask> pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName) <mask> var pid int <mask> data, err := os.ReadFile(pidfile) <mask> if errors.Is(err, os.ErrNotExist) { </s> Pull request: 3868 imp service uninstall Merge in DNS/adguard-home from 3868-imp-uninstall to master Closes #3868. Updates #3457. Squashed commit of the following: commit 6f50713407980c27e5b14bef4dc8839e134ec5c8 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 19:06:13 2021 +0300 all: imp openwrt commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:26:32 2021 +0300 all: imp code && docs commit bab95366b0ffa40d96de5bb8116ec14606e310ed Merge: 92ebc210 52f36f20 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:06:25 2021 +0300 Merge branch 'master' into 3868-imp-uninstall commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 13:18:58 2021 +0300 home: imp freebsd script & log changes commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc Author: Eugene Burkov <[email protected]> Date: Thu Dec 16 14:08:46 2021 +0300 all: imp service uninstall </s> add if err := svcAction(s, "stop"); err != nil { log.Debug("service: executing action %q: %s", "stop", err) } </s> remove log.Error("service: parsing pid file %s: bad value", pidfile) </s> add log.Error("service: parsing pid file %s: bad value", pidFile) </s> remove log.Error("service: reading pid file %s: %s", pidfile, err) </s> add log.Error("service: reading pid file %s: %s", pidFile, err) </s> add // Pass the script and action as a single string argument. </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err) </s> add log.Error("service: parsing pid from file %s: %s", pidFile, err)
https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f
internal/home/service.go
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> return <mask> } <mask> } else if err != nil { <mask> log.Error("service: reading pid file %s: %s", pidfile, err) <mask> <mask> return <mask> } else { <mask> parts := strings.SplitN(string(data), "\n", 2) <mask> if len(parts) == 0 { </s> Pull request: 3868 imp service uninstall Merge in DNS/adguard-home from 3868-imp-uninstall to master Closes #3868. Updates #3457. Squashed commit of the following: commit 6f50713407980c27e5b14bef4dc8839e134ec5c8 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 19:06:13 2021 +0300 all: imp openwrt commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:26:32 2021 +0300 all: imp code && docs commit bab95366b0ffa40d96de5bb8116ec14606e310ed Merge: 92ebc210 52f36f20 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:06:25 2021 +0300 Merge branch 'master' into 3868-imp-uninstall commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 13:18:58 2021 +0300 home: imp freebsd script & log changes commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc Author: Eugene Burkov <[email protected]> Date: Thu Dec 16 14:08:46 2021 +0300 all: imp service uninstall </s> remove log.Error("service: parsing pid file %s: bad value", pidfile) </s> add log.Error("service: parsing pid file %s: bad value", pidFile) </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err) </s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> add if err := svcAction(s, "stop"); err != nil { log.Debug("service: executing action %q: %s", "stop", err) } </s> remove data, err := os.ReadFile(pidfile) </s> add data, err := os.ReadFile(pidFile) </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> remove // installation Otherwise, the service won't start on the system </s> add // installation. Otherwise, the service won't start on the system
https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f
internal/home/service.go
keep keep keep keep replace keep keep keep keep keep
<mask> return <mask> } else { <mask> parts := strings.SplitN(string(data), "\n", 2) <mask> if len(parts) == 0 { <mask> log.Error("service: parsing pid file %s: bad value", pidfile) <mask> <mask> return <mask> } <mask> <mask> if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil { </s> Pull request: 3868 imp service uninstall Merge in DNS/adguard-home from 3868-imp-uninstall to master Closes #3868. Updates #3457. Squashed commit of the following: commit 6f50713407980c27e5b14bef4dc8839e134ec5c8 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 19:06:13 2021 +0300 all: imp openwrt commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:26:32 2021 +0300 all: imp code && docs commit bab95366b0ffa40d96de5bb8116ec14606e310ed Merge: 92ebc210 52f36f20 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:06:25 2021 +0300 Merge branch 'master' into 3868-imp-uninstall commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 13:18:58 2021 +0300 home: imp freebsd script & log changes commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc Author: Eugene Burkov <[email protected]> Date: Thu Dec 16 14:08:46 2021 +0300 all: imp service uninstall </s> remove log.Error("service: reading pid file %s: %s", pidfile, err) </s> add log.Error("service: reading pid file %s: %s", pidFile, err) </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err) </s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove data, err := os.ReadFile(pidfile) </s> add data, err := os.ReadFile(pidFile) </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> add if err := svcAction(s, "stop"); err != nil { log.Debug("service: executing action %q: %s", "stop", err) } </s> remove // installation Otherwise, the service won't start on the system </s> add // installation. Otherwise, the service won't start on the system
https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f
internal/home/service.go
keep keep keep keep replace keep keep keep keep keep
<mask> return <mask> } <mask> <mask> if pid, err = strconv.Atoi(strings.TrimSpace(parts[0])); err != nil { <mask> log.Error("service: parsing pid from file %s: %s", pidfile, err) <mask> <mask> return <mask> } <mask> } <mask> </s> Pull request: 3868 imp service uninstall Merge in DNS/adguard-home from 3868-imp-uninstall to master Closes #3868. Updates #3457. Squashed commit of the following: commit 6f50713407980c27e5b14bef4dc8839e134ec5c8 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 19:06:13 2021 +0300 all: imp openwrt commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:26:32 2021 +0300 all: imp code && docs commit bab95366b0ffa40d96de5bb8116ec14606e310ed Merge: 92ebc210 52f36f20 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:06:25 2021 +0300 Merge branch 'master' into 3868-imp-uninstall commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 13:18:58 2021 +0300 home: imp freebsd script & log changes commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc Author: Eugene Burkov <[email protected]> Date: Thu Dec 16 14:08:46 2021 +0300 all: imp service uninstall </s> remove log.Error("service: parsing pid file %s: bad value", pidfile) </s> add log.Error("service: parsing pid file %s: bad value", pidFile) </s> remove log.Error("service: reading pid file %s: %s", pidfile, err) </s> add log.Error("service: reading pid file %s: %s", pidFile, err) </s> remove data, err := os.ReadFile(pidfile) </s> add data, err := os.ReadFile(pidFile) </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> add if err := svcAction(s, "stop"); err != nil { log.Debug("service: executing action %q: %s", "stop", err) } </s> remove // installation Otherwise, the service won't start on the system </s> add // installation. Otherwise, the service won't start on the system
https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f
internal/home/service.go
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> <mask> if aghos.IsOpenWrt() { <mask> // On OpenWrt it is important to run enable after the service <mask> // installation Otherwise, the service won't start on the system <mask> // startup. <mask> _, err = runInitdCommand("enable") <mask> if err != nil { <mask> log.Fatalf("service: running init enable: %s", err) <mask> } </s> Pull request: 3868 imp service uninstall Merge in DNS/adguard-home from 3868-imp-uninstall to master Closes #3868. Updates #3457. Squashed commit of the following: commit 6f50713407980c27e5b14bef4dc8839e134ec5c8 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 19:06:13 2021 +0300 all: imp openwrt commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:26:32 2021 +0300 all: imp code && docs commit bab95366b0ffa40d96de5bb8116ec14606e310ed Merge: 92ebc210 52f36f20 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:06:25 2021 +0300 Merge branch 'master' into 3868-imp-uninstall commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 13:18:58 2021 +0300 home: imp freebsd script & log changes commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc Author: Eugene Burkov <[email protected]> Date: Thu Dec 16 14:08:46 2021 +0300 all: imp service uninstall </s> add if err := svcAction(s, "stop"); err != nil { log.Debug("service: executing action %q: %s", "stop", err) } </s> add // Pass the script and action as a single string argument. </s> remove // sysVersion is the version of local service.System interface // implementation. </s> add // sysVersion is the version of local service.System interface implementation. </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err) </s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove data, err := os.ReadFile(pidfile) </s> add data, err := os.ReadFile(pidFile) </s> remove log.Error("service: reading pid file %s: %s", pidfile, err) </s> add log.Error("service: reading pid file %s: %s", pidFile, err)
https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f
internal/home/service.go
keep keep keep add keep keep keep keep keep keep
<mask> log.Fatalf("service: running init disable: %s", err) <mask> } <mask> } <mask> <mask> if err := svcAction(s, "uninstall"); err != nil { <mask> log.Fatalf("service: executing action %q: %s", "uninstall", err) <mask> } <mask> <mask> if runtime.GOOS == "darwin" { <mask> // Remove log files on cleanup and log errors. </s> Pull request: 3868 imp service uninstall Merge in DNS/adguard-home from 3868-imp-uninstall to master Closes #3868. Updates #3457. Squashed commit of the following: commit 6f50713407980c27e5b14bef4dc8839e134ec5c8 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 19:06:13 2021 +0300 all: imp openwrt commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:26:32 2021 +0300 all: imp code && docs commit bab95366b0ffa40d96de5bb8116ec14606e310ed Merge: 92ebc210 52f36f20 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:06:25 2021 +0300 Merge branch 'master' into 3868-imp-uninstall commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 13:18:58 2021 +0300 home: imp freebsd script & log changes commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc Author: Eugene Burkov <[email protected]> Date: Thu Dec 16 14:08:46 2021 +0300 all: imp service uninstall </s> remove // installation Otherwise, the service won't start on the system </s> add // installation. Otherwise, the service won't start on the system </s> remove log.Error("service: reading pid file %s: %s", pidfile, err) </s> add log.Error("service: reading pid file %s: %s", pidFile, err) </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err) </s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove data, err := os.ReadFile(pidfile) </s> add data, err := os.ReadFile(pidFile) </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> remove log.Error("service: parsing pid file %s: bad value", pidfile) </s> add log.Error("service: parsing pid file %s: bad value", pidFile)
https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f
internal/home/service.go
keep keep keep add keep keep keep keep
<mask> // runInitdCommand runs init.d service command <mask> // returns command code or error if any <mask> func runInitdCommand(action string) (int, error) { <mask> confPath := "/etc/init.d/" + serviceName <mask> code, _, err := aghos.RunCommand("sh", "-c", confPath+" "+action) <mask> <mask> return code, err <mask> } </s> Pull request: 3868 imp service uninstall Merge in DNS/adguard-home from 3868-imp-uninstall to master Closes #3868. Updates #3457. Squashed commit of the following: commit 6f50713407980c27e5b14bef4dc8839e134ec5c8 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 19:06:13 2021 +0300 all: imp openwrt commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:26:32 2021 +0300 all: imp code && docs commit bab95366b0ffa40d96de5bb8116ec14606e310ed Merge: 92ebc210 52f36f20 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:06:25 2021 +0300 Merge branch 'master' into 3868-imp-uninstall commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 13:18:58 2021 +0300 home: imp freebsd script & log changes commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc Author: Eugene Burkov <[email protected]> Date: Thu Dec 16 14:08:46 2021 +0300 all: imp service uninstall </s> remove // installation Otherwise, the service won't start on the system </s> add // installation. Otherwise, the service won't start on the system </s> add if err := svcAction(s, "stop"); err != nil { log.Debug("service: executing action %q: %s", "stop", err) } </s> remove data, err := os.ReadFile(pidfile) </s> add data, err := os.ReadFile(pidFile) </s> remove pidfile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> add pidFile := fmt.Sprintf("/var/run/%s.pid", serviceName) </s> remove log.Error("service: parsing pid file %s: bad value", pidfile) </s> add log.Error("service: parsing pid file %s: bad value", pidFile) </s> remove // sysVersion is the version of local service.System interface // implementation. </s> add // sysVersion is the version of local service.System interface implementation.
https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f
internal/home/service.go
keep keep replace keep replace keep keep
<mask> {{.Name}}_env="IS_DAEMON=1" <mask> {{.Name}}_user="root" <mask> pidfile="/var/run/${name}.pid" <mask> command="/usr/sbin/daemon" <mask> command_args="-p ${pidfile} -f -r {{.WorkingDirectory}}/{{.Name}}" <mask> run_rc_command "$1" <mask> ` </s> Pull request: 3868 imp service uninstall Merge in DNS/adguard-home from 3868-imp-uninstall to master Closes #3868. Updates #3457. Squashed commit of the following: commit 6f50713407980c27e5b14bef4dc8839e134ec5c8 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 19:06:13 2021 +0300 all: imp openwrt commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:26:32 2021 +0300 all: imp code && docs commit bab95366b0ffa40d96de5bb8116ec14606e310ed Merge: 92ebc210 52f36f20 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:06:25 2021 +0300 Merge branch 'master' into 3868-imp-uninstall commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 13:18:58 2021 +0300 home: imp freebsd script & log changes commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc Author: Eugene Burkov <[email protected]> Date: Thu Dec 16 14:08:46 2021 +0300 all: imp service uninstall </s> remove // sysVersion is the version of local service.System interface // implementation. </s> add // sysVersion is the version of local service.System interface implementation. </s> add // Pass the script and action as a single string argument. </s> add if err := svcAction(s, "stop"); err != nil { log.Debug("service: executing action %q: %s", "stop", err) } </s> remove // installation Otherwise, the service won't start on the system </s> add // installation. Otherwise, the service won't start on the system </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err) </s> add log.Error("service: parsing pid from file %s: %s", pidFile, err)
https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f
internal/home/service.go
keep keep keep keep replace replace keep keep keep keep keep
<mask> // package and has only one internal dependency. <mask> // <mask> // TODO(e.burkov): Perhaps, file a PR to github.com/kardianos/service. <mask> <mask> // sysVersion is the version of local service.System interface <mask> // implementation. <mask> const sysVersion = "openbsd-runcom" <mask> <mask> func chooseSystem() { <mask> service.ChooseSystem(openbsdSystem{}) <mask> } </s> Pull request: 3868 imp service uninstall Merge in DNS/adguard-home from 3868-imp-uninstall to master Closes #3868. Updates #3457. Squashed commit of the following: commit 6f50713407980c27e5b14bef4dc8839e134ec5c8 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 19:06:13 2021 +0300 all: imp openwrt commit 59f058f8ec7f5ac8cb795bf837c396601652a6ff Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:26:32 2021 +0300 all: imp code && docs commit bab95366b0ffa40d96de5bb8116ec14606e310ed Merge: 92ebc210 52f36f20 Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 17:06:25 2021 +0300 Merge branch 'master' into 3868-imp-uninstall commit 92ebc210f04d5e02c3eef726017a0d5687f4bc4c Author: Eugene Burkov <[email protected]> Date: Mon Dec 27 13:18:58 2021 +0300 home: imp freebsd script & log changes commit 583ffc256e9f87cf19da2eca8bbefc9e00ea86cc Author: Eugene Burkov <[email protected]> Date: Thu Dec 16 14:08:46 2021 +0300 all: imp service uninstall </s> remove // installation Otherwise, the service won't start on the system </s> add // installation. Otherwise, the service won't start on the system </s> add // Pass the script and action as a single string argument. </s> add if err := svcAction(s, "stop"); err != nil { log.Debug("service: executing action %q: %s", "stop", err) } </s> remove log.Error("service: parsing pid from file %s: %s", pidfile, err) </s> add log.Error("service: parsing pid from file %s: %s", pidFile, err) </s> remove log.Error("service: parsing pid file %s: bad value", pidfile) </s> add log.Error("service: parsing pid file %s: bad value", pidFile) </s> remove command_args="-p ${pidfile} -f -r {{.WorkingDirectory}}/{{.Name}}" </s> add command_args="-P ${pidfile} -p ${pidfile_child} -f -r {{.WorkingDirectory}}/{{.Name}}"
https://github.com/AdguardTeam/AdGuardHome/commit/661f4ece48d9e8d4c17847961184f1d93bdfa16f
internal/home/service_openbsd.go
keep add keep keep keep keep keep keep
<mask> "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https://www.quad9.net/' target='_blank'>Quad9</a> as an upstream.", <mask> "test_upstream_btn": "Test upstreams", <mask> "apply_btn": "Apply", <mask> "disabled_filtering_toast": "Disabled filtering", <mask> "enabled_filtering_toast": "Enabled filtering", <mask> "disabled_safe_browsing_toast": "Disabled safebrowsing", <mask> "enabled_safe_browsing_toast": "Enabled safebrowsing", <mask> "disabled_parental_toast": "Disabled parental control", </s> + client: handle upstream DNS servers for clients </s> add <div label="upstream" title={props.t('upstream_dns')}> <Field id="upstreams" name="upstreams" component="textarea" type="text" className="form-control form-control--textarea mb-5" placeholder={t('upstream_dns')} /> <Examples /> </div> </s> add import Examples from '../Dns/Upstream/Examples'; </s> remove use_global_settings: true, use_global_blocked_services: true, ...client, </s> add upstreams: (upstreams && upstreams.join('\n')) || '', ...values, </s> add const { upstreams, whois_info, ...values } = client; </s> remove if (values && values.blocked_services) { const blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); config = { ...values, blocked_services }; </s> add if (values) { if (values.blocked_services) { config.blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); } if (values.upstreams && typeof values.upstreams === 'string') { config.upstreams = normalizeTextarea(values.upstreams); } else { config.upstreams = []; } </s> remove let config = values; </s> add const config = values;
https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4
client/src/__locales/en.json
keep keep keep add keep keep keep keep keep
<mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import ReactTable from 'react-table'; <mask> <mask> import { MODAL_TYPE } from '../../../helpers/constants'; <mask> import Card from '../../ui/Card'; <mask> import Modal from './Modal'; <mask> import WrapCell from './WrapCell'; <mask> <mask> import whoisCell from './whoisCell'; </s> + client: handle upstream DNS servers for clients </s> add import Examples from '../Dns/Upstream/Examples'; </s> remove if (values && values.blocked_services) { const blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); config = { ...values, blocked_services }; </s> add if (values) { if (values.blocked_services) { config.blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); } if (values.upstreams && typeof values.upstreams === 'string') { config.upstreams = normalizeTextarea(values.upstreams); } else { config.upstreams = []; } </s> add const { upstreams, whois_info, ...values } = client; </s> remove use_global_settings: true, use_global_blocked_services: true, ...client, </s> add upstreams: (upstreams && upstreams.join('\n')) || '', ...values, </s> remove let config = values; </s> add const config = values; </s> add <div label="upstream" title={props.t('upstream_dns')}> <Field id="upstreams" name="upstreams" component="textarea" type="text" className="form-control form-control--textarea mb-5" placeholder={t('upstream_dns')} /> <Examples /> </div>
https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4
client/src/components/Settings/Clients/ClientsTable.js
keep keep keep keep replace keep keep keep keep keep
<mask> this.props.updateClient(values, name); <mask> }; <mask> <mask> handleSubmit = (values) => { <mask> let config = values; <mask> <mask> if (values && values.blocked_services) { <mask> const blocked_services = Object <mask> .keys(values.blocked_services) <mask> .filter(service => values.blocked_services[service]); </s> + client: handle upstream DNS servers for clients </s> remove if (values && values.blocked_services) { const blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); config = { ...values, blocked_services }; </s> add if (values) { if (values.blocked_services) { config.blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); } if (values.upstreams && typeof values.upstreams === 'string') { config.upstreams = normalizeTextarea(values.upstreams); } else { config.upstreams = []; } </s> add const { upstreams, whois_info, ...values } = client; </s> remove use_global_settings: true, use_global_blocked_services: true, ...client, </s> add upstreams: (upstreams && upstreams.join('\n')) || '', ...values, </s> add import { normalizeTextarea } from '../../../helpers/helpers'; </s> add import Examples from '../Dns/Upstream/Examples'; </s> add <div label="upstream" title={props.t('upstream_dns')}> <Field id="upstreams" name="upstreams" component="textarea" type="text" className="form-control form-control--textarea mb-5" placeholder={t('upstream_dns')} /> <Examples /> </div>
https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4
client/src/components/Settings/Clients/ClientsTable.js
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
<mask> <mask> handleSubmit = (values) => { <mask> let config = values; <mask> <mask> if (values && values.blocked_services) { <mask> const blocked_services = Object <mask> .keys(values.blocked_services) <mask> .filter(service => values.blocked_services[service]); <mask> config = { ...values, blocked_services }; <mask> } <mask> <mask> if (this.props.modalType === MODAL_TYPE.EDIT) { <mask> this.handleFormUpdate(config, this.props.modalClientName); <mask> } else { </s> + client: handle upstream DNS servers for clients </s> remove let config = values; </s> add const config = values; </s> add const { upstreams, whois_info, ...values } = client; </s> remove use_global_settings: true, use_global_blocked_services: true, ...client, </s> add upstreams: (upstreams && upstreams.join('\n')) || '', ...values, </s> add import { normalizeTextarea } from '../../../helpers/helpers'; </s> add import Examples from '../Dns/Upstream/Examples'; </s> add <div label="upstream" title={props.t('upstream_dns')}> <Field id="upstreams" name="upstreams" component="textarea" type="text" className="form-control form-control--textarea mb-5" placeholder={t('upstream_dns')} /> <Examples /> </div>
https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4
client/src/components/Settings/Clients/ClientsTable.js
keep keep keep add keep keep keep keep keep
<mask> getClient = (name, clients) => { <mask> const client = clients.find(item => name === item.name); <mask> <mask> if (client) { <mask> return { <mask> upstreams: (upstreams && upstreams.join('\n')) || '', <mask> ...values, <mask> }; <mask> } </s> + client: handle upstream DNS servers for clients </s> remove use_global_settings: true, use_global_blocked_services: true, ...client, </s> add upstreams: (upstreams && upstreams.join('\n')) || '', ...values, </s> remove if (values && values.blocked_services) { const blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); config = { ...values, blocked_services }; </s> add if (values) { if (values.blocked_services) { config.blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); } if (values.upstreams && typeof values.upstreams === 'string') { config.upstreams = normalizeTextarea(values.upstreams); } else { config.upstreams = []; } </s> add import { normalizeTextarea } from '../../../helpers/helpers'; </s> add import Examples from '../Dns/Upstream/Examples'; </s> remove let config = values; </s> add const config = values; </s> add <div label="upstream" title={props.t('upstream_dns')}> <Field id="upstreams" name="upstreams" component="textarea" type="text" className="form-control form-control--textarea mb-5" placeholder={t('upstream_dns')} /> <Examples /> </div>
https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4
client/src/components/Settings/Clients/ClientsTable.js
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> const client = clients.find(item => name === item.name); <mask> <mask> if (client) { <mask> return { <mask> use_global_settings: true, <mask> use_global_blocked_services: true, <mask> ...client, <mask> }; <mask> } <mask> <mask> return { <mask> ids: [''], </s> + client: handle upstream DNS servers for clients </s> add const { upstreams, whois_info, ...values } = client; </s> remove if (values && values.blocked_services) { const blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); config = { ...values, blocked_services }; </s> add if (values) { if (values.blocked_services) { config.blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); } if (values.upstreams && typeof values.upstreams === 'string') { config.upstreams = normalizeTextarea(values.upstreams); } else { config.upstreams = []; } </s> add import { normalizeTextarea } from '../../../helpers/helpers'; </s> add import Examples from '../Dns/Upstream/Examples'; </s> remove let config = values; </s> add const config = values; </s> add <div label="upstream" title={props.t('upstream_dns')}> <Field id="upstreams" name="upstreams" component="textarea" type="text" className="form-control form-control--textarea mb-5" placeholder={t('upstream_dns')} /> <Examples /> </div>
https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4
client/src/components/Settings/Clients/ClientsTable.js
keep add keep keep keep keep
<mask> import i18n from '../../../i18n'; <mask> import Tabs from '../../ui/Tabs'; <mask> import { toggleAllServices } from '../../../helpers/helpers'; <mask> import { <mask> renderField, <mask> renderGroupField, </s> + client: handle upstream DNS servers for clients </s> add import { normalizeTextarea } from '../../../helpers/helpers'; </s> remove if (values && values.blocked_services) { const blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); config = { ...values, blocked_services }; </s> add if (values) { if (values.blocked_services) { config.blocked_services = Object .keys(values.blocked_services) .filter(service => values.blocked_services[service]); } if (values.upstreams && typeof values.upstreams === 'string') { config.upstreams = normalizeTextarea(values.upstreams); } else { config.upstreams = []; } </s> add const { upstreams, whois_info, ...values } = client; </s> remove use_global_settings: true, use_global_blocked_services: true, ...client, </s> add upstreams: (upstreams && upstreams.join('\n')) || '', ...values, </s> remove let config = values; </s> add const config = values; </s> add <div label="upstream" title={props.t('upstream_dns')}> <Field id="upstreams" name="upstreams" component="textarea" type="text" className="form-control form-control--textarea mb-5" placeholder={t('upstream_dns')} /> <Examples /> </div>
https://github.com/AdguardTeam/AdGuardHome/commit/6684a120ac9909140e4ecbe674e09c8f24e87ac4
client/src/components/Settings/Clients/Form.js