summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-12-17 17:05:35 +0100
committerArne Schwabe <arne@rfc2549.org>2014-12-17 17:05:35 +0100
commit413e7689990867ae727bc5624787acf7aa789796 (patch)
treea9157d1ce70fce5a1cb09e8f612e6088ad59f4cd /doc
parent8935ebe6c3c7b70d9052a83063cb3da2cb5a238f (diff)
Update/clarify copyright.
--HG-- branch : public extra : source : a453e026590faae1a1842b98d367654fbde63fcb
Diffstat (limited to 'doc')
-rw-r--r--doc/LICENSE.txt23
1 files changed, 23 insertions, 0 deletions
diff --git a/doc/LICENSE.txt b/doc/LICENSE.txt
index f023ce64..c87fb7a4 100644
--- a/doc/LICENSE.txt
+++ b/doc/LICENSE.txt
@@ -5,8 +5,31 @@ The source code needed to control OpenVPN for Android from another app (the remo
Copyright (c) 2012-2014, Arne Schwabe
All rights reserved.
+
+The name ics-openvpn and OpenVPN for Android refer to the same program.
+OpenVPN for Android is distributed under the GPL license version 2 (see Below)
+with the following clarification/additional terms of what constitues "deriviate work":
+
+Using/including any part of ics-openvpn, especially using/including any part of the
+de.blinkt.openvpn class hierarchy, creates derivative work of ics-openvpn.
+The normal definitions of derivative additionally apply.
+
If you need a non GPLv2 license of the source please contact me.
+Special exception for linking ics-openvpn with OpenSSL:
+
+In addition, as a special exception, Arne Schwabe gives
+permission to link the code of this program with the OpenSSL
+library (or with modified versions of OpenSSL that use the same
+license as OpenSSL), and distribute linked combinations including
+the two. You must obey the GNU General Public License in all
+respects for all of the code used other than OpenSSL. If you modify
+this file, you may extend this exception to your version of the
+file, but you are not obligated to do so. If you do not wish to
+do so, delete this exception statement from your version
+
+
+
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 the Free Software Foundation; either version 2