From: Zooko O'Whielacronx Date: Wed, 14 Apr 2010 23:25:21 +0000 (-0700) Subject: licensing: phrase the OpenSSL-exemption in the vocabulary of copyright instead of... X-Git-Url: https://git.rkrishnan.org/pf/content//%22%3C?a=commitdiff_plain;h=5c7c3e9c7b5ad2d1cff46ba7bbd1a0a9084a193b;p=tahoe-lafs%2Ftahoe-lafs.git licensing: phrase the OpenSSL-exemption in the vocabulary of copyright instead of computer technology, and replicate the exemption from the GPL to the TGPPL --- diff --git a/COPYING.GPL b/COPYING.GPL index 8b7796c1..094beb64 100644 --- a/COPYING.GPL +++ b/COPYING.GPL @@ -1,7 +1,7 @@ -This licence also comes with the added permission that you may link this -program with the OpenSSL library and distribute executables, as long as you -follow the requirements of this licence in regard to all of the software in -the executable aside from OpenSSL. +This licence also comes with the added permission that you may combine this +work with OpenSSL and distribute the resulting combined work, as long as you +follow the requirements of this licence in regard to all of the software in the +combined work aside from OpenSSL. GNU GENERAL PUBLIC LICENSE diff --git a/COPYING.TGPPL.html b/COPYING.TGPPL.html index b23acddf..9a835894 100644 --- a/COPYING.TGPPL.html +++ b/COPYING.TGPPL.html @@ -15,6 +15,9 @@ + +

This licence also comes with the added permission that you may link this program with the OpenSSL library and distribute executables, as long as you follow the requirements of this licence in regard to all of the software in the executable aside from OpenSSL.

Transitive Grace Period Public Licence ("TGPPL") v. 1.0

This Transitive Grace Period Public Licence (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: