AGPLv3+CAFv2

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/COPYING b/AGPLv3+CAFv2
similarity index 95%
rename from COPYING
rename to AGPLv3+CAFv2
index 939a6f4..fe80513 100644 (file)
--- a/COPYING
+++ b/AGPLv3+CAFv2
@@ -1,3 +1,40 @@
+hippotat is an IP-over-HTTP client and server pair
+
+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 1, 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.
+
+------------------------------
+
+CAF Login Exception (version 2)
+
+To avoid forcing users to make the source code of their whole
+application available to non-users, I (Ian Jackson) have granted this
+exception as part of the licence of CGI::Auth::Flexible (and
+some other programs, where declared in their copyright rubrics).
+
+When considering AGPLv3 section 13 "Remote Network Interaction" (or
+similar provisions in successor licences):
+
+If all interactions with the Program (other than interactions with the
+user authentication system) require user authentication, the
+provisions of that section apply only to interaction with the Program
+by authenticated users.
+
+This is an Additional Permission as contemplated by AGPLv3 section 7.
+
+- Ian Jackson
+
+------------------------------
+
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 

diff --git a/hippotat b/hippotat
index 2f88d5e..fc0a8b6 100755 (executable)
--- a/hippotat
+++ b/hippotat
@@ -1,4 +1,27 @@
 #!/usr/bin/python3
+#
+# Hippotat - Asinine IP Over HTTP program
+# ./hippotat - client main program
+#
+# Copyright 2017 Ian Jackson
+#
+# 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
+# <ijackson@chiark.greenend.org.uk>.
+
 
 from hippotatlib import *