daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request 2360: Update all

Browse Source 
Merge in DNS/adguard-home from upd-all to master

Squashed commit of the following:

commit a9ec07f3810d94f1119d727a317db05a5f0d2d81
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Mar 10 18:26:30 2025 +0300

    client: upd data

commit f1cba36a0048e47f28a9ed481d51529e82e24283
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Mar 10 18:18:46 2025 +0300

    all: upd proxy
This commit is contained in:
Eugene Burkov
2025-03-10 18:38:11 +03:00
parent 3255efcaf3
commit ac8a0ec570
3 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
client/src/helpers/trackers/trackers.json
View File

@@ -1,5 +1,5 @@
{ {
"timeUpdated": "2025-01-13T10:04:54.031Z", "timeUpdated": "2025-03-10T15:13:28.992Z",
"categories": { "categories": {
"0": "audio_video_player", "0": "audio_video_player",
"1": "comments", "1": "comments",
@@ -5940,7 +5940,8 @@
"name": "Digioh", "name": "Digioh",
"categoryId": 4, "categoryId": 4,
"url": "https://digioh.com/", "url": "https://digioh.com/",
"companyId": null "companyId": "digioh",
"source": "AdGuard"
}, },
"digital.gov": { "digital.gov": {
"name": "Digital.gov", "name": "Digital.gov",
@@ -8261,8 +8262,8 @@
}, },
"google_marketing": { "google_marketing": {
"name": "Google Marketing", "name": "Google Marketing",
"categoryId": 6, "categoryId": 4,
"url": "https://marketingplatform.google.com/", "url": "https://marketingplatform.google.com/about/enterprise",
"companyId": "google", "companyId": "google",
"source": "AdGuard" "source": "AdGuard"
}, },
@@ -9058,6 +9059,13 @@
"url": "https://www.ippen-digital.de/", "url": "https://www.ippen-digital.de/",
"companyId": null "companyId": null
}, },
"id5-sync": {
"name": "ID5 Sync",
"categoryId": 4,
"url": "https://id5.io/",
"companyId": "id5-sync",
"source": "AdGuard"
},
"id_services": { "id_services": {
"name": "ID Services", "name": "ID Services",
"categoryId": 6, "categoryId": 6,
@@ -20948,6 +20956,8 @@
"wunderloop.net": "audience_science", "wunderloop.net": "audience_science",
"12mlbe.com": "audiencerate", "12mlbe.com": "audiencerate",
"audiencesquare.com": "audiencesquare.com", "audiencesquare.com": "audiencesquare.com",
"ad.gt": "audiencesquare.com",
"audigent.com": "audiencesquare.com",
"auditude.com": "auditude", "auditude.com": "auditude",
"audtd.com": "audtd.com", "audtd.com": "audtd.com",
"cdn.augur.io": "augur", "cdn.augur.io": "augur",
@@ -21682,9 +21692,6 @@
"dtmpub.com": "dotomi", "dtmpub.com": "dotomi",
"double.net": "double.net", "double.net": "double.net",
"2mdn.net": "doubleclick", "2mdn.net": "doubleclick",
"doubleclick.net": "doubleclick",
"invitemedia.com": "doubleclick",
"doubleclick.com": "doubleclick",
"doublepimp.com": "doublepimp", "doublepimp.com": "doublepimp",
"doublepimpssl.com": "doublepimp", "doublepimpssl.com": "doublepimp",
"redcourtside.com": "doublepimp", "redcourtside.com": "doublepimp",
@@ -21988,6 +21995,7 @@
"cdn.foxpush.net": "foxpush", "cdn.foxpush.net": "foxpush",
"foxpush.com": "foxpush", "foxpush.com": "foxpush",
"foxtel.com.au": "foxtel", "foxtel.com.au": "foxtel",
"foxtelgroupcdn.net.au": "foxtel",
"foxydeal.com": "foxydeal_com", "foxydeal.com": "foxydeal_com",
"yabidos.com": "fraudlogix", "yabidos.com": "fraudlogix",
"besucherstatistiken.com": "free_counter", "besucherstatistiken.com": "free_counter",
@@ -22389,6 +22397,8 @@
"maps.google.es": "google_maps", "maps.google.es": "google_maps",
"maps.google.se": "google_maps", "maps.google.se": "google_maps",
"maps.gstatic.com": "google_maps", "maps.gstatic.com": "google_maps",
"doubleclick.net": "google_marketing",
"invitemedia.com": "google_marketing",
"adsense.google.com": "google_marketing", "adsense.google.com": "google_marketing",
"adservice.google.ca": "google_marketing", "adservice.google.ca": "google_marketing",
"adservice.google.co.in": "google_marketing", "adservice.google.co.in": "google_marketing",
@@ -22419,6 +22429,7 @@
"adservice.google.vg": "google_marketing", "adservice.google.vg": "google_marketing",
"adtrafficquality.google": "google_marketing", "adtrafficquality.google": "google_marketing",
"dai.google.com": "google_marketing", "dai.google.com": "google_marketing",
"doubleclick.com": "google_marketing",
"doubleclickbygoogle.com": "google_marketing", "doubleclickbygoogle.com": "google_marketing",
"googlesyndication-cn.com": "google_marketing", "googlesyndication-cn.com": "google_marketing",
"duo.google.com": "google_meet", "duo.google.com": "google_meet",
@@ -22604,6 +22615,9 @@
"icuazeczpeoohx.com": "icuazeczpeoohx.com", "icuazeczpeoohx.com": "icuazeczpeoohx.com",
"id-news.net": "id-news.net", "id-news.net": "id-news.net",
"idcdn.de": "id-news.net", "idcdn.de": "id-news.net",
"eu-1-id5-sync.com": "id5-sync",
"id5-sync.com": "id5-sync",
"id5.io": "id5-sync",
"cdn.id.services": "id_services", "cdn.id.services": "id_services",
"e-generator.com": "ideal_media", "e-generator.com": "ideal_media",
"idealo.com": "idealo_com", "idealo.com": "idealo_com",
@@ -23656,6 +23670,7 @@
"blockmetrics.com": "pagefair", "blockmetrics.com": "pagefair",
"pagefair.com": "pagefair", "pagefair.com": "pagefair",
"pagefair.net": "pagefair", "pagefair.net": "pagefair",
"btloader.com": "pagefair",
"ghmedia.com": "pagescience", "ghmedia.com": "pagescience",
"777seo.com": "paid-to-promote", "777seo.com": "paid-to-promote",
"paid-to-promote.net": "paid-to-promote", "paid-to-promote.net": "paid-to-promote",

6
go.mod
View File

@@ -3,7 +3,7 @@ module github.com/AdguardTeam/AdGuardHome
go 1.24.1 go 1.24.1
require ( require (
github.com/AdguardTeam/dnsproxy v0.75.0 github.com/AdguardTeam/dnsproxy v0.75.1
github.com/AdguardTeam/golibs v0.32.5 github.com/AdguardTeam/golibs v0.32.5
github.com/AdguardTeam/urlfilter v0.20.0 github.com/AdguardTeam/urlfilter v0.20.0
github.com/NYTimes/gziphandler v1.1.1 github.com/NYTimes/gziphandler v1.1.1
@@ -48,7 +48,7 @@ require (
cloud.google.com/go/auth v0.15.0 // indirect cloud.google.com/go/auth v0.15.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
cloud.google.com/go/compute/metadata v0.6.0 // indirect cloud.google.com/go/compute/metadata v0.6.0 // indirect
cloud.google.com/go/longrunning v0.6.4 // indirect cloud.google.com/go/longrunning v0.6.5 // indirect
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
@@ -102,7 +102,7 @@ require (
golang.org/x/tools v0.31.0 // indirect golang.org/x/tools v0.31.0 // indirect
golang.org/x/vuln v1.1.4 // indirect golang.org/x/vuln v1.1.4 // indirect
gonum.org/v1/gonum v0.15.1 // indirect gonum.org/v1/gonum v0.15.1 // indirect
google.golang.org/api v0.223.0 // indirect google.golang.org/api v0.224.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
google.golang.org/grpc v1.71.0 // indirect google.golang.org/grpc v1.71.0 // indirect

12
go.sum
View File

@@ -8,10 +8,10 @@ cloud.google.com/go/auth/oauth2adapt v0.2.7 h1:/Lc7xODdqcEw8IrZ9SvwnlLX6j9FHQM74
cloud.google.com/go/auth/oauth2adapt v0.2.7/go.mod h1:NTbTTzfvPl1Y3V1nPpOgl2w6d/FjO7NNUQaWSox6ZMc= cloud.google.com/go/auth/oauth2adapt v0.2.7/go.mod h1:NTbTTzfvPl1Y3V1nPpOgl2w6d/FjO7NNUQaWSox6ZMc=
cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I= cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg= cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
cloud.google.com/go/longrunning v0.6.4 h1:3tyw9rO3E2XVXzSApn1gyEEnH2K9SynNQjMlBi3uHLg= cloud.google.com/go/longrunning v0.6.5 h1:sD+t8DO8j4HKW4QfouCklg7ZC1qC4uzVZt8iz3uTW+Q=
cloud.google.com/go/longrunning v0.6.4/go.mod h1:ttZpLCe6e7EXvn9OxpBRx7kZEB0efv8yBO6YnVMfhJs= cloud.google.com/go/longrunning v0.6.5/go.mod h1:Et04XK+0TTLKa5IPYryKf5DkpwImy6TluQ1QTLwlKmY=
github.com/AdguardTeam/dnsproxy v0.75.0 h1:v8/Oq/xPYzNoALR7SEUZEIbKmjnPcXLVhJLFVbrozEc= github.com/AdguardTeam/dnsproxy v0.75.1 h1:ux2sQfF/9+WRo6a32g9NtfaAPU19gJhqkEu2OZflxJg=
github.com/AdguardTeam/dnsproxy v0.75.0/go.mod h1:O2qoXwF4BUBFui7OMUiWSYwapEDcYxKWeur4+jfy9nM= github.com/AdguardTeam/dnsproxy v0.75.1/go.mod h1:HKBI/IO2/ACOjfTV6qIzB5ZDDxfjgHHvQ3hIbGg9wvc=
github.com/AdguardTeam/golibs v0.32.5 h1:4Rkv2xBnyJe6l/EM2MFgoY1S4pweYwDgLTYg2MDArEA= github.com/AdguardTeam/golibs v0.32.5 h1:4Rkv2xBnyJe6l/EM2MFgoY1S4pweYwDgLTYg2MDArEA=
github.com/AdguardTeam/golibs v0.32.5/go.mod h1:agsvz8Iyv0uV9NU56hpCoFLAtSPkiBf9nPVhDvdUIb0= github.com/AdguardTeam/golibs v0.32.5/go.mod h1:agsvz8Iyv0uV9NU56hpCoFLAtSPkiBf9nPVhDvdUIb0=
github.com/AdguardTeam/urlfilter v0.20.0 h1:X32qiuVCVd8WDYCEsbdZKfXMzwdVqrdulamtUi4rmzs= github.com/AdguardTeam/urlfilter v0.20.0 h1:X32qiuVCVd8WDYCEsbdZKfXMzwdVqrdulamtUi4rmzs=
@@ -268,8 +268,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0= gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0=
gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o= gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o=
google.golang.org/api v0.223.0 h1:JUTaWEriXmEy5AhvdMgksGGPEFsYfUKaPEYXd4c3Wvc= google.golang.org/api v0.224.0 h1:Ir4UPtDsNiwIOHdExr3fAj4xZ42QjK7uQte3lORLJwU=
google.golang.org/api v0.223.0/go.mod h1:C+RS7Z+dDwds2b+zoAk5hN/eSfsiCn0UDrYof/M4d2M= google.golang.org/api v0.224.0/go.mod h1:3V39my2xAGkodXy0vEqcEtkqgw2GtrFL5WuBZlCTCOQ=
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950= google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950=
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg= google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4= google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4=