From 5bf90e4e5bbc4d388be6fe86397749ed56df8043 Mon Sep 17 00:00:00 2001 From: Collin Barrett Date: Sat, 30 Jun 2018 15:03:07 -0500 Subject: [PATCH] cleanup for #304 --- data/FilterList.json | 30 +++++++++++++++--------------- data/License.json | 9 ++++++++- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 6584ac2fa..e86c0d9d7 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7586,7 +7586,7 @@ "forumUrl": null, "homeUrl": "https://github.com/notracking/hosts-blocklists", "issuesUrl": "https://github.com/notracking/hosts-blocklists/issues", - "licenseId": null, + "licenseId": "5", "name": "notracking - Domains", "policyUrl": null, "publishedDate": null, @@ -7605,7 +7605,7 @@ "forumUrl": null, "homeUrl": "https://github.com/notracking/hosts-blocklists", "issuesUrl": "https://github.com/notracking/hosts-blocklists/issues", - "licenseId": null, + "licenseId": "5", "name": "notracking - Hostnames", "policyUrl": null, "publishedDate": null, @@ -7624,7 +7624,7 @@ "forumUrl": null, "homeUrl": "https://startshop.no/", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "Startshop ABP Filters", "policyUrl": null, "publishedDate": null, @@ -7814,7 +7814,7 @@ "forumUrl": null, "homeUrl": "https://gist.github.com/BBcan177", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "pfBlockerNG - MS-3", "policyUrl": null, "publishedDate": null, @@ -7833,7 +7833,7 @@ "forumUrl": null, "homeUrl": "https://gist.github.com/BBcan177", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "pfBlockerNG - MS-4", "policyUrl": null, "publishedDate": null, @@ -7852,7 +7852,7 @@ "forumUrl": null, "homeUrl": "https://gist.github.com/BBcan177", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "pfBlockerNG - MS-2", "policyUrl": null, "publishedDate": null, @@ -7871,7 +7871,7 @@ "forumUrl": null, "homeUrl": "https://gist.github.com/BBcan177", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "pfBlockerNG - MS-1", "policyUrl": null, "publishedDate": null, @@ -7890,7 +7890,7 @@ "forumUrl": null, "homeUrl": "https://gist.github.com/BBcan177", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "EasyList DE Domains", "policyUrl": null, "publishedDate": null, @@ -7947,7 +7947,7 @@ "forumUrl": null, "homeUrl": "https://www.joewein.net/spam/index.htm", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "JoeWein Domain Blacklist Base", "policyUrl": null, "publishedDate": null, @@ -7966,7 +7966,7 @@ "forumUrl": null, "homeUrl": "https://www.joewein.net/spam/index.htm", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "JoeWein Email Sender Blacklist", "policyUrl": null, "publishedDate": null, @@ -8023,7 +8023,7 @@ "forumUrl": null, "homeUrl": "https://www.malekal.com", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "Malekal's Hosts", "policyUrl": null, "publishedDate": null, @@ -8042,7 +8042,7 @@ "forumUrl": null, "homeUrl": "https://gist.github.com/MOxFIVE", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "Personal Blocklist (MOxFIVE)", "policyUrl": null, "publishedDate": null, @@ -8080,7 +8080,7 @@ "forumUrl": null, "homeUrl": "https://osint.bambenekconsulting.com/feeds/", "issuesUrl": null, - "licenseId": "https://osint.bambenekconsulting.com/license.txt", + "licenseId": "21", "name": "OSINT C2 IP Feed", "policyUrl": null, "publishedDate": null, @@ -8099,7 +8099,7 @@ "forumUrl": null, "homeUrl": "http://phishing.mailscanner.info/", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "Phishing Bad Sites", "policyUrl": null, "publishedDate": null, @@ -8118,7 +8118,7 @@ "forumUrl": null, "homeUrl": "https://www.threatcrowd.org/", "issuesUrl": null, - "licenseId": null, + "licenseId": "5", "name": "ThreatCrowd Domains", "policyUrl": null, "publishedDate": null, diff --git a/data/License.json b/data/License.json index c5948c8b2..98b41d2a0 100644 --- a/data/License.json +++ b/data/License.json @@ -138,5 +138,12 @@ "name": "Public Domain", "permissiveAdaptation": true, "permissiveCommercial": true + }, + { + "id": 21, + "descriptionUrl": "https://osint.bambenekconsulting.com/license.txt", + "name": "OSINT", + "permissiveAdaptation": true, + "permissiveCommercial": true } -] +] \ No newline at end of file