Update to:

Release 1.10.0 (2013-05-01)
'''''''''''''''''''''''''''

New Features
------------

- The Welcome page has been redesigned. This is a preview of the design style
  that is likely to be used in other parts of the WUI in future Tahoe-LAFS
  versions. (`#1713`_, `#1457`_, `#1735`_)
- A new extensible Introducer protocol has been added, as the basis for
  future improvements such as accounting. Compatibility with older nodes is
  not affected. When server, introducer, and client are all upgraded, the
  welcome page will show node IDs that start with "v0-" instead of the old
  tubid. See `<docs/nodekeys.rst>`__ for details. (`#466`_)
- The web-API has a new ``relink`` operation that supports directly moving
  files between directories. (`#1579`_)

Security Improvements
---------------------

- The ``introducer.furl`` for new Introducers is now unguessable. In previous
  releases, this FURL used a predictable swissnum, allowing a network
  eavesdropper who observes any node connecting to the Introducer to access
  the Introducer themselves, and thus use servers or offer storage service to
  clients (i.e. "join the grid"). In the new code, the only way to join a
  grid is to be told the ``introducer.furl`` by someone who already knew it.
  Note that pre-existing introducers are not changed. To force an introducer
  to generate a new FURL, delete the existing ``introducer.furl`` file and
  restart it. After doing this, the ``[client]introducer.furl`` setting of
  every client and server that should connect to that introducer must be
  updated. Note that other users of a shared machine may be able to read
  ``introducer.furl`` from your ``tahoe.cfg`` file unless you configure the
  file permissions to prevent them. (`#1802`_)
- Both ``introducer.furl`` and ``helper.furl`` are now censored from the
  Welcome page, to prevent users of your gateway from learning enough to
  create gateway nodes of their own.  For existing guessable introducer
  FURLs, the ``introducer`` swissnum is still displayed to show that a
  guessable FURL is in use. (`#860`_)

Command-line Syntax Changes
---------------------------

- Global options to ``tahoe``, such as ``-d``/``--node-directory``, must now
  come before rather than after the command name (for example,
  ``tahoe -d BASEDIR cp -r foo: bar:`` ). (`#166`_)

Notable Bugfixes
----------------

- In earlier versions, if a connection problem caused a download failure for
  an immutable file, subsequent attempts to download the same file could also
  fail. This is now fixed. (`#1679`_)
- Filenames in WUI directory pages are now displayed correctly when they
  contain characters that require HTML escaping. (`#1143`_)
- Non-ASCII node nicknames no longer cause WUI errors. (`#1298`_)
- Checking a LIT file using ``tahoe check`` no longer results in an
  exception. (`#1758`_)
- The SFTP frontend now works with recent versions of Twisted, rather than
  giving errors or warnings about use of ``IFinishableConsumer``. (`#1926`_,
  `#1564`_, `#1525`_)
- ``tahoe cp --verbose`` now counts the files being processed correctly.
  (`#1805`_, `#1783`_)
- Exceptions no longer trigger an unhelpful crash reporter on Ubuntu 12.04
  ("Precise") or later. (`#1746`_)
- The error message displayed when a CLI tool cannot connect to a gateway has
  been improved. (`#974`_)
- Other minor fixes: `#1781`_, `#1812`_, `#1915`_, `#1484`_, `#1525`_

Other Changes
-------------

- The provisioning/reliability pages were removed from the main client's web
  interface, and moved into a standalone web-based tool. Use the ``run.py``
  script in ``misc/operations_helpers/provisioning/`` to access them.
- Web clients can now cache (ETag) immutable directory pages. (`#443`_)
- `<docs/convergence_secret.rst>`__ was added to document the adminstration
  of convergence secrets. (`#1761`_)

4 files changed, 30 insertions, 41 deletions

diff --git a/filesystems/tahoe-lafs/Makefile b/filesystems/tahoe-lafs/Makefile
index 385ff345fec..9bfcbdc41b1 100644
--- a/filesystems/tahoe-lafs/Makefile
+++ b/filesystems/tahoe-lafs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2012/10/03 16:08:33 asau Exp $
+# $NetBSD: Makefile,v 1.15 2013/05/01 23:59:53 gdt Exp $
 #
 
-VERSION=	1.9.2
+VERSION=	1.10.0
 DISTNAME=	allmydata-tahoe-${VERSION}
 EGG_NAME=	allmydata_tahoe-${VERSION}
 PKGNAME=	tahoe-lafs-${VERSION}
@@ -25,13 +25,14 @@ TEST_TARGET=	test
 # TODO
 # fix nevow: doc location
 
+# Included egg darcsver, but depend anyway.
+BUILD_DEPENDS+=	${PYPKGPREFIX}-darcsver-[0-9]*:../../devel/py-darcsver
+
 DEPENDS+=	${PYPKGPREFIX}-zfec-[0-9]*:../../converters/py-zfec
 DEPENDS+=	${PYPKGPREFIX}-zbase32-[0-9]*:../../converters/py-zbase32
 DEPENDS+=	${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
 DEPENDS+=	${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
 DEPENDS+=	${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
-# Included egg darcsver, but depend anyway.
-DEPENDS+=	${PYPKGPREFIX}-darcsver-[0-9]*:../../devel/py-darcsver
 DEPENDS+=	${PYPKGPREFIX}-pyutil-[0-9]*:../../devel/py-pyutil
 DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 # Included egg setuptools_trial, not used.
diff --git a/filesystems/tahoe-lafs/PLIST b/filesystems/tahoe-lafs/PLIST
index 0ced2923614..d79018835fa 100644
--- a/filesystems/tahoe-lafs/PLIST
+++ b/filesystems/tahoe-lafs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/07/07 00:34:18 gdt Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/05/01 23:59:53 gdt Exp $
 bin/tahoe
 ${PYSITELIB}/allmydata/__init__.py
 ${PYSITELIB}/allmydata/__init__.pyc
@@ -114,9 +114,15 @@ ${PYSITELIB}/allmydata/introducer/__init__.pyo
 ${PYSITELIB}/allmydata/introducer/client.py
 ${PYSITELIB}/allmydata/introducer/client.pyc
 ${PYSITELIB}/allmydata/introducer/client.pyo
+${PYSITELIB}/allmydata/introducer/common.py
+${PYSITELIB}/allmydata/introducer/common.pyc
+${PYSITELIB}/allmydata/introducer/common.pyo
 ${PYSITELIB}/allmydata/introducer/interfaces.py
 ${PYSITELIB}/allmydata/introducer/interfaces.pyc
 ${PYSITELIB}/allmydata/introducer/interfaces.pyo
+${PYSITELIB}/allmydata/introducer/old.py
+${PYSITELIB}/allmydata/introducer/old.pyc
+${PYSITELIB}/allmydata/introducer/old.pyo
 ${PYSITELIB}/allmydata/introducer/server.py
 ${PYSITELIB}/allmydata/introducer/server.pyc
 ${PYSITELIB}/allmydata/introducer/server.pyo
@@ -162,15 +168,12 @@ ${PYSITELIB}/allmydata/node.pyo
 ${PYSITELIB}/allmydata/nodemaker.py
 ${PYSITELIB}/allmydata/nodemaker.pyc
 ${PYSITELIB}/allmydata/nodemaker.pyo
-${PYSITELIB}/allmydata/provisioning.py
-${PYSITELIB}/allmydata/provisioning.pyc
-${PYSITELIB}/allmydata/provisioning.pyo
-${PYSITELIB}/allmydata/reliability.py
-${PYSITELIB}/allmydata/reliability.pyc
-${PYSITELIB}/allmydata/reliability.pyo
 ${PYSITELIB}/allmydata/scripts/__init__.py
 ${PYSITELIB}/allmydata/scripts/__init__.pyc
 ${PYSITELIB}/allmydata/scripts/__init__.pyo
+${PYSITELIB}/allmydata/scripts/admin.py
+${PYSITELIB}/allmydata/scripts/admin.pyc
+${PYSITELIB}/allmydata/scripts/admin.pyo
 ${PYSITELIB}/allmydata/scripts/backupdb.py
 ${PYSITELIB}/allmydata/scripts/backupdb.pyc
 ${PYSITELIB}/allmydata/scripts/backupdb.pyo
@@ -387,9 +390,6 @@ ${PYSITELIB}/allmydata/test/test_node.pyo
 ${PYSITELIB}/allmydata/test/test_observer.py
 ${PYSITELIB}/allmydata/test/test_observer.pyc
 ${PYSITELIB}/allmydata/test/test_observer.pyo
-${PYSITELIB}/allmydata/test/test_provisioning.py
-${PYSITELIB}/allmydata/test/test_provisioning.pyc
-${PYSITELIB}/allmydata/test/test_provisioning.pyo
 ${PYSITELIB}/allmydata/test/test_repairer.py
 ${PYSITELIB}/allmydata/test/test_repairer.pyc
 ${PYSITELIB}/allmydata/test/test_repairer.pyo
@@ -486,6 +486,9 @@ ${PYSITELIB}/allmydata/util/idlib.pyo
 ${PYSITELIB}/allmydata/util/iputil.py
 ${PYSITELIB}/allmydata/util/iputil.pyc
 ${PYSITELIB}/allmydata/util/iputil.pyo
+${PYSITELIB}/allmydata/util/keyutil.py
+${PYSITELIB}/allmydata/util/keyutil.pyc
+${PYSITELIB}/allmydata/util/keyutil.pyo
 ${PYSITELIB}/allmydata/util/limiter.py
 ${PYSITELIB}/allmydata/util/limiter.pyc
 ${PYSITELIB}/allmydata/util/limiter.pyo
@@ -571,17 +574,14 @@ ${PYSITELIB}/allmydata/web/map-update-status.xhtml
 ${PYSITELIB}/allmydata/web/operations.py
 ${PYSITELIB}/allmydata/web/operations.pyc
 ${PYSITELIB}/allmydata/web/operations.pyo
-${PYSITELIB}/allmydata/web/provisioning.xhtml
 ${PYSITELIB}/allmydata/web/publish-status.xhtml
-${PYSITELIB}/allmydata/web/reliability.py
-${PYSITELIB}/allmydata/web/reliability.pyc
-${PYSITELIB}/allmydata/web/reliability.pyo
-${PYSITELIB}/allmydata/web/reliability.xhtml
 ${PYSITELIB}/allmydata/web/rename-form.xhtml
 ${PYSITELIB}/allmydata/web/retrieve-status.xhtml
 ${PYSITELIB}/allmydata/web/root.py
 ${PYSITELIB}/allmydata/web/root.pyc
 ${PYSITELIB}/allmydata/web/root.pyo
+${PYSITELIB}/allmydata/web/static/css/bootstrap.css
+${PYSITELIB}/allmydata/web/static/css/new-tahoe.css
 ${PYSITELIB}/allmydata/web/static/d3-2.4.6.min.js
 ${PYSITELIB}/allmydata/web/static/d3-2.4.6.time.min.js
 ${PYSITELIB}/allmydata/web/static/download_status_timeline.js
@@ -625,3 +625,9 @@ ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/buildtest/__init__.py
+${PYSITELIB}/buildtest/__init__.pyc
+${PYSITELIB}/buildtest/__init__.pyo
+${PYSITELIB}/buildtest/test_build_with_fake_dist.py
+${PYSITELIB}/buildtest/test_build_with_fake_dist.pyc
+${PYSITELIB}/buildtest/test_build_with_fake_dist.pyo
diff --git a/filesystems/tahoe-lafs/distinfo b/filesystems/tahoe-lafs/distinfo
index 0b4e39ff756..fdf7492119b 100644
--- a/filesystems/tahoe-lafs/distinfo
+++ b/filesystems/tahoe-lafs/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2012/07/07 00:34:18 gdt Exp $
+$NetBSD: distinfo,v 1.9 2013/05/01 23:59:53 gdt Exp $
 
-SHA1 (allmydata-tahoe-1.9.2.tar.bz2) = 5101f527042fbcb4d27712ac1f4480d675e3c8a6
-RMD160 (allmydata-tahoe-1.9.2.tar.bz2) = 78d3cc85072a98b09a87bd6918972aedfe3e5b00
-Size (allmydata-tahoe-1.9.2.tar.bz2) = 1139559 bytes
-SHA1 (patch-aa) = 38b8a3e75ea9f948ae6da27abd227233d9a45697
+SHA1 (allmydata-tahoe-1.10.0.tar.bz2) = 9932ddc1d364a1efe8afddf83572b4de0329f1fc
+RMD160 (allmydata-tahoe-1.10.0.tar.bz2) = bf7aa8f3e09ae1feb7bcec0847e64a5a840d3893
+Size (allmydata-tahoe-1.10.0.tar.bz2) = 1174044 bytes
diff --git a/filesystems/tahoe-lafs/patches/patch-aa b/filesystems/tahoe-lafs/patches/patch-aa
deleted file mode 100644
index 9c1a48cca1a..00000000000
--- a/filesystems/tahoe-lafs/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2012/07/07 00:34:18 gdt Exp $
-
-Upstream incorrectly installs test code.  Patch from David-Sarah
-Hopwood (of upstream) in private mail.
-
---- setup.py.orig	2012-05-31 22:25:33.000000000 +0000
-+++ setup.py
-@@ -467,8 +467,7 @@ setup(name=APPNAME,
-                 'allmydata.util',
-                 'allmydata.web',
-                 'allmydata.web.static',
--                'allmydata.windows',
--                'buildtest'],
-+                'allmydata.windows'],
-       classifiers=trove_classifiers,
-       test_suite="allmydata.test",
-       install_requires=install_requires,