From: Zooko O'Whielacronx zooko@zooko.com Date: Fri, 27 Apr 2007 19:56:37 +0000 (+0530) Subject: zfec: yet another tweak to the licence X-Git-Url: https://git.rkrishnan.org/listings/pb3user.py?a=commitdiff_plain;h=1034c78a73da08536a69dc58da3f49c4884a333f;p=tahoe-lafs%2Fzfec.git zfec: yet another tweak to the licence darcs-hash:80e0c5af5632f7523c06ecf8dfe1ffde596ff6a8 --- diff --git a/zfec/COPYING b/zfec/COPYING index ff1017a..0c5b3e3 100644 --- a/zfec/COPYING +++ b/zfec/COPYING @@ -1,7 +1,7 @@ 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 of the GPL), you may -delay the fulfillment of this obligation for up to 12 months. +derived work under this licence (as per section 2.b), you may delay the +fulfillment of this obligation for up to 12 months. GNU GENERAL PUBLIC LICENSE diff --git a/zfec/README.txt b/zfec/README.txt index dc1a5fb..e3a1031 100644 --- a/zfec/README.txt +++ b/zfec/README.txt @@ -3,11 +3,12 @@ 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. 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. +It is offered under 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. 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 6e91e48..870ef65 100755 --- a/zfec/setup.py +++ b/zfec/setup.py @@ -11,8 +11,9 @@ # 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 of the -# GPL), you may delay the fulfillment of this obligation for up to 12 months. +# 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. # # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/__init__.py b/zfec/zfec/__init__.py index 2e710e4..7cf5785 100644 --- a/zfec/zfec/__init__.py +++ b/zfec/zfec/__init__.py @@ -26,13 +26,14 @@ import filefec, cmdline_zfec, cmdline_zunfec # mailto:zooko@zooko.com # # 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 of the -# GPL), you may delay the fulfillment of this obligation for up to 12 months. +# 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. # # 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/zfec/zfec/_fecmodule.c b/zfec/zfec/_fecmodule.c index b973d11..c75cfec 100644 --- a/zfec/zfec/_fecmodule.c +++ b/zfec/zfec/_fecmodule.c @@ -596,8 +596,9 @@ init_fec(void) { * 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 of the - * GPL), you may delay the fulfillment of this obligation for up to 12 months. + * 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. * * If you would like to inquire about a commercial relationship with Allmydata, * Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/cmdline_zfec.py b/zfec/zfec/cmdline_zfec.py index f399fd1..7c96eed 100755 --- a/zfec/zfec/cmdline_zfec.py +++ b/zfec/zfec/cmdline_zfec.py @@ -68,8 +68,9 @@ def main(): # 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 of the -# GPL), you may delay the fulfillment of this obligation for up to 12 months. +# 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. # # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/cmdline_zunfec.py b/zfec/zfec/cmdline_zunfec.py index 7c9f3f6..7f822fb 100755 --- a/zfec/zfec/cmdline_zunfec.py +++ b/zfec/zfec/cmdline_zunfec.py @@ -70,8 +70,9 @@ def main(): # 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 of the -# GPL), you may delay the fulfillment of this obligation for up to 12 months. +# 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. # # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/easyfec.py b/zfec/zfec/easyfec.py index db36b32..11ed0ee 100644 --- a/zfec/zfec/easyfec.py +++ b/zfec/zfec/easyfec.py @@ -44,13 +44,14 @@ class Decoder(object): # 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 of the -# GPL), you may delay the fulfillment of this obligation for up to 12 months. +# 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. # # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/fec.c b/zfec/zfec/fec.c index 6b5fa86..f762edc 100644 --- a/zfec/zfec/fec.c +++ b/zfec/zfec/fec.c @@ -563,8 +563,9 @@ fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts, gf* * 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 of the - * GPL), you may delay the fulfillment of this obligation for up to 12 months. + * 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. * * If you would like to inquire about a commercial relationship with Allmydata, * Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/fec.h b/zfec/zfec/fec.h index 1e8b44d..299f5e7 100644 --- a/zfec/zfec/fec.h +++ b/zfec/zfec/fec.h @@ -46,8 +46,9 @@ void fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts * 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 of the - * GPL), you may delay the fulfillment of this obligation for up to 12 months. + * 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. * * If you would like to inquire about a commercial relationship with Allmydata, * Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/filefec.py b/zfec/zfec/filefec.py index d35ec72..47e4e0f 100644 --- a/zfec/zfec/filefec.py +++ b/zfec/zfec/filefec.py @@ -421,8 +421,9 @@ def encode_file_stringy_easyfec(inf, cb, k, m, chunksize=4096): # 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 of the -# GPL), you may delay the fulfillment of this obligation for up to 12 months. +# 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. # # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/test/test_util.py b/zfec/zfec/test/test_util.py index 12542fd..c555e6c 100644 --- a/zfec/zfec/test/test_util.py +++ b/zfec/zfec/test/test_util.py @@ -119,8 +119,9 @@ class Math(unittest.TestCase): # 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 of the -# GPL), you may delay the fulfillment of this obligation for up to 12 months. +# 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. # # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/test/test_zfec.py b/zfec/zfec/test/test_zfec.py index 70ced57..f7b7ecb 100755 --- a/zfec/zfec/test/test_zfec.py +++ b/zfec/zfec/test/test_zfec.py @@ -234,8 +234,9 @@ class Cmdline(unittest.TestCase): # 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 of the -# GPL), you may delay the fulfillment of this obligation for up to 12 months. +# 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. # # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/util/fileutil.py b/zfec/zfec/util/fileutil.py index 67178d7..87fe7b0 100644 --- a/zfec/zfec/util/fileutil.py +++ b/zfec/zfec/util/fileutil.py @@ -248,8 +248,9 @@ def remove_if_possible(f): # 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 of the -# GPL), you may delay the fulfillment of this obligation for up to 12 months. +# 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. # # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/util/mathutil.py b/zfec/zfec/util/mathutil.py index 8bf1be7..160a7df 100644 --- a/zfec/zfec/util/mathutil.py +++ b/zfec/zfec/util/mathutil.py @@ -82,8 +82,9 @@ def permute(l): # 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 of the -# GPL), you may delay the fulfillment of this obligation for up to 12 months. +# 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. # # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit diff --git a/zfec/zfec/util/version.py b/zfec/zfec/util/version.py index ba30ca2..6851bec 100644 --- a/zfec/zfec/util/version.py +++ b/zfec/zfec/util/version.py @@ -125,7 +125,6 @@ class Version: # # Copyright (C) 2007 Allmydata, Inc. # Author: Zooko Wilcox-O'Hearn -# mailto:zooko@zooko.com # # This file is part of zfec. # @@ -133,29 +132,9 @@ class Version: # 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 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 -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2007 Allmydata, Inc. -# 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 of the -# GPL), you may delay the fulfillment of this obligation for up to 12 months. +# 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. # # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit