From: Ian Jackson Date: Sun, 25 Sep 2022 15:48:37 +0000 (+0100) Subject: old-python: Relax licence from AGPLv3+ + CAFv2+ to GPLv3+ X-Git-Tag: hippotat/1.0.0~54 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=597c5a72ef8e8610bc08d1990243bb82e8ea4aca;p=hippotat.git old-python: Relax licence from AGPLv3+ + CAFv2+ to GPLv3+ Have received confirmation from Mark Wooding, the other contributor, that this is OK. Have not yet updated all copyright notices. Signed-off-by: Ian Jackson --- diff --git a/old-python/COPYING b/old-python/COPYING index 159c8c3..12aa7a5 100644 --- a/old-python/COPYING +++ b/old-python/COPYING @@ -3,7 +3,7 @@ Hippotat - Asinine IP Over HTTP program Copyright 2017 Ian Jackson -The client is: +The client and server are both: GPLv3+ @@ -21,30 +21,5 @@ The client is: along with this program, in the file GPLv3. If not, see . -(This licence applies to all the short files without their own -copyright notices, too.) - - -The server is: - - AGPLv3+ + CAFv2+ - - This program is free software: you can redistribute it and/or - modify it under the terms of the GNU Affero General Public - License as published by the Free Software Foundation, either - version 3 of the License, or (at your option) any later version, - with the "CAF Login Exception" as published by Ian Jackson - (version 2, or at your option any later version) as an Additional - Permission. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public - License and the CAF Login Exception along with this program, in - the file AGPLv3+CAFv2. If not, email Ian Jackson - . ----------------------------------------------------------------------