From 1ca1357d5b609f4519c3948f8220597755ac6a6f Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Sat, 4 Dec 2021 19:34:21 +0100 Subject: remove alicense --- common/sha256.js | 2 +- copyright | 38 +++++++++++++++++++++----------------- licenses/alicense.txt | 32 -------------------------------- 3 files changed, 22 insertions(+), 50 deletions(-) delete mode 100644 licenses/alicense.txt diff --git a/common/sha256.js b/common/sha256.js index 9aae7a1..3a02d7a 100644 --- a/common/sha256.js +++ b/common/sha256.js @@ -4,7 +4,7 @@ * @version 0.9.0 * * Copyright (C) 2014-2017, Yi-Cyuan Chen - * + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including diff --git a/copyright b/copyright index 3ffdb5b..f8e9214 100644 --- a/copyright +++ b/copyright @@ -4,7 +4,9 @@ Source: https://git.koszko.org/browser-extension/ Files: * Copyright: 2021 Wojtek Kosior -License: GPL-3+-javascript or Alicense-1.0 +License: GPL-3+-javascript +Comment: Wojtek Kosior promises not to sue even in case of violations + of the license. Files: *.sh default_settings.json Copyright: 2021 Wojtek Kosior @@ -21,27 +23,38 @@ License: CC0 or CC-BY-SA-4.0 Files: background/policy_injector.js common/misc.js content/main.js Copyright: 2021 Wojtek Kosior 2021 jahoti -License: GPL-3+-javascript or Alicense-1.0 +License: GPL-3+-javascript +Comment: Wojtek Kosior promises not to sue even in case of violations + of the license. Files: background/stream_filter.js Copyright: 2018 Giorgio Maone 2021 Wojtek Kosior -License: GPL-3+-javascript or Alicense-1.0, and GPL-3+ -Comment: Code by Wojtek is dual-licensed under GPL-3+-javascript and - Alicense-1.0. Giorgio's code is under GPL-3+. +License: GPL-3+-javascript and GPL-3+ +Comment: Code by Wojtek is licensed under GPL-3+-javascript and + Giorgio's code is under GPL-3+. + . + Wojtek Kosior promises not to sue even in case of violations of the + license. Files: *.html README.txt copyright Copyright: 2021 Wojtek Kosior -License: GPL-3+ or Alicense-1.0 or CC-BY-SA-4.0 +License: GPL-3+ or CC-BY-SA-4.0 +Comment: Wojtek Kosior promises not to sue even in case of violations + of the license. Files: html/*.css Copyright: 2021 Wojtek Kosior -License: GPL-3+ or Alicense-1.0 or CC-BY-SA-4.0 +License: GPL-3+ or CC-BY-SA-4.0 +Comment: Wojtek Kosior promises not to sue even in case of violations + of the license. Files: html/base.css Copyright: 2021 Wojtek Kosior 2021 Nicholas Johnson -License: GPL-3+ or Alicense-1.0 or CC-BY-SA-4.0 +License: GPL-3+ or CC-BY-SA-4.0 +Comment: Wojtek Kosior promises not to sue even in case of violations + of the license. Files: html/reset.css Copyright: 2008,2011 Eric A. Meyer @@ -121,15 +134,6 @@ License: GPL-3+-javascript License along with this package; if not, you can get it from `https://www.gnu.org/licenses/gpl-3.0.html'. -License: Alicense-1.0 - You can use and redistribute this program with or without - modification under then terms of "A" license version 1.0. You - should have received a copy of "A" license along with this - program. If not, you can get it from - `https://koszko.org/alicense.txt'. - Also see `https://koszko.org/en/articles/my-new-license.html' - for more explanation. - License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/licenses/alicense.txt b/licenses/alicense.txt deleted file mode 100644 index 2513c24..0000000 --- a/licenses/alicense.txt +++ /dev/null @@ -1,32 +0,0 @@ -Asshole license 1.0 - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. You agree that you're an asshole. -2. You agree for the copyright owner of this software/work to call you an - asshole, both privately and publicly. -3. You agree and promise not to sue the copyright owner of this - software/work nor anyone acting on behalf of the copyright owner of this - software/work for calling you an asshole. -4. You agree and promise not to sue the copyright owner of this - software/work, nor anyone acting on behalf of the copyright owner of this - software/work, in relation with reverse-engineering actions performed on - your software/products. -5. You agree and promise not issue DMCA claims against any software - developed and/or distributed by the copyright owner of this - software/work or anyone acting on behalf of the copyright owner of this - software/work. Should such claims happen regardless, they will be - automatically void. - -THIS SOFTWARE/WORK IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE/WORK, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. -- cgit v1.2.3