From 1f1590fa1cc25bcaecca81122b35358a6901af4c Mon Sep 17 00:00:00 2001
From: collinbarrett <collinbarrett@users.noreply.github.com>
Date: Thu, 30 Aug 2018 12:59:32 -0500
Subject: [PATCH] add add'l DShield lists

ref #403
---
 data/FilterList.json           | 61 ++++++++++++++++++++++++++++++++--
 data/FilterListMaintainer.json | 16 +++++++++
 data/License.json              |  7 ++++
 data/Maintainer.json           |  7 ++++
 4 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/data/FilterList.json b/data/FilterList.json
index dbdd411e0..613e20bb6 100644
--- a/data/FilterList.json
+++ b/data/FilterList.json
@@ -5708,9 +5708,9 @@
     "donateUrl": null,
     "emailAddress": "info@dshield.org",
     "forumUrl": null,
-    "homeUrl": "https://www.dshield.org/xml.html",
+    "homeUrl": "https://dshield.org/suspicious_domains.html",
     "issuesUrl": null,
-    "licenseId": 5,
+    "licenseId": 25,
     "name": "DShield.org Recommended Block List",
     "policyUrl": null,
     "publishedDate": null,
@@ -9631,5 +9631,62 @@
     "submissionUrl": null,
     "syntaxId": 3,
     "viewUrl": "https://ssl.bblck.me/blacklists/adblock-plus.txt"
+  },
+  {
+    "id": 518,
+    "chatUrl": null,
+    "description": "This list consists of Low Level Sensitivity website URLs",
+    "descriptionSourceUrl": "https://www.dshield.org/feeds/suspiciousdomains_Low.txt",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": "info@dshield.org",
+    "forumUrl": null,
+    "homeUrl": "https://dshield.org/suspicious_domains.html",
+    "issuesUrl": null,
+    "licenseId": 25,
+    "name": "DShield.org Suspicious Domain List - Low",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": null,
+    "syntaxId": 2,
+    "viewUrl": "https://www.dshield.org/feeds/suspiciousdomains_Low.txt"
+  },
+  {
+    "id": 519,
+    "chatUrl": null,
+    "description": "This list consists of Medium Level Sensitivity website URLs",
+    "descriptionSourceUrl": "https://www.dshield.org/feeds/suspiciousdomains_Medium.txt",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": "info@dshield.org",
+    "forumUrl": null,
+    "homeUrl": "https://dshield.org/suspicious_domains.html",
+    "issuesUrl": null,
+    "licenseId": 25,
+    "name": "DShield.org Suspicious Domain List - Medium",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": null,
+    "syntaxId": 2,
+    "viewUrl": "https://www.dshield.org/feeds/suspiciousdomains_Medium.txt"
+  },
+  {
+    "id": 520,
+    "chatUrl": null,
+    "description": "This list consists of High Level Sensitivity website URLs",
+    "descriptionSourceUrl": "https://www.dshield.org/feeds/suspiciousdomains_High.txt",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": "info@dshield.org",
+    "forumUrl": null,
+    "homeUrl": "https://dshield.org/suspicious_domains.html",
+    "issuesUrl": null,
+    "licenseId": 25,
+    "name": "DShield.org Suspicious Domain List - High",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": null,
+    "syntaxId": 2,
+    "viewUrl": "https://www.dshield.org/feeds/suspiciousdomains_High.txt"
   }
 ]
\ No newline at end of file
diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json
index ef3deeb1d..5b1061c3c 100644
--- a/data/FilterListMaintainer.json
+++ b/data/FilterListMaintainer.json
@@ -782,5 +782,21 @@
   {
     "filterListId": 517,
     "maintainerId": 78
+  },
+  {
+    "filterListId": 302,
+    "maintainerId": 79
+  },
+  {
+    "filterListId": 518,
+    "maintainerId": 79
+  },
+  {
+    "filterListId": 519,
+    "maintainerId": 79
+  },
+  {
+    "filterListId": 520,
+    "maintainerId": 79
   }
 ]
\ No newline at end of file
diff --git a/data/License.json b/data/License.json
index aac4c522c..bb5777166 100644
--- a/data/License.json
+++ b/data/License.json
@@ -166,5 +166,12 @@
     "name": "CC BY 4.0",
     "permissiveAdaptation": true,
     "permissiveCommercial": true
+  },
+  {
+    "id": 25,
+    "descriptionUrl": "https://creativecommons.org/licenses/by-nc-sa/2.5/",
+    "name": "CC BY-NC-SA 2.5",
+    "permissiveAdaptation": true,
+    "permissiveCommercial": false
   }
 ]
\ No newline at end of file
diff --git a/data/Maintainer.json b/data/Maintainer.json
index 0f0173eb2..c515b76a8 100644
--- a/data/Maintainer.json
+++ b/data/Maintainer.json
@@ -530,5 +530,12 @@
     "homeUrl": "http://paulbutler.org",
     "name": "Paul Butler",
     "twitterHandle": null
+  },
+  {
+    "id": 79,
+    "emailAddress": "info@dshield.org",
+    "homeUrl": "https://dshield.org/",
+    "name": "DShield",
+    "twitterHandle": null
   }
 ]
\ No newline at end of file