--- tahoe-lafs-1.6.0.orig/setup.cfg +++ tahoe-lafs-1.6.0/setup.cfg @@ -8,14 +8,3 @@ tag_build = tag_date = 0 tag_svn_revision = 0 - -[aliases] -sdist_dsc = darcsver --count-all-patches sdist_dsc -test_mac_diskimage = darcsver --count-all-patches test_mac_diskimage -sdist = darcsver --count-all-patches sdist -trial = darcsver --count-all-patches trial -build = darcsver --count-all-patches develop --prefix=support make_executable build -install = darcsver --count-all-patches install -test = darcsver --count-all-patches develop --prefix=support make_executable build trial -bdist_egg = darcsver --count-all-patches bdist_egg - --- tahoe-lafs-1.6.0.orig/setup.py +++ tahoe-lafs-1.6.0/setup.py @@ -23,33 +23,14 @@ basedir = os.path.dirname(os.path.abspath(__file__)) supportlib = pylibdir(os.path.join(basedir, "support")) -# locate our version number - -def read_version_py(infname): - try: - verstrline = open(infname, "rt").read() - except EnvironmentError: - return None - else: - VSRE = r"^verstr = ['\"]([^'\"]*)['\"]" - mo = re.search(VSRE, verstrline, re.M) - if mo: - return mo.group(1) - -version = read_version_py("src/allmydata/_version.py") - -try: - from ez_setup import use_setuptools -except ImportError: - pass -else: - # This invokes our own customized version of ez_setup.py to make sure - # that setuptools v0.6c12dev (which is our own toothpick of setuptools) - # is used to build. Note that we can use any version of setuptools >= - # 0.6c6 to *run* -- see _auto_deps.py for run-time dependencies (a.k.a. - # "install_requires") -- this is only for build-time dependencies (a.k.a. - # "setup_requires"). - use_setuptools(download_delay=0, min_version="0.6c12dev") +# locate our version number. This only works from a generated tarball, in +# which src/allmydata/_version.py was previously created by invoking +# "darcsver --count-all-patches". + +verstrline = open("src/allmydata/_version.py", "rt").read() +VSRE = r"^verstr = ['\"]([^'\"]*)['\"]" +mo = re.search(VSRE, verstrline, re.M) +version = mo.group(1) from setuptools import find_packages, setup from setuptools.command import sdist @@ -108,45 +89,6 @@ malfunctioning, or malicious.""" -setup_requires = [] - -# The darcsver command from the darcsver plugin is needed to initialize the -# distribution's .version attribute correctly. (It does this either by -# examining darcs history, or if that fails by reading the -# src/allmydata/_version.py file). darcsver will also write a new version -# stamp in src/allmydata/_version.py, with a version number derived from -# darcs history. Note that the setup.cfg file has an "[aliases]" section -# which enumerates commands that you might run and specifies that it will run -# darcsver before each one. If you add different commands (or if I forgot -# some that are already in use), you may need to add it to setup.cfg and -# configure it to run darcsver before your command, if you want the version -# number to be correct when that command runs. -# http://pypi.python.org/pypi/darcsver -setup_requires.append('darcsver >= 1.2.0') - -# Nevow requires Twisted to setup, but doesn't declare that requirement in a -# way that enables setuptools to satisfy that requirement before Nevow's -# setup.py tried to "import twisted". Fortunately we require setuptools_trial -# to setup and setuptools_trial requires Twisted to install, so hopefully -# everything will work out until the Nevow issue is fixed: -# http://divmod.org/trac/ticket/2629 setuptools_trial is needed if you want -# "./setup.py trial" or "./setup.py test" to execute the tests (and in order -# to make sure Twisted is installed early enough -- see the paragraph above). -# http://pypi.python.org/pypi/setuptools_trial -setup_requires.extend(['setuptools_trial >= 0.5']) - -# setuptools_darcs is required to produce complete distributions (such as -# with "sdist" or "bdist_egg") (unless there is a PKG-INFO file present which -# shows that this is itself a source distribution). For simplicity, and -# because there is some unknown error with setuptools_darcs when building and -# testing tahoe all in one python command on some platforms, we always add it -# to setup_requires. http://pypi.python.org/pypi/setuptools_darcs -setup_requires.append('setuptools_darcs >= 1.1.0') - -# stdeb is required to produce Debian files with the "sdist_dsc" command. -if "sdist_dsc" in sys.argv: - setup_requires.append('stdeb >= 0.3') - class ShowSupportLib(Command): user_options = [] def initialize_options(self): @@ -335,10 +277,6 @@ return sdist.sdist.make_distribution(self) -# Tahoe's dependencies are managed by the find_links= entry in setup.cfg and -# the _auto_deps.install_requires list, which is used in the call to setup() -# below. -from _auto_deps import install_requires APPNAME='allmydata-tahoe' APPNAMEFILE = os.path.join('src', 'allmydata', '_appname.py') @@ -353,11 +291,8 @@ print "Error -- this setup.py file is configured with the 'application name' to be '%s', but there is already a file in place in '%s' which contains the contents '%s'. If the file is wrong, please remove it and setup.py will regenerate it and write '%s' into it." % (APPNAME, APPNAMEFILE, curappnamefilestr, APPNAMEFILESTR) sys.exit(-1) -setup_args = {} -if version: - setup_args["version"] = version - setup(name=APPNAME, + version=version, description='secure, decentralized, fault-tolerant filesystem', long_description=LONG_DESCRIPTION, author='the allmydata.org Tahoe project', @@ -376,10 +311,7 @@ packages=find_packages("src"), classifiers=trove_classifiers, test_suite="allmydata.test", - install_requires=install_requires, include_package_data=True, - setup_requires=setup_requires, entry_points = { 'console_scripts': [ 'tahoe = allmydata.scripts.runner:run' ] }, zip_safe=False, # We prefer unzipped for easier access. - **setup_args ) --- tahoe-lafs-1.6.0.orig/debian/copyright +++ tahoe-lafs-1.6.0/debian/copyright @@ -0,0 +1,237 @@ +This package was debianized by Brian Warner + +The upstream source of this project is http://allmydata.org . + +Upstream Author: + + Brian Warner + Zooko Wilcox-O'Hearn + and dozens of others + +Copyright © 2006-2009 +AllMyData, Inc. + +You may use this package under the GNU General Public License, version 2 or, at +your option, any later version. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +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. + +You may use this package under the Transitive Grace Period Public Licence, +version 1 or, at your option, any later version. The Transitive Grace Period +Public Licence has requirements similar to the GPL except that it allows you to +wait for up to twelve months after you redistribute a derived work before +releasing the source code of your derived work. See the file COPYING.TGPPL.html +for the terms of the Transitive Grace Period Public Licence, version 1. + +(You may choose to use this package under the terms of either licence, at your +option.) + +------- begin TGPPL1 licence + 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: + + Licensed under the Transitive Grace Period Public Licence version 1.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, + royalty-free, non-exclusive, sublicensable license, for the duration + of the copyright, to do the following: + a. to reproduce the Original Work in copies, either alone or as part + of a collective work; + b. to translate, adapt, alter, transform, modify, or arrange the + Original Work, thereby creating derivative works ("Derivative + Works") based upon the Original Work; + c. to distribute or communicate copies of the Original Work and + Derivative Works to the public, with the proviso that copies of + Original Work or Derivative Works that You distribute or + communicate shall be licensed under this Transitive Grace Period + Public Licence no later than 12 months after You distributed or + communicated said copies; + d. to perform the Original Work publicly; and + e. to display the Original Work publicly. + 2. Grant of Patent License. Licensor grants You a worldwide, + royalty-free, non-exclusive, sublicensable license, under patent + claims owned or controlled by the Licensor that are embodied in the + Original Work as furnished by the Licensor, for the duration of the + patents, to make, use, sell, offer for sale, have made, and import the + Original Work and Derivative Works. + 3. Grant of Source Code License. The term "Source Code" means the + preferred form of the Original Work for making modifications to it and + all available documentation describing how to modify the Original + Work. Licensor agrees to provide a machine-readable copy of the Source + Code of the Original Work along with each copy of the Original Work + that Licensor distributes. Licensor reserves the right to satisfy this + obligation by placing a machine-readable copy of the Source Code in an + information repository reasonably calculated to permit inexpensive and + convenient access by You for as long as Licensor continues to + distribute the Original Work. + 4. Exclusions From License Grant. Neither the names of Licensor, nor the + names of any contributors to the Original Work, nor any of their + trademarks or service marks, may be used to endorse or promote + products derived from this Original Work without express prior + permission of the Licensor. Except as expressly stated herein, nothing + in this License grants any license to Licensor's trademarks, + copyrights, patents, trade secrets or any other intellectual property. + No patent license is granted to make, use, sell, offer for sale, have + made, or import embodiments of any patent claims other than the + licensed claims defined in Section 2. No license is granted to the + trademarks of Licensor even if such marks are included in the Original + Work. Nothing in this License shall be interpreted to prohibit + Licensor from licensing under terms different from this License any + Original Work that Licensor otherwise would have a right to license. + 5. External Deployment. The term "External Deployment" means the use, + distribution, or communication of the Original Work or Derivative + Works in any way such that the Original Work or Derivative Works may + be used by anyone other than You, whether those works are distributed + or communicated to those persons or made available as an application + intended for use over a network. As an express condition for the + grants of license hereunder, You must treat any External Deployment by + You of the Original Work or a Derivative Work as a distribution under + section 1(c). + 6. Attribution Rights. You must retain, in the Source Code of any + Derivative Works that You create, all copyright, patent, or trademark + notices from the Source Code of the Original Work, as well as any + notices of licensing and any descriptive text identified therein as an + "Attribution Notice." You must cause the Source Code for any + Derivative Works that You create to carry a prominent Attribution + Notice reasonably calculated to inform recipients that You have + modified the Original Work. + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants + that the copyright in and to the Original Work and the patent rights + granted herein by Licensor are owned by the Licensor or are + sublicensed to You under the terms of this License with the permission + of the contributor(s) of those copyrights and patent rights. Except as + expressly stated in the immediately preceding sentence, the Original + Work is provided under this License on an "AS IS" BASIS and WITHOUT + WARRANTY, either express or implied, including, without limitation, + the warranties of non-infringement, merchantability or fitness for a + particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL + WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential + part of this License. No license to the Original Work is granted by + this License except under this disclaimer. + 8. Limitation of Liability. Under no circumstances and under no legal + theory, whether in tort (including negligence), contract, or + otherwise, shall the Licensor be liable to anyone for any indirect, + special, incidental, or consequential damages of any character arising + as a result of this License or the use of the Original Work including, + without limitation, damages for loss of goodwill, work stoppage, + computer failure or malfunction, or any and all other commercial + damages or losses. This limitation of liability shall not apply to the + extent applicable law prohibits such limitation. + 9. Acceptance and Termination. If, at any time, You expressly assented to + this License, that assent indicates your clear and irrevocable + acceptance of this License and all of its terms and conditions. If You + distribute or communicate copies of the Original Work or a Derivative + Work, You must make a reasonable effort under the circumstances to + obtain the express assent of recipients to the terms of this License. + This License conditions your rights to undertake the activities listed + in Section 1, including your right to create Derivative Works based + upon the Original Work, and doing so without honoring these terms and + conditions is prohibited by copyright law and international treaty. + Nothing in this License is intended to affect copyright exceptions and + limitations (including 'fair use' or 'fair dealing'). This License + shall terminate immediately and You may no longer exercise any of the + rights granted to You by this License upon your failure to honor the + conditions in Section 1(c). + 10. Termination for Patent Action. This License shall terminate + automatically and You may no longer exercise any of the rights granted + to You by this License as of the date You commence an action, + including a cross-claim or counterclaim, against Licensor or any + licensee alleging that the Original Work infringes a patent. This + termination provision shall not apply for an action alleging patent + infringement by combinations of the Original Work with other software + or hardware. + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to + this License may be brought only in the courts of a jurisdiction + wherein the Licensor resides or in which Licensor conducts its primary + business, and under the laws of that jurisdiction excluding its + conflict-of-law provisions. The application of the United Nations + Convention on Contracts for the International Sale of Goods is + expressly excluded. Any use of the Original Work outside the scope of + this License or after its termination shall be subject to the + requirements and penalties of copyright or patent law in the + appropriate jurisdiction. This section shall survive the termination + of this License. + 12. Attorneys' Fees. In any action to enforce the terms of this License or + seeking damages relating thereto, the prevailing party shall be + entitled to recover its costs and expenses, including, without + limitation, reasonable attorneys' fees and costs incurred in + connection with such action, including any appeal of such action. This + section shall survive the termination of this License. + 13. Miscellaneous. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. + 14. Definition of "You" in This License. "You" throughout this License, + whether in upper or lower case, means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License. For legal entities, "You" includes any entity that controls, + is controlled by, or is under common control with you. For purposes of + this definition, "control" means (i) the power, direct or indirect, to + cause the direction or management of such entity, whether by contract + or otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + 15. Right to Use. You may use the Original Work in all ways not otherwise + restricted or conditioned by this License or by law, and Licensor + promises not to interfere with or be responsible for such uses by You. + 16. Modification of This License. This License is Copyright (c) 2007 Zooko + Wilcox-O'Hearn. Permission is granted to copy, distribute, or + communicate this License without modification. Nothing in this License + permits You to modify this License as applied to the Original Work or + to Derivative Works. However, You may modify the text of this License + and copy, distribute or communicate your modified version (the + "Modified License") and apply it to other original works of authorship + subject to the following conditions: (i) You may not indicate in any + way that your Modified License is the "Transitive Grace Period Public + Licence" or "TGPPL" and you may not use those names in the name of + your Modified License; and (ii) You must replace the notice specified + in the first paragraph above with the notice "Licensed under " or with + a notice of your own that is not confusingly similar to the notice in + this License. +------- end TGPPL1 licence + +The files mac/fuse.py and mac/fuseparts/subbedopts.py are licensed under +the GNU Lesser General Public Licence. In addition, on 2009-09-21 Csaba +Henk granted permission for those files to be under the same terms as +Tahoe-LAFS itself. + +See /usr/share/common-licenses/GPL for a copy of the GNU General Public +License, and /usr/share/common-licenses/LGPL for the GNU Lesser General Public +License. + +The file src/allmydata/util/figleaf.py is licensed under the BSD licence. + +------- begin BSD licence +Copyright (c) , +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of the nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +------- end BSD licence + + +The file src/allmydata/util/statistics.py was originally licensed under the +GPL3, but on 2009-09-21 its author Shawn Willden declared: "I hereby license +all patches I have contributed or will contribute to the Allmydata Tahoe-LAFS +project, including the file 'statistics.py', under both the GNU General Public +License, version 2 or later, and under the Transitive Grace Period Public +License, version 1 or later." + +The original author of file src/allmydata/util/mathutil.py , Zooko +Wilcox-O'Hearn, granted full rights to allmydata.com to re-license it as +they see fit, and they reclicensed it the same terms as Tahoe-LAFS +itself: you may use it under GPL version 2 or greater at your option or +under TGPPL version 1 or greater at your option. --- tahoe-lafs-1.6.0.orig/debian/control +++ tahoe-lafs-1.6.0/debian/control @@ -0,0 +1,32 @@ +Source: tahoe-lafs +Section: utils +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Brian Warner +Build-Depends: debhelper (>= 7), python-support, python-setuptools, + python (>= 2.5) +XS-Python-Version: >= 2.5 +Standards-Version: 3.8.3 +Homepage: http://allmydata.org/trac/tahoe + +Package: tahoe-lafs +Architecture: all +Depends: ${python:Depends}, python-twisted, python-foolscap (>= 0.4.1), + python-openssl, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), + python-pycryptopp (>= 0.5.14), python-setuptools +XB-Python-Version: >= 2.5 +Description: secure distributed filesystem + Tahoe, the Least Authority File System, is a distributed filesystem that + features high reliability, strong security properties, and a fine-grained + sharing model. Files are encrypted, signed, erasure-coded, then distributed + over multiple servers, such that any (configurable) subset of the servers + will be sufficient to recover the data. The default 3-of-10 configuration + tolerates up to 7 server failures before data becomes unrecoverable. + . + Tahoe offers "provider-independent security": the confidentiality and + integrity of your data do not depend upon the behavior of the servers. The + use of erasure-coding means that reliability and availability depend only + upon a subset of the servers. + . + Tahoe files are accessed through a RESTful web API, a human-oriented web + server interface, and CLI tools. --- tahoe-lafs-1.6.0.orig/debian/gbp.conf +++ tahoe-lafs-1.6.0/debian/gbp.conf @@ -0,0 +1,5 @@ +[git-buildpackage] +debian-branch = karmic +builder = debuild -i\.git -I.git -uc -us +export-dir = ../karmic-build-area/ +pristine-tar = True --- tahoe-lafs-1.6.0.orig/debian/compat +++ tahoe-lafs-1.6.0/debian/compat @@ -0,0 +1 @@ +5 --- tahoe-lafs-1.6.0.orig/debian/changelog +++ tahoe-lafs-1.6.0/debian/changelog @@ -0,0 +1,18 @@ +tahoe-lafs (1.6.0-0ubuntu1) lucid; urgency=low + + * Update to version 1.6 (LP: #516744). + - Deep immutable directories. + - `tahoe backup` now creates immutable directories. + - `create-node` command added. + - `create-client` now implies --no-storage. + * debian/rules: fix find call. + + -- Paul Hummer Wed, 03 Feb 2010 19:36:39 -0700 + +tahoe-lafs (1.5.0-0ubuntu1) karmic; urgency=low + + * Initial release (LP: #417136). + * Relax pycryptopp dependency to 0.5.14, to help it get into Karmic. + * Add missing license statements. + + -- Zooko O'Whielacronx (Hacker) Thu, 24 Sep 2009 00:00:05 -0600 --- tahoe-lafs-1.6.0.orig/debian/watch +++ tahoe-lafs-1.6.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://cheeseshop.python.org/packages/source/a/allmydata-tahoe/allmydata-tahoe-(.*)\.tar\.gz --- tahoe-lafs-1.6.0.orig/debian/docs +++ tahoe-lafs-1.6.0/debian/docs @@ -0,0 +1,2 @@ +README +docs/* --- tahoe-lafs-1.6.0.orig/debian/rules +++ tahoe-lafs-1.6.0/debian/rules @@ -0,0 +1,67 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \ + | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1) +package=tahoe-lafs + +get-orig-source: + echo $(DEB_UPSTREAM_VERSION) + wget http://cheeseshop.python.org/packages/source/a/allmydata-tahoe/allmydata-tahoe-$(DEB_UPSTREAM_VERSION).tar.gz + mv allmydata-tahoe-$(DEB_UPSTREAM_VERSION).tar.gz $(package)_$(DEB_UPSTREAM_VERSION).orig.tar.gz + +clean: + rm -f build-* + dh_testdir + dh_testroot + python setup.py clean + rm -rf build + find . -name "*\.py[co]" -exec rm -f {} \; + dh_clean + +build: build-indep + +build-indep: + touch $@ + +build-stamp: + dh_testdir + python setup.py build + touch $@ + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + python setup.py install \ + --no-compile \ + --install-layout=deb \ + --single-version-externally-managed \ + --root $(CURDIR)/debian/$(package) + +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs +# mv debian/$(package)/usr/share/doc/$(package)/CHANGES.txt \ +# debian/$(package)/usr/share/doc/$(package)/changelog + dh_installexamples + dh_strip + dh_compress -X.py + dh_fixperms + dh_pysupport + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-arch: + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure