From d091382f26f3a084f6e1223424db4cdae428a6e1 Mon Sep 17 00:00:00 2001 From: Mark Janssen Date: Mon, 23 Jan 2012 18:10:43 +0000 Subject: [PATCH] Updated LICENSE.txt with OpenSSL linking clause git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@249 bc163920-b10d-0410-b2c5-a5491ca2ceef --- LICENSE.txt | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 3a2544a..38f6ce2 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,25 @@ Proxytunnel is covered by the GNU GPL, version 2, included below. Most of -the code was written by Jos Visser and Mark Janssen, the snippet of base64 -code came from mutt, and was written by: Brendan Cully +the code was written by Jos Visser and Mark Janssen. + +Linking to OpenSSL + +In addition, as a special exception, Mark Janssen and Jos Visser +give permission to link the code of proxytunnel with the OpenSSL +project's "OpenSSL" library (or with modified versions of it that +use the same license as the "OpenSSL" library), and distribute the +linked executables. 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. + +Code Snippets + +Various bits of code came from other packages. The following copyright +notices apply to those bits: + +The snippet of base64 code came from mutt, and was written by: +Brendan Cully and came with the following copyright notice: /*