From 6e0bd5016d95849b5ecfd53dab90e8b52ef005a3 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 28 Jun 2018 18:23:59 +0200 Subject: [PATCH 01/13] Added 34 new lists --- data/FilterList.json | 668 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 667 insertions(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 140d25ace..ab671bb15 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7498,5 +7498,671 @@ "submissionUrl": null, "syntaxId": 2, "viewUrl": "https://raw.githubusercontent.com/raghavdua1995/DNSlock-PiHole-whitelist/master/whitelist.list" + }, + { + "id": 396, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://jspenguin2017.github.io/uBlockProtector/", + "issuesUrl": "https://jspenguin2017.github.io/uBlockProtector/issues", + "licenseId": 4, + "name": "Nano filters", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 10, + "viewUrl": "https://cdn.rawgit.com/NanoAdblocker/NanoFilters/master/NanoFilters/NanoBase.txt" + }, + { + "id": 397, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://jspenguin2017.github.io/uBlockProtector/", + "issuesUrl": "https://jspenguin2017.github.io/uBlockProtector/issues", + "licenseId": 4, + "name": "Nano filters - Whitelist", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 10, + "viewUrl": "https://cdn.rawgit.com/NanoAdblocker/NanoFilters/master/NanoFilters/NanoWhitelist.txt" + }, + { + "id": 398, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://jspenguin2017.github.io/uBlockProtector/", + "issuesUrl": "https://jspenguin2017.github.io/uBlockProtector/issues", + "licenseId": 4, + "name": "Nano filters - Annoyance", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 10, + "viewUrl": "https://cdn.rawgit.com/NanoAdblocker/NanoFilters/master/NanoFilters/NanoAnnoyance.txt" + }, + { + "id": 399, + "chatUrl": null, + "description": "A filter for uBlock Origin that aims to remove regional Swedish ads, tracking, annoyances, scams + badware, and unnecessary bloat.", + "descriptionSourceUrl": "https://github.com/lassekongo83/Frellwits-filter-lists#available-lists", + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/lassekongo83/Frellwits-filter-lists", + "issuesUrl": "https://github.com/lassekongo83/Frellwits-filter-lists/issues", + "licenseId": 4, + "name": "Frellwit's Swedish Filter", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/Frellwits-Swedish-Filter.txt" + }, + { + "id": 400, + "chatUrl": null, + "description": "Blocks ads, fake sites, shock sites, malware hosts and trackers. This hostfile's aim is not to break any useful websites.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/notracking/hosts-blocklists", + "issuesUrl": "https://github.com/notracking/hosts-blocklists/issues", + "licenseId": null, + "name": "notracking - Domains", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://raw.githubusercontent.com/notracking/hosts-blocklists/master/domains.txt" + }, + { + "id": 401, + "chatUrl": null, + "description": "Blocks ads, fake sites, shock sites, malware hosts and trackers. This hostfile's aim is not to break any useful websites.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/notracking/hosts-blocklists", + "issuesUrl": "https://github.com/notracking/hosts-blocklists/issues", + "licenseId": null, + "name": "notracking - Hostnames", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/notracking/hosts-blocklists/master/hostnames.txt" + }, + { + "id": 402, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": "2015-11-18", + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://startshop.no/", + "issuesUrl": null, + "licenseId": null, + "name": "Startshop ABP Filters", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://startshop.no/filter/abp" + }, + { + "id": 403, + "chatUrl": null, + "description": "This filter aims to remove emoji realted scripts, stylesheets, fonts, and images.", + "descriptionSourceUrl": "https://github.com/lassekongo83/Frellwits-filter-lists#available-lists", + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/lassekongo83/Frellwits-filter-lists", + "issuesUrl": "https://github.com/lassekongo83/Frellwits-filter-lists/issues", + "licenseId": 4, + "name": "I Don't Care About Emojis", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/emoji-filter.txt" + }, + { + "id": 404, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/uBlockOrigin/uAssets", + "issuesUrl": "https://github.com/uBlockOrigin/uAssets/issues", + "licenseId": 4, + "name": "uBlock filters", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt" + }, + { + "id": 405, + "chatUrl": null, + "description": "Filters optimized for uBlock Origin, to be used with Fanboy's and/or Adguard's 'Annoyances' list(s)", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/uBlockOrigin/uAssets", + "issuesUrl": "https://github.com/uBlockOrigin/uAssets/issues", + "licenseId": 4, + "name": "uBlock filters - Annoyances", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/annoyances.txt" + }, + { + "id": 406, + "chatUrl": null, + "description": "For sites documented to put users at risk of installing adware/crapware etc. The purpose is to at least ensure a user is warned of the risks ahead.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/uBlockOrigin/uAssets", + "issuesUrl": "https://github.com/uBlockOrigin/uAssets/issues", + "licenseId": 4, + "name": "uBlock filters - Badware", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt" + }, + { + "id": 407, + "chatUrl": null, + "description": "These filters are experimental and may cause breakage. They are being evaluated/fine-tuned for inclusion in the default set of filters.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/uBlockOrigin/uAssets", + "issuesUrl": "https://github.com/uBlockOrigin/uAssets/issues", + "licenseId": 4, + "name": "uBlock filters - Experimental", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/experimental.txt" + }, + { + "id": 408, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/uBlockOrigin/uAssets", + "issuesUrl": "https://github.com/uBlockOrigin/uAssets/issues", + "licenseId": 4, + "name": "uBlock filters - Privacy", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt" + }, + { + "id": 409, + "chatUrl": null, + "description": "Needed to unbreak web sites, broken by uBO default filter lists.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/uBlockOrigin/uAssets", + "issuesUrl": "https://github.com/uBlockOrigin/uAssets/issues", + "licenseId": 4, + "name": "uBlock filters - Unbreak", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/unbreak.txt" + }, + { + "id": 410, + "chatUrl": null, + "description": "To foil sites potentially abusing CPU/bandwidth resources without informed consent. Any such resource-abuse scripts MUST be opt-in, with complete informed consent from the visitor.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/uBlockOrigin/uAssets", + "issuesUrl": "https://github.com/uBlockOrigin/uAssets/issues", + "licenseId": 4, + "name": "uBlock filters - Resource abuse", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt" + }, + { + "id": 411, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": "", + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://gist.github.com/BBcan177", + "issuesUrl": "(Insert an ID for Apache 2.0 here.)", + "licenseId": null, + "name": "pfBlockerNG - Blacklist Configuration", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://gist.githubusercontent.com/BBcan177/b91d3c25667d326411b6fc4eb5c1f080/raw/7e23b07148adf030262f056870373c8f1ac2056c/squidblacklist_global_usage" + }, + { + "id": 412, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://gist.github.com/BBcan177", + "issuesUrl": null, + "licenseId": null, + "name": "pfBlockerNG - MS-3", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://gist.githubusercontent.com/BBcan177/d7105c242f17f4498f81/raw/201968fa11b1f409d408a129a0774ffedb1560e2/MS-3" + }, + { + "id": 413, + "chatUrl": null, + "description": "The following is the list of sites from Alexa top 1 million which embed scripts that extract email addresses from the browsers' built-in login (password) managers.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://gist.github.com/BBcan177", + "issuesUrl": null, + "licenseId": null, + "name": "pfBlockerNG - MS-4", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://gist.githubusercontent.com/BBcan177/b6df57cef74e28d90acf1eec93d62d3b/raw/f0996cf5248657ada2adb396f3636be8716b99eb/MS-4 +" + }, + { + "id": 414, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://gist.github.com/BBcan177", + "issuesUrl": null, + "licenseId": null, + "name": "pfBlockerNG - MS-2", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://gist.githubusercontent.com/BBcan177/4a8bf37c131be4803cb2/raw/343ff780e15205b4dd0de37c86af34cfb26b2fbe/MS-2" + }, + { + "id": 415, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://gist.github.com/BBcan177", + "issuesUrl": null, + "licenseId": null, + "name": "pfBlockerNG - MS-1", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://gist.githubusercontent.com/BBcan177/bf29d47ea04391cb3eb0/raw/7290e0681bcd07415420b5c80a253652fd13f840/MS-1" + }, + { + "id": 416, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://gist.github.com/BBcan177", + "issuesUrl": null, + "licenseId": null, + "name": "EasyList DE Domains", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://gist.githubusercontent.com/BBcan177/2a9fc2548c3c5a5e2dc86e580b5795d2/raw/2f5c90ffb3bd02199ace1b16a0bd9f53b29f0879/EasyList_DE" + }, + { + "id": 417, + "chatUrl": null, + "description": "This is a community-contributed list of referrer spammers maintained by Matomo, the leading open source web analytics platform.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/matomo-org/referrer-spam-blacklist", + "issuesUrl": "https://github.com/matomo-org/referrer-spam-blacklist/issues", + "licenseId": "(Insert ID for Public Domain here.)", + "name": "Referrer Spam Blacklist (Matomo)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt" + }, + { + "id": 418, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": "https://github.com/desbma/referer-spam-domains-blacklist#referer-spam-blacklist", + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/desbma/referer-spam-domains-blacklist", + "issuesUrl": "https://github.com/desbma/referer-spam-domains-blacklist/issues", + "licenseId": 14, + "name": "Referer Spam Blacklist (desbma)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://raw.githubusercontent.com/desbma/referer-spam-domains-blacklist/master/spammers.txt" + }, + { + "id": 419, + "chatUrl": null, + "description": "Spammers get paid by businesses whose websites they advertise. We refuse to accept spam from any of following domains or advertising any of these domains, as we don't want to buy from spammers. We publish this list for informational purposes only.", + "descriptionSourceUrl": "https://www.joewein.net/spam/blacklist.htm", + "discontinuedDate": null, + "donateUrl": "https://www.joewein.net/spam/blacklist.htm", + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://www.joewein.net/spam/index.htm", + "issuesUrl": null, + "licenseId": null, + "name": "JoeWein Domain Blacklist Base", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://www.joewein.net/dl/bl/dom-bl-base.txt" + }, + { + "id": 420, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": "https://www.joewein.net/spam/blacklist.htm", + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://www.joewein.net/spam/index.htm", + "issuesUrl": null, + "licenseId": null, + "name": "JoeWein Email Sender Blacklist", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://www.joewein.net/dl/bl/from-bl.txt" + }, + { + "id": 421, + "chatUrl": null, + "description": "A host file generated from updated phishing site feeds.", + "descriptionSourceUrl": "https://gitlab.com/Kurobeats/phishing_hosts#phishing-site-hosts-generator", + "discontinuedDate": null, + "donateUrl": "https://kurobeats.xyz/", + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://gitlab.com/Kurobeats/phishing_hosts", + "issuesUrl": "https://gitlab.com/Kurobeats/phishing_hosts/issues", + "licenseId": "(Insert ID for GPLv2 here)", + "name": "Phishing Hosts", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://gitlab.com/Kurobeats/phishing_hosts/raw/master/hosts" + }, + { + "id": 422, + "chatUrl": null, + "description": "List of shit websites for Google Personal Blocklist or Google Hit Hider by Domain", + "descriptionSourceUrl": "https://github.com/ligyxy/Blocklist#blocklist", + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/ligyxy/Blocklist", + "issuesUrl": "https://github.com/ligyxy/Blocklist/issues", + "licenseId": 2, + "name": "Blocklist (ligyxy)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://github.com/ligyxy/Blocklist/blob/master/BLOCKLIST" + }, + { + "id": 423, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": "https://www.malekal.com/dons-pour-malekal-com/", + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://www.malekal.com", + "issuesUrl": null, + "licenseId": null, + "name": "Malekal's Hosts", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://www.malekal.com/HOSTS_filtre/HOSTS.txt" + }, + { + "id": 424, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://gist.github.com/MOxFIVE", + "issuesUrl": null, + "licenseId": null, + "name": "Personal Blocklist (MOxFIVE)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://gist.githubusercontent.com/MOxFIVE/4730cac715ef406bd8eac7b29335be4a/raw/d21fa08e97963edde372d0d3e50703c783c9c32e/Personal%2520Blocklist.txt" + }, + { + "id": 425, + "chatUrl": null, + "description": "Self-updating PHP library which blocks hundreds of spammy domains from ruining your website statistics", + "descriptionSourceUrl": "https://github.com/nabble/semalt-blocker#self-updating-php-library-which-blocks-hundreds-of-spammy-domains-from-ruining-your-website-statistics", + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/nabble/semalt-blocker", + "issuesUrl": "https://github.com/nabble/semalt-blocker/issues", + "licenseId": 2, + "name": "Semalt Blocked Domains", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://raw.githubusercontent.com/nabble/semalt-blocker/master/domains/blocked" + }, + { + "id": 426, + "chatUrl": null, + "description": "Master Feed of known, active and non-sinkholed C&Cs IP addresses", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YMFSMT9MW2Y6Q", + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://osint.bambenekconsulting.com/feeds/", + "issuesUrl": null, + "licenseId": "https://osint.bambenekconsulting.com/license.txt", + "name": "OSINT C2 IP Feed", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://osint.bambenekconsulting.com/feeds/c2-ipmasterlist.txt" + }, + { + "id": 427, + "chatUrl": null, + "description": "The phishing bad sites is updated using data from www.phishtank.com once per day. The domains included are known to be fraudulent and generally dangerous.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "http://phishing.mailscanner.info/", + "issuesUrl": null, + "licenseId": null, + "name": "Phishing Bad Sites", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "http://phishing.mailscanner.info/phishing.bad.sites.conf" + }, + { + "id": 428, + "chatUrl": null, + "description": null, + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://www.threatcrowd.org/", + "issuesUrl": null, + "licenseId": null, + "name": "ThreatCrowd Domains", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 2, + "viewUrl": "https://www.threatcrowd.org/feeds/domains.txt" + }, + { + "id": 429, + "chatUrl": null, + "description": "International List consists mostly of static cosmetic filters. English and few German websites are included. As regards tracking filters, they have been partly copied from other privacy filter lists.", + "descriptionSourceUrl": "https://github.com/betterwebleon/international-list#international-list", + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/betterwebleon/international-list", + "issuesUrl": "https://github.com/betterwebleon/international-list/issues", + "licenseId": 11, + "name": "International List", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/betterwebleon/international-list/master/filters.txt" + }, + { + "id": 430, + "chatUrl": null, + "description": "", + "descriptionSourceUrl": "", + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "", + "issuesUrl": "", + "licenseId": null, + "name": "", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": , + "viewUrl": "" } -] \ No newline at end of file +] From 1c900847dd831a7eab13833926248d747ba8609b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 28 Jun 2018 18:27:20 +0200 Subject: [PATCH 02/13] Added a 35th new list --- data/FilterList.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index ab671bb15..d8ae8a2a3 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8149,20 +8149,20 @@ { "id": 430, "chatUrl": null, - "description": "", - "descriptionSourceUrl": "", + "description": "Blocks rogue websites and some ads on Norwegian sites. Intended for use only with hosts-specific tools; users of uBlock Origin and Nano Adblocker should preferably use the regular version of this list instead.", + "descriptionSourceUrl": null, "discontinuedDate": null, - "donateUrl": null, - "emailAddress": null, + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", + "emailAddress": "imreeil42@gmail.com", "forumUrl": null, - "homeUrl": "", - "issuesUrl": "", - "licenseId": null, - "name": "", + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Dandelion Sprout's Norwegian Filters for Tidier Websites (Hosts version)", "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": , - "viewUrl": "" - } + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/AdawayHosts" + }, ] From b86b368b0f520b1f21b53481281ca72b6006e3a5 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 28 Jun 2018 18:27:45 +0200 Subject: [PATCH 03/13] Removed erreneous last comma --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index d8ae8a2a3..9003dc3e7 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8164,5 +8164,5 @@ "submissionUrl": null, "syntaxId": 1, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/AdawayHosts" - }, + } ] From dbfb35a7568d6b66826f6cb9c80f219bad1129f1 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 28 Jun 2018 18:32:32 +0200 Subject: [PATCH 04/13] Added three new licences I am not completely sure about the permissiveness of Apache, I must admit. --- data/License.json | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/data/License.json b/data/License.json index 4cc7026d0..c5948c8b2 100644 --- a/data/License.json +++ b/data/License.json @@ -117,5 +117,26 @@ "name": "ISC", "permissiveAdaptation": true, "permissiveCommercial": true + }, + { + "id": 18, + "descriptionUrl": "https://www.apache.org/licenses/LICENSE-2.0", + "name": "Apache 2.0", + "permissiveAdaptation": true, + "permissiveCommercial": true + }, + { + "id": 19, + "descriptionUrl": "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html", + "name": "GPLv2", + "permissiveAdaptation": true, + "permissiveCommercial": true + }, + { + "id": 20, + "descriptionUrl": null, + "name": "Public Domain", + "permissiveAdaptation": true, + "permissiveCommercial": true } -] \ No newline at end of file +] From f692dfe5f7f53625156ba523e7fd935c2a8dabda Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 28 Jun 2018 18:33:32 +0200 Subject: [PATCH 05/13] Added the new ID licences to 3 lists --- data/FilterList.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 9003dc3e7..d7a64a260 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7794,7 +7794,7 @@ "emailAddress": null, "forumUrl": null, "homeUrl": "https://gist.github.com/BBcan177", - "issuesUrl": "(Insert an ID for Apache 2.0 here.)", + "issuesUrl": 18, "licenseId": null, "name": "pfBlockerNG - Blacklist Configuration", "policyUrl": null, @@ -7839,8 +7839,7 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 2, - "viewUrl": "https://gist.githubusercontent.com/BBcan177/b6df57cef74e28d90acf1eec93d62d3b/raw/f0996cf5248657ada2adb396f3636be8716b99eb/MS-4 -" + "viewUrl": "https://gist.githubusercontent.com/BBcan177/b6df57cef74e28d90acf1eec93d62d3b/raw/f0996cf5248657ada2adb396f3636be8716b99eb/MS-4" }, { "id": 414, @@ -7910,7 +7909,7 @@ "forumUrl": null, "homeUrl": "https://github.com/matomo-org/referrer-spam-blacklist", "issuesUrl": "https://github.com/matomo-org/referrer-spam-blacklist/issues", - "licenseId": "(Insert ID for Public Domain here.)", + "licenseId": "20", "name": "Referrer Spam Blacklist (Matomo)", "policyUrl": null, "publishedDate": null, @@ -7986,7 +7985,7 @@ "forumUrl": null, "homeUrl": "https://gitlab.com/Kurobeats/phishing_hosts", "issuesUrl": "https://gitlab.com/Kurobeats/phishing_hosts/issues", - "licenseId": "(Insert ID for GPLv2 here)", + "licenseId": 19, "name": "Phishing Hosts", "policyUrl": null, "publishedDate": null, From 90dd6afcc548461c2ee82754121d46261c42e9ee Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 28 Jun 2018 18:49:40 +0200 Subject: [PATCH 06/13] Added 6 new multi-list makers --- data/Maintainer.json | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/data/Maintainer.json b/data/Maintainer.json index 936a1755a..26c4892c0 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -425,5 +425,47 @@ "homeUrl": "https://github.com/raghavdua1995", "name": "Raghav Dua", "twitterHandle": null + }, + { + "id": 63, + "emailAddress": null, + "homeUrl": "https://jspenguin2017.github.io/uBlockProtector/", + "name": "Jspenguin2017", + "twitterHandle": null + }, + { + "id": 64, + "emailAddress": null, + "homeUrl": null, + "name": "Frellwit", + "twitterHandle": null + }, + { + "id": 65, + "emailAddress": null, + "homeUrl": "https://github.com/uBlockOrigin/uAssets", + "name": "uBlock Origin", + "twitterHandle": null + }, + { + "id": 66, + "emailAddress": null, + "homeUrl": "https://gist.github.com/BBcan177", + "name": "BBcan177", + "twitterHandle": null + }, + { + "id": 67, + "emailAddress": "joewein@pobox.com", + "homeUrl": "https://www.joewein.net/spam/index.htm", + "name": "Joe Wein", + "twitterHandle": null + }, + { + "id": 68, + "emailAddress": null, + "homeUrl": "https://github.com/betterwebleon/", + "name": "betterwebleon", + "twitterHandle": null } -] \ No newline at end of file +] From 9394876a92a75bfa06a2d8086801cc1fdadd36ae Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 28 Jun 2018 19:02:52 +0200 Subject: [PATCH 07/13] Added IDs for the new lists --- data/FilterListMaintainer.json | 102 ++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 476d1fddf..67a33f347 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -618,5 +618,105 @@ { "filterListId": 395, "maintainerId": 62 + }, + { + "filterListId": 396, + "maintainerId": 63 + }, + { + "filterListId": 397, + "maintainerId": 63 + }, + { + "filterListId": 398, + "maintainerId": 63 + }, + { + "filterListId": 399, + "maintainerId": 64 + }, + { + "filterListId": 403, + "maintainerId": 64 + }, + { + "filterListId": 400, + "maintainerId": 69 + }, + { + "filterListId": 401, + "maintainerId": 69 + }, + { + "filterListId": 404, + "maintainerId": 65 + }, + { + "filterListId": 405, + "maintainerId": 65 + }, + { + "filterListId": 406, + "maintainerId": 65 + }, + { + "filterListId": 407, + "maintainerId": 65 + }, + { + "filterListId": 408, + "maintainerId": 65 + }, + { + "filterListId": 409, + "maintainerId": 65 + }, + { + "filterListId": 410, + "maintainerId": 65 + }, + { + "filterListId": 411, + "maintainerId": 66 + }, + { + "filterListId": 412, + "maintainerId": 66 + }, + { + "filterListId": 413, + "maintainerId": 66 + }, + { + "filterListId": 414, + "maintainerId": 66 + }, + { + "filterListId": 415, + "maintainerId": 66 + }, + { + "filterListId": 416, + "maintainerId": 66 + }, + { + "filterListId": 419, + "maintainerId": 67 + }, + { + "filterListId": 420, + "maintainerId": 67 + }, + { + "filterListId": 136, + "maintainerId": 68 + }, + { + "filterListId": 429, + "maintainerId": 68 + }, + { + "filterListId": 430, + "maintainerId": 22 } -] \ No newline at end of file +] From 25ba1ce22e6f0f060852f61f0fb43c89e7bd0d36 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 28 Jun 2018 19:04:02 +0200 Subject: [PATCH 08/13] Added an ID that I had forgot --- data/Maintainer.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/Maintainer.json b/data/Maintainer.json index 26c4892c0..f4d7b7e82 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -467,5 +467,12 @@ "homeUrl": "https://github.com/betterwebleon/", "name": "betterwebleon", "twitterHandle": null + }, + { + "id": 69, + "emailAddress": null, + "homeUrl": "https://github.com/notracking", + "name": "notracking", + "twitterHandle": null } ] From 05455582691fc71363b1700cd70deebe87d08155 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 28 Jun 2018 19:09:12 +0200 Subject: [PATCH 09/13] Assigned language tags to the new lists --- data/FilterListLanguage.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index be117634f..ec5a9cf30 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -630,5 +630,25 @@ { "filterListID": 390, "languageId": 11 + }, + { + "filterListID": 399, + "languageId": 83 + }, + { + "filterListID": 402, + "languageId": 44 + }, + { + "filterListID": 422, + "languageId": 110, 99 + }, + { + "filterListID": 429, + "languageId": 110, 167 + }, + { + "filterListID": 430, + "languageId": 44 } -] \ No newline at end of file +] From c3858a2fffacdada922e615ba60b79167f27932e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 28 Jun 2018 19:10:28 +0200 Subject: [PATCH 10/13] Had initially misunderstood the intended syntax --- data/FilterListLanguage.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index ec5a9cf30..de6572799 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -641,11 +641,19 @@ }, { "filterListID": 422, - "languageId": 110, 99 + "languageId": 110 + }, + { + "filterListID": 422, + "languageId": 99 }, { "filterListID": 429, - "languageId": 110, 167 + "languageId": 110 + }, + { + "filterListID": 429, + "languageId": 167 }, { "filterListID": 430, From 611676dd1cc35347ccc15d110010f87f157acdba Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 30 Jun 2018 03:27:44 +0200 Subject: [PATCH 11/13] Had goofed up some syntax IDs slightly, part 1 --- data/FilterList.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index d7a64a260..efec1d06c 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7515,7 +7515,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 10, + "syntaxId": 12, "viewUrl": "https://cdn.rawgit.com/NanoAdblocker/NanoFilters/master/NanoFilters/NanoBase.txt" }, { @@ -7534,7 +7534,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 10, + "syntaxId": 12, "viewUrl": "https://cdn.rawgit.com/NanoAdblocker/NanoFilters/master/NanoFilters/NanoWhitelist.txt" }, { @@ -7553,7 +7553,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 10, + "syntaxId": 12, "viewUrl": "https://cdn.rawgit.com/NanoAdblocker/NanoFilters/master/NanoFilters/NanoAnnoyance.txt" }, { From 630cd051fa0b875db47f03f74d22f451adb6773e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 30 Jun 2018 03:30:12 +0200 Subject: [PATCH 12/13] Had goofed up some syntax IDs slightly, part 2 --- data/Syntax.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/Syntax.json b/data/Syntax.json index 35ddbb4ed..17b3c1437 100644 --- a/data/Syntax.json +++ b/data/Syntax.json @@ -48,5 +48,10 @@ "id": 11, "definitionUrl": null, "name": "JavaScript (Non-Safari)" + }, + { + "id": 12, + "definitionUrl": "https://github.com/NanoAdblocker/NanoCore/tree/master/notes", + "name": "Nano Adblocker Static" } -] \ No newline at end of file +] From e340486bee19ec6a64949b8a03eff4219e4a1b32 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 30 Jun 2018 03:34:53 +0200 Subject: [PATCH 13/13] Corrected two license ID numbers --- data/FilterList.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index efec1d06c..3a097e28c 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7794,8 +7794,8 @@ "emailAddress": null, "forumUrl": null, "homeUrl": "https://gist.github.com/BBcan177", - "issuesUrl": 18, - "licenseId": null, + "issuesUrl": null, + "licenseId": 18, "name": "pfBlockerNG - Blacklist Configuration", "policyUrl": null, "publishedDate": null, @@ -7909,7 +7909,7 @@ "forumUrl": null, "homeUrl": "https://github.com/matomo-org/referrer-spam-blacklist", "issuesUrl": "https://github.com/matomo-org/referrer-spam-blacklist/issues", - "licenseId": "20", + "licenseId": 20, "name": "Referrer Spam Blacklist (Matomo)", "policyUrl": null, "publishedDate": null,