From 6714eb73de6cf8b91f56a5fae1499c1bfdc37136 Mon Sep 17 00:00:00 2001
From: Collin Barrett <collinbarrett@users.noreply.github.com>
Date: Wed, 21 Feb 2018 18:30:04 -0600
Subject: [PATCH] add free Squid Blacklist lists

closes #163
---
 data/FilterList.json           | 54 ++++++++++++++++++++++++++++++++++
 data/FilterListMaintainer.json | 12 ++++++++
 data/License.json              |  7 +++++
 data/Maintainer.json           |  7 +++++
 4 files changed, 80 insertions(+)

diff --git a/data/FilterList.json b/data/FilterList.json
index 6a65caf7b..59e0e768b 100644
--- a/data/FilterList.json
+++ b/data/FilterList.json
@@ -6532,5 +6532,59 @@
     "submissionUrl": null,
     "syntaxId": 9,
     "viewUrl": "https://raw.githubusercontent.com/ZeroDot1/CoinBlockerLists/master/MiningServerIPList.txt"
+  },
+  {
+    "id": 364,
+    "description": "Advertisements and tracking",
+    "descriptionSourceUrl": "https://www.squidblacklist.org/downloads.html",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": "webmaster@squidblacklist.org",
+    "forumUrl": null,
+    "homeUrl": "https://www.squidblacklist.org/",
+    "issuesUrl": null,
+    "licenseId": 15,
+    "name": "Squid Blacklist Ad Servers and Trackers",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": "http://www.squidblacklist.org/php/url_submission_form.php",
+    "syntaxId": 2,
+    "viewUrl": "https://www.squidblacklist.org/downloads/dg-ads.acl"
+  },
+  {
+    "id": 365,
+    "description": "Official Facebook domains",
+    "descriptionSourceUrl": "https://www.squidblacklist.org/downloads.html",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": "webmaster@squidblacklist.org",
+    "forumUrl": null,
+    "homeUrl": "https://www.squidblacklist.org/",
+    "issuesUrl": null,
+    "licenseId": 15,
+    "name": "Squid Blacklist Facebook",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": "http://www.squidblacklist.org/php/url_submission_form.php",
+    "syntaxId": 2,
+    "viewUrl": "https://www.squidblacklist.org/downloads/dg-facebook.acl"
+  },
+  {
+    "id": 366,
+    "description": "Malicious, hijacked, ransomware, dangerous websites",
+    "descriptionSourceUrl": "https://www.squidblacklist.org/downloads.html",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": "webmaster@squidblacklist.org",
+    "forumUrl": null,
+    "homeUrl": "https://www.squidblacklist.org/",
+    "issuesUrl": null,
+    "licenseId": 15,
+    "name": "Squid Blacklist Malicious",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": "http://www.squidblacklist.org/php/url_submission_form.php",
+    "syntaxId": 2,
+    "viewUrl": "https://www.squidblacklist.org/downloads/dg-malicious.acl"
   }
 ]
\ No newline at end of file
diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json
index df16e7fd6..54f74cf38 100644
--- a/data/FilterListMaintainer.json
+++ b/data/FilterListMaintainer.json
@@ -494,5 +494,17 @@
   {
     "filterListId": 363,
     "maintainerId": 49
+  },
+  {
+    "filterListId": 364,
+    "maintainerId": 50
+  },
+  {
+    "filterListId": 365,
+    "maintainerId": 50
+  },
+  {
+    "filterListId": 366,
+    "maintainerId": 50
   }
 ]
\ No newline at end of file
diff --git a/data/License.json b/data/License.json
index 2a4bae905..7d1566b7e 100644
--- a/data/License.json
+++ b/data/License.json
@@ -96,5 +96,12 @@
     "name": "Do What The Fuck You Want To Public License (WTFPL)",
     "permissiveAdaptation": true,
     "permissiveCommercial": true
+  },
+  {
+    "id": 15,
+    "descriptionUrl": "https://creativecommons.org/licenses/by-nd/4.0/",
+    "name": "CC BY-ND 4.0",
+    "permissiveAdaptation": false,
+    "permissiveCommercial": true
   }
 ]
\ No newline at end of file
diff --git a/data/Maintainer.json b/data/Maintainer.json
index bafdd21a0..c8bfaba50 100644
--- a/data/Maintainer.json
+++ b/data/Maintainer.json
@@ -334,5 +334,12 @@
     "homeUrl": "https://github.com/ZeroDot1",
     "name": "ZeroDot1",
     "twitterHandle": "hobbygrafix"
+  },
+  {
+    "id": 50,
+    "emailAddress": "webmaster@squidblacklist.org",
+    "homeUrl": "https://www.squidblacklist.org/",
+    "name": "Squid Blacklist",
+    "twitterHandle": null
   }
 ]
\ No newline at end of file