From c8077deae5d6b1489e3c600ed365cf1b98cc2dbd Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Wed, 9 May 2007 15:57:53 -0700 Subject: [PATCH] zfec: tweak licence text --- src/zfec/COPYING | 19 ++++++++++--------- src/zfec/setup.py | 5 ----- src/zfec/zfec/__init__.py | 13 ++----------- src/zfec/zfec/_fecmodule.c | 5 ----- src/zfec/zfec/cmdline_zfec.py | 5 ----- src/zfec/zfec/cmdline_zunfec.py | 5 ----- src/zfec/zfec/easyfec.py | 6 ------ src/zfec/zfec/fec.c | 5 ----- src/zfec/zfec/fec.h | 5 ----- src/zfec/zfec/filefec.py | 5 ----- src/zfec/zfec/test/test_util.py | 5 ----- src/zfec/zfec/test/test_zfec.py | 5 ----- src/zfec/zfec/util/fileutil.py | 5 ----- src/zfec/zfec/util/mathutil.py | 5 ----- src/zfec/zfec/util/version.py | 31 +++++++------------------------ 15 files changed, 19 insertions(+), 105 deletions(-) diff --git a/src/zfec/COPYING b/src/zfec/COPYING index 294b73f7..b4344741 100644 --- a/src/zfec/COPYING +++ b/src/zfec/COPYING @@ -1,12 +1,13 @@ -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. - -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. +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. + +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. GNU GENERAL PUBLIC LICENSE diff --git a/src/zfec/setup.py b/src/zfec/setup.py index 80d8b976..a8c08d83 100644 --- a/src/zfec/setup.py +++ b/src/zfec/setup.py @@ -18,11 +18,6 @@ # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit # http://allmydata.com/. -# -# 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. from ez_setup import use_setuptools use_setuptools(min_version='0.6a9') diff --git a/src/zfec/zfec/__init__.py b/src/zfec/zfec/__init__.py index ae874ccc..279c2269 100644 --- a/src/zfec/zfec/__init__.py +++ b/src/zfec/zfec/__init__.py @@ -32,14 +32,5 @@ import filefec, cmdline_zfec, cmdline_zunfec # 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. -# -# 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. +# delay the fulfillment of this obligation for up to 12 months. See the +# COPYING file for details. diff --git a/src/zfec/zfec/_fecmodule.c b/src/zfec/zfec/_fecmodule.c index c75cfec7..5c59870c 100644 --- a/src/zfec/zfec/_fecmodule.c +++ b/src/zfec/zfec/_fecmodule.c @@ -603,11 +603,6 @@ init_fec(void) { * If you would like to inquire about a commercial relationship with Allmydata, * Inc., please contact partnerships@allmydata.com and visit * http://allmydata.com/. - * - * 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. */ /** diff --git a/src/zfec/zfec/cmdline_zfec.py b/src/zfec/zfec/cmdline_zfec.py index 7c96eed1..ec5ec17d 100644 --- a/src/zfec/zfec/cmdline_zfec.py +++ b/src/zfec/zfec/cmdline_zfec.py @@ -75,8 +75,3 @@ def main(): # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit # http://allmydata.com/. -# -# 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. diff --git a/src/zfec/zfec/cmdline_zunfec.py b/src/zfec/zfec/cmdline_zunfec.py index 7f822fbd..99c80604 100644 --- a/src/zfec/zfec/cmdline_zunfec.py +++ b/src/zfec/zfec/cmdline_zunfec.py @@ -77,8 +77,3 @@ def main(): # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit # http://allmydata.com/. -# -# 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. diff --git a/src/zfec/zfec/easyfec.py b/src/zfec/zfec/easyfec.py index 11ed0ee5..1843a697 100644 --- a/src/zfec/zfec/easyfec.py +++ b/src/zfec/zfec/easyfec.py @@ -56,9 +56,3 @@ class Decoder(object): # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit # http://allmydata.com/. -# -# 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. - diff --git a/src/zfec/zfec/fec.c b/src/zfec/zfec/fec.c index f762edc1..e8afca85 100644 --- a/src/zfec/zfec/fec.c +++ b/src/zfec/zfec/fec.c @@ -570,11 +570,6 @@ fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts, gf* * If you would like to inquire about a commercial relationship with Allmydata, * Inc., please contact partnerships@allmydata.com and visit * http://allmydata.com/. - * - * 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. */ /* diff --git a/src/zfec/zfec/fec.h b/src/zfec/zfec/fec.h index 299f5e7b..3d81899c 100644 --- a/src/zfec/zfec/fec.h +++ b/src/zfec/zfec/fec.h @@ -53,11 +53,6 @@ void fec_decode(const fec_t* code, const gf*restrict const*restrict const inpkts * If you would like to inquire about a commercial relationship with Allmydata, * Inc., please contact partnerships@allmydata.com and visit * http://allmydata.com/. - * - * 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. */ /* diff --git a/src/zfec/zfec/filefec.py b/src/zfec/zfec/filefec.py index 47e4e0fa..1419ae8e 100644 --- a/src/zfec/zfec/filefec.py +++ b/src/zfec/zfec/filefec.py @@ -428,8 +428,3 @@ def encode_file_stringy_easyfec(inf, cb, k, m, chunksize=4096): # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit # http://allmydata.com/. -# -# 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. diff --git a/src/zfec/zfec/test/test_util.py b/src/zfec/zfec/test/test_util.py index c555e6c4..18ad3c7d 100644 --- a/src/zfec/zfec/test/test_util.py +++ b/src/zfec/zfec/test/test_util.py @@ -126,8 +126,3 @@ class Math(unittest.TestCase): # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit # http://allmydata.com/. -# -# 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. diff --git a/src/zfec/zfec/test/test_zfec.py b/src/zfec/zfec/test/test_zfec.py index 3a76ddfe..b997fa16 100644 --- a/src/zfec/zfec/test/test_zfec.py +++ b/src/zfec/zfec/test/test_zfec.py @@ -241,8 +241,3 @@ class Cmdline(unittest.TestCase): # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit # http://allmydata.com/. -# -# 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. diff --git a/src/zfec/zfec/util/fileutil.py b/src/zfec/zfec/util/fileutil.py index 87fe7b03..79d98592 100644 --- a/src/zfec/zfec/util/fileutil.py +++ b/src/zfec/zfec/util/fileutil.py @@ -255,8 +255,3 @@ def remove_if_possible(f): # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit # http://allmydata.com/. -# -# 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. diff --git a/src/zfec/zfec/util/mathutil.py b/src/zfec/zfec/util/mathutil.py index 160a7df3..caf7b1ee 100644 --- a/src/zfec/zfec/util/mathutil.py +++ b/src/zfec/zfec/util/mathutil.py @@ -89,8 +89,3 @@ def permute(l): # If you would like to inquire about a commercial relationship with Allmydata, # Inc., please contact partnerships@allmydata.com and visit # http://allmydata.com/. -# -# 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. diff --git a/src/zfec/zfec/util/version.py b/src/zfec/zfec/util/version.py index 6851becf..d5cbb36c 100644 --- a/src/zfec/zfec/util/version.py +++ b/src/zfec/zfec/util/version.py @@ -1,3 +1,10 @@ +# Copyright (c) 2004-2007 Bryce "Zooko" Wilcox-O'Hearn +# mailto:zooko@zooko.com +# http://zooko.com/repos/pyutil +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this work to deal in this work without restriction (including the rights +# to use, modify, distribute, sublicense, and/or sell copies). + """ extended version number class """ @@ -120,27 +127,3 @@ class Version: return res return cmp(self.tags, other.tags) - -# zfec -- fast forward error correction library with Python interface -# -# 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), 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 -# http://allmydata.com/. -# -# 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. -- 2.45.2