From c57e80d19845fcfe37d59eaa45536f53f9966c1b Mon Sep 17 00:00:00 2001
From: yan <yan@mit.edu>
Date: Thu, 29 Jun 2017 15:33:31 -0700
Subject: [PATCH] Add license notes for incorporated projects

fix #9767
---
 LICENSE.txt                                   | 25 +++++++++++++++++--
 .../scripts/blockCanvasFingerprinting.js      |  6 +++++
 app/httpsEverywhere.js                        |  7 ++++++
 js/lib/baseDomain.js                          |  2 ++
 js/lib/psl.js                                 | 11 +++++++-
 5 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index a612ad9813b..f39b57d1fdc 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,5 +1,26 @@
-Mozilla Public License Version 2.0
-==================================
+LICENSES FOR INCORPORATED CODEBASES
+===================================
+
+Incorporating code from Privacy Badger Chrome,
+https://github.com/EFForg/privacybadger
+Copyright © 2015 Electronic Frontier Foundation and other contributors
+Licensed GPL v3
+
+Incorporating code from HTTPS Everywhere,
+Copyright © 2010-2017 Electronic Frontier Foundation and others
+Licensed GPL v2+
+
+Incorporating code from Chameleon,
+https://github.com/ghostwords/chameleon
+Copyright © 2015 ghostwords
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
+Alternatively, this code may be distributed or
+otherwise used under the terms of GPL v3
+
+Text of Mozilla Public License Version 2.0
+==========================================
 
 1. Definitions
 --------------
diff --git a/app/extensions/brave/content/scripts/blockCanvasFingerprinting.js b/app/extensions/brave/content/scripts/blockCanvasFingerprinting.js
index 31d2887df83..6d40115bf6b 100644
--- a/app/extensions/brave/content/scripts/blockCanvasFingerprinting.js
+++ b/app/extensions/brave/content/scripts/blockCanvasFingerprinting.js
@@ -2,6 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/**
+ * Some parts of this file are derived from:
+ * Chameleon <https://github.com/ghostwords/chameleon>, Copyright (C) 2015 ghostwords
+ * Privacy Badger Chrome <https://github.com/EFForg/privacybadger>, Copyright (C) 2015 Electronic Frontier Foundation and other contributors
+ */
+
 if (chrome.contentSettings.canvasFingerprinting == 'block') {
   Error.stackTraceLimit = Infinity // collect all frames
 
diff --git a/app/httpsEverywhere.js b/app/httpsEverywhere.js
index 41daacf89eb..e20216b2dc9 100644
--- a/app/httpsEverywhere.js
+++ b/app/httpsEverywhere.js
@@ -1,6 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Some parts of this file are derived from:
+ * HTTPS Everywhere <https://github.com/EFForg/https-everywhere>
+ * Copyright (C) 2010-2017 Electronic Frontier Foundation and others
+ */
+
 'use strict'
 
 const urlParse = require('./common/urlParse')
diff --git a/js/lib/baseDomain.js b/js/lib/baseDomain.js
index d5378518213..44c00f9a075 100644
--- a/js/lib/baseDomain.js
+++ b/js/lib/baseDomain.js
@@ -23,6 +23,8 @@ const checkASCII = function (str) {
 
 /**
  * Returns base domain for specified host based on Public Suffix List.
+ * Derived from Privacy Badger Chrome <https://github.com/EFForg/privacybadger>,
+ * Copyright (C) 2015 Electronic Frontier Foundation and other contributors
  * @param {string} hostname The name of the host to get the base domain for
  */
 
diff --git a/js/lib/psl.js b/js/lib/psl.js
index 595ab6d52b9..8569ce7ee9b 100644
--- a/js/lib/psl.js
+++ b/js/lib/psl.js
@@ -1,3 +1,12 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Derived from Privacy Badger Chrome <https://github.com/EFForg/privacybadger>,
+ * Copyright (C) 2015 Electronic Frontier Foundation and other contributors
+ */
+
 module.exports = {
     "0.bg": 1,
     "0emm.com": 2,
@@ -6567,4 +6576,4 @@ module.exports = {
     "\u9ad8\u77e5.jp": 1,
     "\u9ce5\u53d6.jp": 1,
     "\u9e7f\u5150\u5cf6.jp": 1
-};
\ No newline at end of file
+};