Skip to content

Commit

Permalink
Add license notes for incorporated projects
Browse files Browse the repository at this point in the history
  • Loading branch information
diracdeltas committed Jun 29, 2017
1 parent 4147821 commit c57e80d
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 3 deletions.
25 changes: 23 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -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
--------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 7 additions & 0 deletions app/httpsEverywhere.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 2 additions & 0 deletions js/lib/baseDomain.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Expand Down
11 changes: 10 additions & 1 deletion js/lib/psl.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -6567,4 +6576,4 @@ module.exports = {
"\u9ad8\u77e5.jp": 1,
"\u9ce5\u53d6.jp": 1,
"\u9e7f\u5150\u5cf6.jp": 1
};
};

0 comments on commit c57e80d

Please sign in to comment.