From: Zooko O'Whielacronx zooko@zooko.com Date: Wed, 31 Jan 2007 19:54:20 +0000 (+0530) Subject: pyfec: licensing tweak X-Git-Url: https://git.rkrishnan.org/simplejson/__init__.py.html?a=commitdiff_plain;h=c5d5f107a2a61b4af871d9edfa5b27432d870e3e;p=tahoe-lafs%2Fzfec.git pyfec: licensing tweak darcs-hash:f6a5b12709342d01d4397702d09c94f677ff8c64 --- diff --git a/pyfec/COPYING b/pyfec/COPYING index b9f367d..eb42bd5 100644 --- a/pyfec/COPYING +++ b/pyfec/COPYING @@ -1,7 +1,7 @@ In addition to the terms of the GNU General Public License, the pyfec package -also comes with a special added permission that if you are 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. +also comes with a special added permission that you may delay for up to 12 +months the fulfillment of your obligation under GPL section 2.b to release any +derived work under this licence. diff --git a/pyfec/README.txt b/pyfec/README.txt index 3285f09..53bd10f 100644 --- a/pyfec/README.txt +++ b/pyfec/README.txt @@ -2,9 +2,10 @@ This package implements an "erasure code", or "forward error correction code". It is offered under the GNU General Public License v2 or (at your option) any -later version, with the added permission that, in the case that you are -obligated to release a derived work under this licence (as per section 2.b of -the GPL), you may delay the fulfillment of this obligation for up to 12 months. +later version. This package also comes with the added permission that, in the +case that you are obligated to release a derived work under this licence (as +per section 2.b of the GPL), you may delay the fulfillment of this obligation +for up to 12 months. 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 stored @@ -14,8 +15,8 @@ element, it can be parameterized to choose in advance the number of elements whose loss it can tolerate. This package is largely based on the old "fec" library by Luigi Rizzo et al., -which is a simple, mature, and optimized implementation of erasure coding. The -pyfec package makes several changes from the original "fec" package, including +which is a mature and optimized implementation of erasure coding. The pyfec +package makes several changes from the original "fec" package, including addition of the Python API, refactoring of the C API to be faster (for the way that I use it, at least), and a few clean-ups and micro-optimizations of the core code itself. @@ -148,7 +149,7 @@ second. Enjoy! Zooko Wilcox-O'Hearn -2007-01-27 -San Francisco +2007-01-30 +Boulder, Colorado diff --git a/pyfec/fec/_fecmodule.c b/pyfec/fec/_fecmodule.c index e930db0..906da46 100644 --- a/pyfec/fec/_fecmodule.c +++ b/pyfec/fec/_fecmodule.c @@ -10,7 +10,10 @@ * 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. + * of the License, or (at your option) any later version. This program also + * comes with the added permission that, in the case that you are obligated to + * release a derived work under this licence (as per section 2.b of the GPL), + * you may delay the fulfillment of this obligation for up to 12 months. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pyfec/fec/fec.c b/pyfec/fec/fec.c index 2148bed..ba43da9 100644 --- a/pyfec/fec/fec.c +++ b/pyfec/fec/fec.c @@ -7,10 +7,13 @@ * * This file is part of pyfec. * - * 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. + * 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. This program also comes with the added permission that, + * in the case that you are obligated to release a derived work under this + * licence (as per section 2.b of the GPL), you may delay the fulfillment of + * this obligation for up to 12 months. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pyfec/fec/fec.h b/pyfec/fec/fec.h index 376b867..038b2c1 100644 --- a/pyfec/fec/fec.h +++ b/pyfec/fec/fec.h @@ -7,10 +7,13 @@ * * This file is part of pyfec. * - * 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. + * 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. This program also comes with the added permission that, + * in the case that you are obligated to release a derived work under this + * licence (as per section 2.b of the GPL), you may delay the fulfillment of + * this obligation for up to 12 months. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/pyfec/fec/test/bench_pyfec.py b/pyfec/fec/test/bench_pyfec.py index 613c67f..ddb7e9f 100644 --- a/pyfec/fec/test/bench_pyfec.py +++ b/pyfec/fec/test/bench_pyfec.py @@ -6,11 +6,14 @@ # # This file is part of pyfec. # -# 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. -# +# 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. This program also comes with the added permission that, in the case +# that you are obligated to release a derived work under this licence (as per +# section 2.b of the GPL), you may delay the fulfillment of this obligation for +# up to 12 months. +# # 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 diff --git a/pyfec/fec/test/test_pyfec.py b/pyfec/fec/test/test_pyfec.py index 00f59fb..16579c8 100755 --- a/pyfec/fec/test/test_pyfec.py +++ b/pyfec/fec/test/test_pyfec.py @@ -8,10 +8,13 @@ # # This file is part of pyfec. # -# 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. +# 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. This program also comes with the added permission that, in the case +# that you are obligated to release a derived work under this licence (as per +# section 2.b of the GPL), you may delay the fulfillment of this obligation for +# up to 12 months. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of