From 0581b133b13fdb169e71450733b781e3dbe86a91 Mon Sep 17 00:00:00 2001 From: Bruce BUJON Date: Wed, 8 Apr 2020 13:11:34 +0200 Subject: [PATCH 1/3] Update AdAdawy hosts issue report link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hi @StevenBlack I hope you're going well. I propose a small change about the link to report an issue about AdAway's default hosts. I link it to the site GitHub project, not the application. Moreover, @jawz101 has taken over the `hosts` file management. There is [more frequent updates](https://github.com/AdAway/adaway.github.io/commits/master) than ever so you might also want to change the _occasionnaly_ frequence label. I take the opportunity of this PR to announce your hosts will be integrated as default source for the AdAway application! 🎉 I think some of the users already added it to their configuration but it will be enabled by default for all new users. I hope it is fine to you. Don't hesitate to tell me if not. Regards --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 4485dd374..c06d975aa 100644 --- a/readme.md +++ b/readme.md @@ -77,7 +77,7 @@ URLHaus | A project from [abuse.ch](https://abuse.ch/) with the goal of sharing UncheckyAds | Windows installers ads sources sites based on https://unchecky.com/ content. |[link](https://github.com/FadeMind/hosts.extras) | [raw](https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts) | occasionally | | [issues](https://github.com/FadeMind/hosts.extras/issues) add.2o7Net | 2o7Net tracking sites based on [hostsfile.org](http://www.hostsfile.org/hosts.html) content. |[link](https://github.com/FadeMind/hosts.extras) | [raw](https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts) | occasionally | GPLv3+ | [issues](https://github.com/FadeMind/hosts.extras/issues) KADhosts | Fraud/adware/scam websites. |[link](https://kadantiscam.netlify.com/) | [raw](https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhosts_without_controversies.txt) | frequently | CC BY-SA 4.0 | [issues](https://github.com/PolishFiltersTeam/KADhosts/issues) -AdAway | AdAway is an open source ad blocker for Android using the hosts file. |[link](https://adaway.org/) | [raw](https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt) | occasionally | CC BY 3.0 | [issues](https://github.com/AdAway/AdAway/issues) +AdAway | AdAway is an open source ad blocker for Android using the hosts file. |[link](https://adaway.org/) | [raw](https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt) | occasionally | CC BY 3.0 | [issues](https://github.com/AdAway/adaway.github.io/issues) add.Risk | Risk content sites based on [hostsfile.org](http://www.hostsfile.org/hosts.html) content. |[link](https://github.com/FadeMind/hosts.extras) | [raw](https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts) | occasionally | GPLv3+ | [issues](https://github.com/FadeMind/hosts.extras/issues) Tiuxo hostlist - ads | Categorized hosts files for DNS based content blocking |[link](https://github.com/tiuxo/hosts) | [raw](https://raw.githubusercontent.com/tiuxo/hosts/master/ads) | occasional | CC BY 4.0 | [issues](https://github.com/tiuxo/hosts/issues) From 3768103c1efddc811e505170d73bc11e6ce11325 Mon Sep 17 00:00:00 2001 From: PerfectSlayer Date: Wed, 8 Apr 2020 15:20:52 +0200 Subject: [PATCH 2/3] Revert "Update AdAdawy hosts issue report link" This reverts commit 0581b133b13fdb169e71450733b781e3dbe86a91. --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index c06d975aa..4485dd374 100644 --- a/readme.md +++ b/readme.md @@ -77,7 +77,7 @@ URLHaus | A project from [abuse.ch](https://abuse.ch/) with the goal of sharing UncheckyAds | Windows installers ads sources sites based on https://unchecky.com/ content. |[link](https://github.com/FadeMind/hosts.extras) | [raw](https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts) | occasionally | | [issues](https://github.com/FadeMind/hosts.extras/issues) add.2o7Net | 2o7Net tracking sites based on [hostsfile.org](http://www.hostsfile.org/hosts.html) content. |[link](https://github.com/FadeMind/hosts.extras) | [raw](https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts) | occasionally | GPLv3+ | [issues](https://github.com/FadeMind/hosts.extras/issues) KADhosts | Fraud/adware/scam websites. |[link](https://kadantiscam.netlify.com/) | [raw](https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhosts_without_controversies.txt) | frequently | CC BY-SA 4.0 | [issues](https://github.com/PolishFiltersTeam/KADhosts/issues) -AdAway | AdAway is an open source ad blocker for Android using the hosts file. |[link](https://adaway.org/) | [raw](https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt) | occasionally | CC BY 3.0 | [issues](https://github.com/AdAway/adaway.github.io/issues) +AdAway | AdAway is an open source ad blocker for Android using the hosts file. |[link](https://adaway.org/) | [raw](https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt) | occasionally | CC BY 3.0 | [issues](https://github.com/AdAway/AdAway/issues) add.Risk | Risk content sites based on [hostsfile.org](http://www.hostsfile.org/hosts.html) content. |[link](https://github.com/FadeMind/hosts.extras) | [raw](https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts) | occasionally | GPLv3+ | [issues](https://github.com/FadeMind/hosts.extras/issues) Tiuxo hostlist - ads | Categorized hosts files for DNS based content blocking |[link](https://github.com/tiuxo/hosts) | [raw](https://raw.githubusercontent.com/tiuxo/hosts/master/ads) | occasional | CC BY 4.0 | [issues](https://github.com/tiuxo/hosts/issues) From f3464b98bf830e68f9a6020883e7032e87007fa5 Mon Sep 17 00:00:00 2001 From: PerfectSlayer Date: Wed, 8 Apr 2020 15:22:35 +0200 Subject: [PATCH 3/3] Fix adaway metadata according code review --- data/adaway.org/update.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/adaway.org/update.json b/data/adaway.org/update.json index f2847747e..e1c33fd92 100644 --- a/data/adaway.org/update.json +++ b/data/adaway.org/update.json @@ -2,8 +2,8 @@ "name": "AdAway", "description": "AdAway is an open source ad blocker for Android using the hosts file.", "homeurl": "https://adaway.org/", - "frequency": "occasionally", - "issues": "https://github.com/AdAway/AdAway/issues", + "frequency": "frequently", + "issues": "https://github.com/AdAway/adaway.github.io/issues", "url": "https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt", "license": "CC BY 3.0" }