From: zooko Date: Wed, 12 Sep 2007 18:39:13 +0000 (+0530) Subject: zfec: update licensing text X-Git-Url: https://git.rkrishnan.org/simplejson/%22news.html/about.html?a=commitdiff_plain;h=2635732be6547cc5005f2191be1051492fbe4a55;p=tahoe-lafs%2Fzfec.git zfec: update licensing text darcs-hash:6b28627f806294dc5223e468125fb7a051887a43 --- diff --git a/zfec/COPYING b/zfec/COPYING index 30d8b9f..f8fd5e7 100644 --- a/zfec/COPYING +++ b/zfec/COPYING @@ -1,15 +1,15 @@ -In addition to the terms written below, this licence comes with the added -permission that, if you become obligated to release a derived work under this -licence (as per section 2.b), you may delay the fulfillment of this -obligation for up to 12 months. If you are obligated to release code under -section 2.b of this licence, such code must be released under these same terms -including the 12-month grace period clause. - -In addition to the terms written below, this licence 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. +In addition to the terms of the GNU General Public License, this licence also +comes with the added permission that, if you become obligated to release a +derived work under this licence (as per section 2.b), you may delay the +fulfillment of this obligation for up to 12 months ("grace period"). If you +are obligated to release code under section 2.b of this licence, you are +obligated to release it under these same terms, including the 12-month +grace period clause. + +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. GNU GENERAL PUBLIC LICENSE diff --git a/zfec/README.txt b/zfec/README.txt index 9ea057c..2bd5763 100644 --- a/zfec/README.txt +++ b/zfec/README.txt @@ -3,13 +3,15 @@ This package implements an "erasure code", or "forward error correction code". -It is offered under the GNU General Public License (v2 or later), with the -added permission that, if you become obligated to release a derived work -under this licence (as per section 2.b), you may delay the fulfillment of -this obligation for up to 12 months. If you are obligated to release code -under section 2.b of this licence, such code must be released under these -same terms including the 12-month grace period clause. See the COPYING -file for details. +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 of the License, or (at your option) any later +version, with the added permission that, if you become obligated to release a +derived work under this licence (as per section 2.b), you may delay the +fulfillment of this obligation for up to 12 months. If you are obligated to +release code under section 2.b of this licence, you are obligated to release +it under these same terms, including the 12-month grace period clause. See +the COPYING file for details. The most widely known example of an erasure code is the RAID-5 algorithm which makes it so that in the event of the loss of any one hard drive, the diff --git a/zfec/setup.py b/zfec/setup.py index 96234cd..7daed4c 100755 --- a/zfec/setup.py +++ b/zfec/setup.py @@ -6,14 +6,16 @@ # Author: Zooko Wilcox-O'Hearn # # This file is part of zfec. -# +# # 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 of the License, or (at your option) # any later version, with the added permission that, if you become obligated # to release a derived work under this licence (as per section 2.b), you may -# delay the fulfillment of this obligation for up to 12 months. See the file -# COPYING for details. +# delay the fulfillment of this obligation for up to 12 months. If you are +# obligated to release code under section 2.b of this licence, you are +# obligated to release it under these same terms, including the 12-month grace +# period clause. See the COPYING file for details. # # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit