From 245f197f95aff20b7178ca8dd4d35d97f61b1d49 Mon Sep 17 00:00:00 2001
From: Andrey Meshkov <am@adguard.com>
Date: Fri, 5 Feb 2021 00:10:43 +0300
Subject: [PATCH 1/2] Actualize vetted blocklists

---
 client/src/helpers/filters/filters.json | 28 ++++++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/client/src/helpers/filters/filters.json b/client/src/helpers/filters/filters.json
index 7bc4c9c2924..192973a96ea 100644
--- a/client/src/helpers/filters/filters.json
+++ b/client/src/helpers/filters/filters.json
@@ -54,12 +54,6 @@
             "homepage": "https://github.com/Perflyst/PiHoleBlocklist",
             "source": "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV-AGH.txt"
         },
-        "malwaredomainlist-com-hosts-list": {
-            "name": "MalwareDomainList.com Hosts List",
-            "categoryId": "security",
-            "homepage": "https://www.malwaredomainlist.com/",
-            "source": "https://www.malwaredomainlist.com/hostslist/hosts.txt"
-        },
         "spam404": {
             "name": "Spam404",
             "categoryId": "security",
@@ -76,7 +70,7 @@
             "name": "The Big List of Hacked Malware Web Sites",
             "categoryId": "security",
             "homepage": "https://github.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites",
-            "source": "https://raw.githubusercontent.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites/master/hacked-domains.list"
+            "source": "https://raw.githubusercontent.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites/master/hosts"
         },
         "scam-blocklist-by-durable-napkin": {
             "name": "Scam Blocklist by DurableNapkin",
@@ -84,6 +78,12 @@
             "homepage": "https://github.com/durablenapkin/scamblocklist",
             "source": "https://raw.githubusercontent.com/durablenapkin/scamblocklist/master/adguard.txt"
         },
+        "urlhaus-filter-online": {
+            "name": "Online Malicious URL Blocklist",
+            "categoryId": "security",
+            "homepage": "https://gitlab.com/curben/urlhaus-filter",
+            "source": "https://curben.gitlab.io/malware-filter/urlhaus-filter-agh-online.txt"
+        },
         "NOR-dandelion-sprouts-nordiske-filtre": {
             "name": "NOR: Dandelion Sprouts nordiske filtre",
             "categoryId": "regional",
@@ -144,11 +144,23 @@
             "homepage": "https://anti-ad.net/",
             "source": "https://anti-ad.net/easylist.txt"
         },
-        "BarbBlock": {
+        "IDN-abpindo": {
+            "name": "IDN: ABPindo",
+            "categoryId": "regional",
+            "homepage": "https://github.com/ABPindo/indonesianadblockrules/",
+            "source": "https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt"
+        },
+        "barb-block": {
             "name": "BarbBlock",
             "categoryId": "other",
             "homepage": "https://github.com/paulgb/BarbBlock/",
             "source": "https://paulgb.github.io/BarbBlock/blacklists/hosts-file.txt"
+        },
+        "windows-spy-blocker" : {
+            "name": "WindowsSpyBlocker - Hosts spy rules",
+            "categoryId": "other",
+            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
+            "source": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
         }
     }
 }

From cbceab0f65a84426e123d684d3c671d6533bd4a2 Mon Sep 17 00:00:00 2001
From: Andrey Meshkov <am@adguard.com>
Date: Fri, 5 Feb 2021 00:16:20 +0300
Subject: [PATCH 2/2] Change category for WindowsSpyBlocker to general

---
 client/src/helpers/filters/filters.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/helpers/filters/filters.json b/client/src/helpers/filters/filters.json
index 192973a96ea..6cd61084999 100644
--- a/client/src/helpers/filters/filters.json
+++ b/client/src/helpers/filters/filters.json
@@ -54,6 +54,12 @@
             "homepage": "https://github.com/Perflyst/PiHoleBlocklist",
             "source": "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV-AGH.txt"
         },
+        "windows-spy-blocker" : {
+            "name": "WindowsSpyBlocker - Hosts spy rules",
+            "categoryId": "general",
+            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
+            "source": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
+        },
         "spam404": {
             "name": "Spam404",
             "categoryId": "security",
@@ -155,12 +161,6 @@
             "categoryId": "other",
             "homepage": "https://github.com/paulgb/BarbBlock/",
             "source": "https://paulgb.github.io/BarbBlock/blacklists/hosts-file.txt"
-        },
-        "windows-spy-blocker" : {
-            "name": "WindowsSpyBlocker - Hosts spy rules",
-            "categoryId": "other",
-            "homepage": "https://github.com/crazy-max/WindowsSpyBlocker",
-            "source": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
         }
     }
 }