pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

tahoe: Update to 1.16.0rc0



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Aug 31 13:04:00 2021 -0400
Changeset:	9574161cda72677d75c95aa4ca6fccddc6ccdd80

Modified Files:
	tahoe-lafs/Makefile
	tahoe-lafs/PLIST
	tahoe-lafs/distinfo
Removed Files:
	tahoe-lafs/patches/patch-setup.py
	tahoe-lafs/patches/patch-src_allmydata___auto__deps.py
	tahoe-lafs/patches/patch-src_allmydata_scripts_create__node.py
	tahoe-lafs/patches/patch-src_allmydata_scripts_tahoe__invite.py

Log Message:
tahoe: Update to 1.16.0rc0

Release 1.16.0 (2021-08-26)
'''''''''''''''''''''''''''

Backwards Incompatible Changes
------------------------------

- The Tahoe command line now always uses UTF-8 to decode its arguments, regardless of locale. (`#3588 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3588>`_)
- tahoe backup's --exclude-from has been renamed to --exclude-from-utf-8, and correspondingly requires the file to be UTF-8 encoded. (`#3716 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3716>`_)

Features
--------

- Added 'typechecks' environment for tox running mypy and performing static typechecks. (`#3399 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3399>`_)
- The NixOS-packaged Tahoe-LAFS now knows its own version. (`#3629 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3629>`_)

Bug Fixes
---------

- Fix regression that broke flogtool results on Python 2. (`#3509 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3509>`_)
- Fix a logging regression on Python 2 involving unicode strings. (`#3510 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3510>`_)
- Certain implementation-internal weakref KeyErrors are now handled and should no longer cause user-initiated operations to fail. (`#3539 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3539>`_)
- SFTP public key auth likely works more consistently, and SFTP in general was previously broken. (`#3584 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3584>`_)
- Fixed issue where redirecting old-style URIs (/uri/?uri=...) didn't work. (`#3590 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3590>`_)
- ``tahoe invite`` will now read share encoding/placement configuration values from a Tahoe client node configuration file if they are not given on the command line, instead of raising an unhandled exception. (`#3650 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3650>`_)
- Fix regression where uploading files with non-ASCII names failed. (`#3738 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3738>`_)
- Fixed annoying UnicodeWarning message on Python 2 when running CLI tools. (`#3739 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3739>`_)

Dependency/Installation Changes
-------------------------------

- Tahoe-LAFS now requires Twisted 19.10.0 or newer.  As a result, it now has a transitive dependency on bcrypt. (`#1549 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1549>`_)
- Debian 8 support has been replaced with Debian 10 support. (`#3326 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3326>`_)
- Tahoe-LAFS no longer depends on Nevow. (`#3433 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3433>`_)
- Tahoe-LAFS now requires the `netifaces` Python package and no longer requires the external `ip`, `ifconfig`, or `route.exe` executables. (`#3486 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3486>`_)
- The Tahoe-LAFS project no longer commits to maintaining binary packages for all dependencies at <https://tahoe-lafs.org/deps>.  Please use PyPI instead. (`#3497 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3497>`_)
- Tahoe-LAFS now uses a forked version of txi2p (named txi2p-tahoe) with Python 3 support. (`#3633 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3633>`_)
- The Nix package now includes correct version information. (`#3712 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3712>`_)
- Use netifaces 0.11.0 wheel package from PyPI.org if you use 64-bit Python 2.7 on Windows.  VCPython27 downloads are no longer available at Microsoft's website, which has made building Python 2.7 wheel packages of Python libraries with C extensions (such as netifaces) on Windows difficult. (`#3733 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3733>`_)

Configuration Changes
---------------------

- The ``[client]introducer.furl`` configuration item is now deprecated in favor of the ``private/introducers.yaml`` file. (`#3504 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3504>`_)

Documentation Changes
---------------------

-  (`#3659 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3659>`_)
- Documentation now has its own towncrier category. (`#3664 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3664>`_)
- `tox -e docs` will treat warnings about docs as errors. (`#3666 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3666>`_)
- The visibility of the Tahoe-LAFS logo has been improved for "dark" themed viewing. (`#3677 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3677>`_)
- A cheatsheet-style document for contributors was created at CONTRIBUTORS.rst (`#3682 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3682>`_)
- Our IRC channel, #tahoe-lafs, has been moved to irc.libera.chat. (`#3721 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3721>`_)
- Tahoe-LAFS project is now registered with Libera.Chat IRC network. (`#3726 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3726>`_)
- Rewriting the installation guide for Tahoe-LAFS. (`#3747 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3747>`_)
- The Great Black Swamp proposed specification now includes sample interactions to demonstrate expected usage patterns. (`#3764 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3764>`_)
- The Great Black Swamp proposed specification now includes a glossary. (`#3765 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3765>`_)

Removed Features
----------------

- Announcements delivered through the introducer system are no longer automatically annotated with copious information about the Tahoe-LAFS software version nor the versions of its dependencies. (`#3518 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3518>`_)
- The stats gatherer, broken since at least Tahoe-LAFS 1.13.0, has been removed.  The ``[client]stats_gatherer.furl`` configuration item in ``tahoe.cfg`` is no longer allowed.  The Tahoe-LAFS project recommends using a third-party metrics aggregation tool instead. (`#3549 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3549>`_)
- The deprecated ``tahoe`` start, restart, stop, and daemonize sub-commands have been removed. (`#3550 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3550>`_)
- FTP is no longer supported by Tahoe-LAFS. Please use the SFTP support instead. (`#3583 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3583>`_)
- Removed support for the Account Server frontend authentication type. (`#3652 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3652>`_)

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

- The "Great Black Swamp" proposed specification has been expanded to include two lease management APIs. (`#3037 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3037>`_)
- The specification section of the Tahoe-LAFS documentation now includes explicit discussion of the security properties of Foolscap "fURLs" on which it depends. (`#3503 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3503>`_)
- The README, revised by Viktoriia with feedback from the team, is now more focused on the developer community and provides more information about Tahoe-LAFS, why it's important, and how someone can use it or start contributing to it. (`#3545 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3545>`_)
- The "Great Black Swamp" proposed specification has been changed use ``v=1`` as the URL version identifier. (`#3644 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3644>`_)
- You can run `make livehtml` in docs directory to invoke sphinx-autobuild. (`#3663 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3663>`_)
- Refactored test_introducer in web tests to use custom base test cases (`#3757 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3757>`_)

Release 1.15.1
''''''''''''''

Misc/Other
----------

- `#3469 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3469>`_, `#3608 <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3608>`_

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9574161cda72677d75c95aa4ca6fccddc6ccdd80

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tahoe-lafs/Makefile                                |  52 ++++-----
 tahoe-lafs/PLIST                                   | 122 ++++++---------------
 tahoe-lafs/distinfo                                |  12 +-
 tahoe-lafs/patches/patch-setup.py                  |  13 ---
 .../patches/patch-src_allmydata___auto__deps.py    |  13 ---
 .../patch-src_allmydata_scripts_create__node.py    |  13 ---
 .../patch-src_allmydata_scripts_tahoe__invite.py   |  13 ---
 7 files changed, 63 insertions(+), 175 deletions(-)

diffs:
diff --git a/tahoe-lafs/Makefile b/tahoe-lafs/Makefile
index cefbc14855..930ebe63f3 100644
--- a/tahoe-lafs/Makefile
+++ b/tahoe-lafs/Makefile
@@ -1,7 +1,8 @@
 # $NetBSD: Makefile,v 1.47 2021/03/18 23:23:31 gdt Exp $
 
-DISTNAME=	tahoe-lafs-1.15.0
-PKGREVISION=	1
+VERSION_BASE=	1.16.0
+VERSION_RC=	rc0
+DISTNAME=	tahoe-lafs-${VERSION_BASE}${VERSION_RC}
 CATEGORIES=	filesystems
 MASTER_SITES=	https://tahoe-lafs.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,41 +14,42 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS=	gmake
 
-# \todo: fix nevow doc location
+# tahoe works with 27, but we depend on things which are
+# not available for 27 in pkgsrc.
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-PYTHON_VERSIONS_ACCEPTED=	27 # py-xml via py-nevow, py-zbase32, py-cryptopp
+# The world sees this as part of base python.
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 # from tahoe's setup.py
 DEPENDS+=	${PYPKGPREFIX}-zfec>=1.1.0:../../converters/py-zfec
-# \todo zope.interface
-DEPENDS+=	${PYPKGPREFIX}-foolscap>=0.12.6:../../net/py-foolscap
-DEPENDS+=	${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
-DEPENDS+=	${PYPKGPREFIX}-twisted>=16.1.0:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-ZopeInterface>=3.6.0:../../devel/py-ZopeInterface
+DEPENDS+=	${PYPKGPREFIX}-foolscap>=21.7.0:../../net/py-foolscap
+DEPENDS+=	${PYPKGPREFIX}-cryptography>=2.6:../../security/py-cryptography
+# \todo twisted needs tls, conch options
+DEPENDS+=	${PYPKGPREFIX}-twisted>=19.1.0:../../net/py-twisted
 # bcrypt and appdirs required as twisted deps at runtime
 DEPENDS+=	${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
 DEPENDS+=	${PYPKGPREFIX}-appdirs-[0-9]*:../../devel/py-appdirs
-DEPENDS+=	${PYPKGPREFIX}-nevow>=0.11.1:../../www/py-nevow
 DEPENDS+=	${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
-DEPENDS+=	${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
-# magic wormhole does not support 2.7 because its deps are not versioned
-#DEPENDS+=	${PYPKGPREFIX}-magic-wormhole-[0-9]*:../../net/py-magic-wormhole
-DEPENDS+=	${PYPKGPREFIX}-eliot-[0-9]*:../../sysutils/py-eliot17
+DEPENDS+=	${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-magic-wormhole>=0.10.2:../../net/py-magic-wormhole
+DEPENDS+=	${PYPKGPREFIX}-eliot>=1.13.0:../../sysutils/py-eliot
 DEPENDS+=	${PYPKGPREFIX}-pyrsistent-[0-9]*:../../devel/py-pyrsistent
-# \todo pyrsistent
-# \todo attrs
-# autobahn D2019.09.20.04.00.00
-#DEPENDS+=	${PYPKGPREFIX}-autobahn-[0-9]*:../../www/py-autobahn
-DEPENDS+=	${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
-DEPENDS+=	${PYPKGPREFIX}-pyutil-[0-9]*:../../devel/py-pyutil
-DEPENDS+=	${PYPKGPREFIX}-distro-[0-9]*:../../devel/py-distro
+DEPENDS+=	${PYPKGPREFIX}-attrs>=18.2.0:../../devel/py-attrs
+DEPENDS+=	${PYPKGPREFIX}-autobahn>=19.5.2:../../www/py-autobahn
+DEPENDS+=	${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future
+DEPENDS+=	${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces
+DEPENDS+=	${PYPKGPREFIX}-pyutil>=3.3.0:../../devel/py-pyutil
+DEPENDS+=	${PYPKGPREFIX}-distro>=1.4.0:../../devel/py-distro
 
-# 19.0.0 from 2020-01-01 works with 27
-# \todo import/version an older one
-#DEPENDS+=	${PYPKGPREFIX}-txtorcon-[0-9]*:../../net/py-txtorcon
 
-# todo txi2p
+# tor option
+DEPENDS+=	${PYPKGPREFIX}-txtorcon>=0.17.0:../../net/py-txtorcon
 
+# \todo txi2p: not yet in a release, not in pkgsrc
+
+# \tood Decide why these are here and prune.
 # Not in setup.py, but seems to exist elsewhere.
 #DEPENDS+=	${PYPKGPREFIX}-asn1>=0.1.8:../../security/py-asn1
 #DEPENDS+=	${PYPKGPREFIX}-asn1-modules>=0.0.5:../../security/py-asn1-modules
@@ -66,7 +68,7 @@ PKG_GECOS.tahoes=	tahoe server
 
 # \todo Convert do-test to use tox
 #do-test:
-#	cd ${WRKSRC} && py.test-2.7
+#	cd ${WRKSRC} && py.test-3.8
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/tahoe-lafs/PLIST b/tahoe-lafs/PLIST
index 1ee6b7f705..5aaa62dd1a 100644
--- a/tahoe-lafs/PLIST
+++ b/tahoe-lafs/PLIST
@@ -60,9 +60,6 @@ ${PYSITELIB}/allmydata/frontends/__init__.pyo
 ${PYSITELIB}/allmydata/frontends/auth.py
 ${PYSITELIB}/allmydata/frontends/auth.pyc
 ${PYSITELIB}/allmydata/frontends/auth.pyo
-${PYSITELIB}/allmydata/frontends/ftpd.py
-${PYSITELIB}/allmydata/frontends/ftpd.pyc
-${PYSITELIB}/allmydata/frontends/ftpd.pyo
 ${PYSITELIB}/allmydata/frontends/sftpd.py
 ${PYSITELIB}/allmydata/frontends/sftpd.pyc
 ${PYSITELIB}/allmydata/frontends/sftpd.pyo
@@ -207,18 +204,12 @@ ${PYSITELIB}/allmydata/scripts/debug.pyo
 ${PYSITELIB}/allmydata/scripts/default_nodedir.py
 ${PYSITELIB}/allmydata/scripts/default_nodedir.pyc
 ${PYSITELIB}/allmydata/scripts/default_nodedir.pyo
-${PYSITELIB}/allmydata/scripts/run_common.py
-${PYSITELIB}/allmydata/scripts/run_common.pyc
-${PYSITELIB}/allmydata/scripts/run_common.pyo
 ${PYSITELIB}/allmydata/scripts/runner.py
 ${PYSITELIB}/allmydata/scripts/runner.pyc
 ${PYSITELIB}/allmydata/scripts/runner.pyo
 ${PYSITELIB}/allmydata/scripts/slow_operation.py
 ${PYSITELIB}/allmydata/scripts/slow_operation.pyc
 ${PYSITELIB}/allmydata/scripts/slow_operation.pyo
-${PYSITELIB}/allmydata/scripts/stats_gatherer.py
-${PYSITELIB}/allmydata/scripts/stats_gatherer.pyc
-${PYSITELIB}/allmydata/scripts/stats_gatherer.pyo
 ${PYSITELIB}/allmydata/scripts/tahoe_add_alias.py
 ${PYSITELIB}/allmydata/scripts/tahoe_add_alias.pyc
 ${PYSITELIB}/allmydata/scripts/tahoe_add_alias.pyo
@@ -231,9 +222,6 @@ ${PYSITELIB}/allmydata/scripts/tahoe_check.pyo
 ${PYSITELIB}/allmydata/scripts/tahoe_cp.py
 ${PYSITELIB}/allmydata/scripts/tahoe_cp.pyc
 ${PYSITELIB}/allmydata/scripts/tahoe_cp.pyo
-${PYSITELIB}/allmydata/scripts/tahoe_daemonize.py
-${PYSITELIB}/allmydata/scripts/tahoe_daemonize.pyc
-${PYSITELIB}/allmydata/scripts/tahoe_daemonize.pyo
 ${PYSITELIB}/allmydata/scripts/tahoe_get.py
 ${PYSITELIB}/allmydata/scripts/tahoe_get.pyc
 ${PYSITELIB}/allmydata/scripts/tahoe_get.pyo
@@ -255,27 +243,21 @@ ${PYSITELIB}/allmydata/scripts/tahoe_mv.pyo
 ${PYSITELIB}/allmydata/scripts/tahoe_put.py
 ${PYSITELIB}/allmydata/scripts/tahoe_put.pyc
 ${PYSITELIB}/allmydata/scripts/tahoe_put.pyo
-${PYSITELIB}/allmydata/scripts/tahoe_restart.py
-${PYSITELIB}/allmydata/scripts/tahoe_restart.pyc
-${PYSITELIB}/allmydata/scripts/tahoe_restart.pyo
 ${PYSITELIB}/allmydata/scripts/tahoe_run.py
 ${PYSITELIB}/allmydata/scripts/tahoe_run.pyc
 ${PYSITELIB}/allmydata/scripts/tahoe_run.pyo
-${PYSITELIB}/allmydata/scripts/tahoe_start.py
-${PYSITELIB}/allmydata/scripts/tahoe_start.pyc
-${PYSITELIB}/allmydata/scripts/tahoe_start.pyo
 ${PYSITELIB}/allmydata/scripts/tahoe_status.py
 ${PYSITELIB}/allmydata/scripts/tahoe_status.pyc
 ${PYSITELIB}/allmydata/scripts/tahoe_status.pyo
-${PYSITELIB}/allmydata/scripts/tahoe_stop.py
-${PYSITELIB}/allmydata/scripts/tahoe_stop.pyc
-${PYSITELIB}/allmydata/scripts/tahoe_stop.pyo
 ${PYSITELIB}/allmydata/scripts/tahoe_unlink.py
 ${PYSITELIB}/allmydata/scripts/tahoe_unlink.pyc
 ${PYSITELIB}/allmydata/scripts/tahoe_unlink.pyo
 ${PYSITELIB}/allmydata/scripts/tahoe_webopen.py
 ${PYSITELIB}/allmydata/scripts/tahoe_webopen.pyc
 ${PYSITELIB}/allmydata/scripts/tahoe_webopen.pyo
+${PYSITELIB}/allmydata/scripts/types_.py
+${PYSITELIB}/allmydata/scripts/types_.pyc
+${PYSITELIB}/allmydata/scripts/types_.pyo
 ${PYSITELIB}/allmydata/stats.py
 ${PYSITELIB}/allmydata/stats.pyc
 ${PYSITELIB}/allmydata/stats.pyo
@@ -312,21 +294,9 @@ ${PYSITELIB}/allmydata/storage_client.pyo
 ${PYSITELIB}/allmydata/test/__init__.py
 ${PYSITELIB}/allmydata/test/__init__.pyc
 ${PYSITELIB}/allmydata/test/__init__.pyo
-${PYSITELIB}/allmydata/test/_twisted_9607.py
-${PYSITELIB}/allmydata/test/_twisted_9607.pyc
-${PYSITELIB}/allmydata/test/_twisted_9607.pyo
-${PYSITELIB}/allmydata/test/check_grid.py
-${PYSITELIB}/allmydata/test/check_grid.pyc
-${PYSITELIB}/allmydata/test/check_grid.pyo
-${PYSITELIB}/allmydata/test/check_load.py
-${PYSITELIB}/allmydata/test/check_load.pyc
-${PYSITELIB}/allmydata/test/check_load.pyo
-${PYSITELIB}/allmydata/test/check_memory.py
-${PYSITELIB}/allmydata/test/check_memory.pyc
-${PYSITELIB}/allmydata/test/check_memory.pyo
-${PYSITELIB}/allmydata/test/check_speed.py
-${PYSITELIB}/allmydata/test/check_speed.pyc
-${PYSITELIB}/allmydata/test/check_speed.pyo
+${PYSITELIB}/allmydata/test/_win_subprocess.py
+${PYSITELIB}/allmydata/test/_win_subprocess.pyc
+${PYSITELIB}/allmydata/test/_win_subprocess.pyo
 ${PYSITELIB}/allmydata/test/cli/__init__.py
 ${PYSITELIB}/allmydata/test/cli/__init__.pyc
 ${PYSITELIB}/allmydata/test/cli/__init__.pyo
@@ -339,6 +309,9 @@ ${PYSITELIB}/allmydata/test/cli/test_alias.pyo
 ${PYSITELIB}/allmydata/test/cli/test_backup.py
 ${PYSITELIB}/allmydata/test/cli/test_backup.pyc
 ${PYSITELIB}/allmydata/test/cli/test_backup.pyo
+${PYSITELIB}/allmydata/test/cli/test_backupdb.py
+${PYSITELIB}/allmydata/test/cli/test_backupdb.pyc
+${PYSITELIB}/allmydata/test/cli/test_backupdb.pyo
 ${PYSITELIB}/allmydata/test/cli/test_check.py
 ${PYSITELIB}/allmydata/test/cli/test_check.pyc
 ${PYSITELIB}/allmydata/test/cli/test_check.pyo
@@ -354,9 +327,6 @@ ${PYSITELIB}/allmydata/test/cli/test_create.pyo
 ${PYSITELIB}/allmydata/test/cli/test_create_alias.py
 ${PYSITELIB}/allmydata/test/cli/test_create_alias.pyc
 ${PYSITELIB}/allmydata/test/cli/test_create_alias.pyo
-${PYSITELIB}/allmydata/test/cli/test_daemonize.py
-${PYSITELIB}/allmydata/test/cli/test_daemonize.pyc
-${PYSITELIB}/allmydata/test/cli/test_daemonize.pyo
 ${PYSITELIB}/allmydata/test/cli/test_invite.py
 ${PYSITELIB}/allmydata/test/cli/test_invite.pyc
 ${PYSITELIB}/allmydata/test/cli/test_invite.pyo
@@ -369,9 +339,9 @@ ${PYSITELIB}/allmydata/test/cli/test_mv.pyo
 ${PYSITELIB}/allmydata/test/cli/test_put.py
 ${PYSITELIB}/allmydata/test/cli/test_put.pyc
 ${PYSITELIB}/allmydata/test/cli/test_put.pyo
-${PYSITELIB}/allmydata/test/cli/test_start.py
-${PYSITELIB}/allmydata/test/cli/test_start.pyc
-${PYSITELIB}/allmydata/test/cli/test_start.pyo
+${PYSITELIB}/allmydata/test/cli/test_run.py
+${PYSITELIB}/allmydata/test/cli/test_run.pyc
+${PYSITELIB}/allmydata/test/cli/test_run.pyo
 ${PYSITELIB}/allmydata/test/cli/test_status.py
 ${PYSITELIB}/allmydata/test/cli/test_status.pyc
 ${PYSITELIB}/allmydata/test/cli/test_status.pyo
@@ -387,6 +357,8 @@ ${PYSITELIB}/allmydata/test/common_util.pyo
 ${PYSITELIB}/allmydata/test/common_web.py
 ${PYSITELIB}/allmydata/test/common_web.pyc
 ${PYSITELIB}/allmydata/test/common_web.pyo
+${PYSITELIB}/allmydata/test/data/openssh-rsa-2048.pub.txt
+${PYSITELIB}/allmydata/test/data/openssh-rsa-2048.txt
 ${PYSITELIB}/allmydata/test/data/pycryptopp-rsa-2048-priv.txt
 ${PYSITELIB}/allmydata/test/data/pycryptopp-rsa-2048-pub.txt
 ${PYSITELIB}/allmydata/test/data/pycryptopp-rsa-2048-sig.txt
@@ -453,24 +425,18 @@ ${PYSITELIB}/allmydata/test/no_network.pyo
 ${PYSITELIB}/allmydata/test/plugins/tahoe_lafs_dropin.py
 ${PYSITELIB}/allmydata/test/plugins/tahoe_lafs_dropin.pyc
 ${PYSITELIB}/allmydata/test/plugins/tahoe_lafs_dropin.pyo
-${PYSITELIB}/allmydata/test/python3_tests.py
-${PYSITELIB}/allmydata/test/python3_tests.pyc
-${PYSITELIB}/allmydata/test/python3_tests.pyo
-${PYSITELIB}/allmydata/test/status.py
-${PYSITELIB}/allmydata/test/status.pyc
-${PYSITELIB}/allmydata/test/status.pyo
 ${PYSITELIB}/allmydata/test/storage_plugin.py
 ${PYSITELIB}/allmydata/test/storage_plugin.pyc
 ${PYSITELIB}/allmydata/test/storage_plugin.pyo
+${PYSITELIB}/allmydata/test/strategies.py
+${PYSITELIB}/allmydata/test/strategies.pyc
+${PYSITELIB}/allmydata/test/strategies.pyo
 ${PYSITELIB}/allmydata/test/test_abbreviate.py
 ${PYSITELIB}/allmydata/test/test_abbreviate.pyc
 ${PYSITELIB}/allmydata/test/test_abbreviate.pyo
 ${PYSITELIB}/allmydata/test/test_auth.py
 ${PYSITELIB}/allmydata/test/test_auth.pyc
 ${PYSITELIB}/allmydata/test/test_auth.pyo
-${PYSITELIB}/allmydata/test/test_backupdb.py
-${PYSITELIB}/allmydata/test/test_backupdb.pyc
-${PYSITELIB}/allmydata/test/test_backupdb.pyo
 ${PYSITELIB}/allmydata/test/test_base32.py
 ${PYSITELIB}/allmydata/test/test_base32.pyc
 ${PYSITELIB}/allmydata/test/test_base32.pyo
@@ -498,6 +464,9 @@ ${PYSITELIB}/allmydata/test/test_connection_status.pyo
 ${PYSITELIB}/allmydata/test/test_connections.py
 ${PYSITELIB}/allmydata/test/test_connections.pyc
 ${PYSITELIB}/allmydata/test/test_connections.pyo
+${PYSITELIB}/allmydata/test/test_consumer.py
+${PYSITELIB}/allmydata/test/test_consumer.pyc
+${PYSITELIB}/allmydata/test/test_consumer.pyo
 ${PYSITELIB}/allmydata/test/test_crawler.py
 ${PYSITELIB}/allmydata/test/test_crawler.pyc
 ${PYSITELIB}/allmydata/test/test_crawler.pyo
@@ -531,9 +500,6 @@ ${PYSITELIB}/allmydata/test/test_encodingutil.pyo
 ${PYSITELIB}/allmydata/test/test_filenode.py
 ${PYSITELIB}/allmydata/test/test_filenode.pyc
 ${PYSITELIB}/allmydata/test/test_filenode.pyo
-${PYSITELIB}/allmydata/test/test_ftp.py
-${PYSITELIB}/allmydata/test/test_ftp.pyc
-${PYSITELIB}/allmydata/test/test_ftp.pyo
 ${PYSITELIB}/allmydata/test/test_happiness.py
 ${PYSITELIB}/allmydata/test/test_happiness.pyc
 ${PYSITELIB}/allmydata/test/test_happiness.pyo
@@ -558,9 +524,6 @@ ${PYSITELIB}/allmydata/test/test_i2p_provider.pyo
 ${PYSITELIB}/allmydata/test/test_immutable.py
 ${PYSITELIB}/allmydata/test/test_immutable.pyc
 ${PYSITELIB}/allmydata/test/test_immutable.pyo
-${PYSITELIB}/allmydata/test/test_import.py
-${PYSITELIB}/allmydata/test/test_import.pyc
-${PYSITELIB}/allmydata/test/test_import.pyo
 ${PYSITELIB}/allmydata/test/test_introducer.py
 ${PYSITELIB}/allmydata/test/test_introducer.pyc
 ${PYSITELIB}/allmydata/test/test_introducer.pyo
@@ -597,9 +560,6 @@ ${PYSITELIB}/allmydata/test/test_pipeline.pyo
 ${PYSITELIB}/allmydata/test/test_python2_regressions.py
 ${PYSITELIB}/allmydata/test/test_python2_regressions.pyc
 ${PYSITELIB}/allmydata/test/test_python2_regressions.pyo
-${PYSITELIB}/allmydata/test/test_python3.py
-${PYSITELIB}/allmydata/test/test_python3.pyc
-${PYSITELIB}/allmydata/test/test_python3.pyo
 ${PYSITELIB}/allmydata/test/test_repairer.py
 ${PYSITELIB}/allmydata/test/test_repairer.pyc
 ${PYSITELIB}/allmydata/test/test_repairer.pyo
@@ -648,12 +608,9 @@ ${PYSITELIB}/allmydata/test/test_uri.pyo
 ${PYSITELIB}/allmydata/test/test_util.py
 ${PYSITELIB}/allmydata/test/test_util.pyc
 ${PYSITELIB}/allmydata/test/test_util.pyo
-${PYSITELIB}/allmydata/test/test_version.py
-${PYSITELIB}/allmydata/test/test_version.pyc
-${PYSITELIB}/allmydata/test/test_version.pyo
-${PYSITELIB}/allmydata/test/test_websocket_logs.py
-${PYSITELIB}/allmydata/test/test_websocket_logs.pyc
-${PYSITELIB}/allmydata/test/test_websocket_logs.pyo
+${PYSITELIB}/allmydata/test/test_windows.py
+${PYSITELIB}/allmydata/test/test_windows.pyc
+${PYSITELIB}/allmydata/test/test_windows.pyo
 ${PYSITELIB}/allmydata/test/web/__init__.py
 ${PYSITELIB}/allmydata/test/web/__init__.pyc
 ${PYSITELIB}/allmydata/test/web/__init__.pyo
@@ -663,6 +620,9 @@ ${PYSITELIB}/allmydata/test/web/common.pyo
 ${PYSITELIB}/allmydata/test/web/matchers.py
 ${PYSITELIB}/allmydata/test/web/matchers.pyc
 ${PYSITELIB}/allmydata/test/web/matchers.pyo
+${PYSITELIB}/allmydata/test/web/test_common.py
+${PYSITELIB}/allmydata/test/web/test_common.pyc
+${PYSITELIB}/allmydata/test/web/test_common.pyo
 ${PYSITELIB}/allmydata/test/web/test_grid.py
 ${PYSITELIB}/allmydata/test/web/test_grid.pyc
 ${PYSITELIB}/allmydata/test/web/test_grid.pyo
@@ -681,15 +641,15 @@ ${PYSITELIB}/allmydata/test/web/test_root.pyo
 ${PYSITELIB}/allmydata/test/web/test_status.py
 ${PYSITELIB}/allmydata/test/web/test_status.pyc
 ${PYSITELIB}/allmydata/test/web/test_status.pyo
-${PYSITELIB}/allmydata/test/web/test_token.py
-${PYSITELIB}/allmydata/test/web/test_token.pyc
-${PYSITELIB}/allmydata/test/web/test_token.pyo
 ${PYSITELIB}/allmydata/test/web/test_util.py
 ${PYSITELIB}/allmydata/test/web/test_util.pyc
 ${PYSITELIB}/allmydata/test/web/test_util.pyo
 ${PYSITELIB}/allmydata/test/web/test_web.py
 ${PYSITELIB}/allmydata/test/web/test_web.pyc
 ${PYSITELIB}/allmydata/test/web/test_web.pyo
+${PYSITELIB}/allmydata/test/web/test_webish.py
+${PYSITELIB}/allmydata/test/web/test_webish.pyc
+${PYSITELIB}/allmydata/test/web/test_webish.pyo
 ${PYSITELIB}/allmydata/testing/__init__.py
 ${PYSITELIB}/allmydata/testing/__init__.pyc
 ${PYSITELIB}/allmydata/testing/__init__.pyo
@@ -705,9 +665,6 @@ ${PYSITELIB}/allmydata/uri.pyo
 ${PYSITELIB}/allmydata/util/__init__.py
 ${PYSITELIB}/allmydata/util/__init__.pyc
 ${PYSITELIB}/allmydata/util/__init__.pyo
-${PYSITELIB}/allmydata/util/_python3.py
-${PYSITELIB}/allmydata/util/_python3.pyc
-${PYSITELIB}/allmydata/util/_python3.pyo
 ${PYSITELIB}/allmydata/util/abbreviate.py
 ${PYSITELIB}/allmydata/util/abbreviate.pyc
 ${PYSITELIB}/allmydata/util/abbreviate.pyo
@@ -768,6 +725,9 @@ ${PYSITELIB}/allmydata/util/idlib.pyo
 ${PYSITELIB}/allmydata/util/iputil.py
 ${PYSITELIB}/allmydata/util/iputil.pyc
 ${PYSITELIB}/allmydata/util/iputil.pyo
+${PYSITELIB}/allmydata/util/jsonbytes.py
+${PYSITELIB}/allmydata/util/jsonbytes.pyc
+${PYSITELIB}/allmydata/util/jsonbytes.pyo
 ${PYSITELIB}/allmydata/util/log.py
 ${PYSITELIB}/allmydata/util/log.pyc
 ${PYSITELIB}/allmydata/util/log.pyo
@@ -789,15 +749,9 @@ ${PYSITELIB}/allmydata/util/pipeline.pyo
 ${PYSITELIB}/allmydata/util/pollmixin.py
 ${PYSITELIB}/allmydata/util/pollmixin.pyc
 ${PYSITELIB}/allmydata/util/pollmixin.pyo
-${PYSITELIB}/allmydata/util/progress.py
-${PYSITELIB}/allmydata/util/progress.pyc
-${PYSITELIB}/allmydata/util/progress.pyo
 ${PYSITELIB}/allmydata/util/rrefutil.py
 ${PYSITELIB}/allmydata/util/rrefutil.pyc
 ${PYSITELIB}/allmydata/util/rrefutil.pyo
-${PYSITELIB}/allmydata/util/sibpath.py
-${PYSITELIB}/allmydata/util/sibpath.pyc
-${PYSITELIB}/allmydata/util/sibpath.pyo
 ${PYSITELIB}/allmydata/util/spans.py
 ${PYSITELIB}/allmydata/util/spans.pyc
 ${PYSITELIB}/allmydata/util/spans.pyo
@@ -810,21 +764,12 @@ ${PYSITELIB}/allmydata/util/time_format.pyo
 ${PYSITELIB}/allmydata/util/tor_provider.py
 ${PYSITELIB}/allmydata/util/tor_provider.pyc
 ${PYSITELIB}/allmydata/util/tor_provider.pyo
-${PYSITELIB}/allmydata/util/verlib.py
-${PYSITELIB}/allmydata/util/verlib.pyc
-${PYSITELIB}/allmydata/util/verlib.pyo
 ${PYSITELIB}/allmydata/util/yamlutil.py
 ${PYSITELIB}/allmydata/util/yamlutil.pyc
 ${PYSITELIB}/allmydata/util/yamlutil.pyo
-${PYSITELIB}/allmydata/version_checks.py
-${PYSITELIB}/allmydata/version_checks.pyc
-${PYSITELIB}/allmydata/version_checks.pyo
 ${PYSITELIB}/allmydata/web/__init__.py
 ${PYSITELIB}/allmydata/web/__init__.pyc
 ${PYSITELIB}/allmydata/web/__init__.pyo
-${PYSITELIB}/allmydata/web/_autobahn_1151.py
-${PYSITELIB}/allmydata/web/_autobahn_1151.pyc
-${PYSITELIB}/allmydata/web/_autobahn_1151.pyo
 ${PYSITELIB}/allmydata/web/check-and-repair-results.xhtml
 ${PYSITELIB}/allmydata/web/check-results.xhtml
 ${PYSITELIB}/allmydata/web/check_results.py
@@ -833,9 +778,6 @@ ${PYSITELIB}/allmydata/web/check_results.pyo
 ${PYSITELIB}/allmydata/web/common.py
 ${PYSITELIB}/allmydata/web/common.pyc
 ${PYSITELIB}/allmydata/web/common.pyo
-${PYSITELIB}/allmydata/web/common_py3.py
-${PYSITELIB}/allmydata/web/common_py3.pyc
-${PYSITELIB}/allmydata/web/common_py3.pyo
 ${PYSITELIB}/allmydata/web/deep-check-and-repair-results.xhtml
 ${PYSITELIB}/allmydata/web/deep-check-results.xhtml
 ${PYSITELIB}/allmydata/web/directory.py
diff --git a/tahoe-lafs/distinfo b/tahoe-lafs/distinfo
index fea9ad0152..923ce67501 100644
--- a/tahoe-lafs/distinfo
+++ b/tahoe-lafs/distinfo
@@ -1,10 +1,6 @@
 $NetBSD: distinfo,v 1.15 2021/03/18 17:57:08 gdt Exp $
 
-SHA1 (tahoe-lafs-1.15.0.tar.bz2) = 153ee4f1b9cc64b3266870172a9f6f21cbd86e40
-RMD160 (tahoe-lafs-1.15.0.tar.bz2) = 8e860e96ac23f98c554c50e1bdd9620e22fbddba
-SHA512 (tahoe-lafs-1.15.0.tar.bz2) = 3a714568c29501d0d0ae32b07d11d78189e6dee6996d4816fac41e710d8081247611870eb6bc7ba393afbd368acf938dd6852bb34e2171dc0b76a3ac840142c4
-Size (tahoe-lafs-1.15.0.tar.bz2) = 2882965 bytes
-SHA1 (patch-setup.py) = 5a6079d18d3e6f0a49470abffc46dcdcdfe14e73
-SHA1 (patch-src_allmydata___auto__deps.py) = c1def9428e908061fea53db050e44c60aef93479
-SHA1 (patch-src_allmydata_scripts_create__node.py) = cbf0a66c829b829d2b730b8dee0c12d047b08d26
-SHA1 (patch-src_allmydata_scripts_tahoe__invite.py) = f9012966d464aad0cc226f56d4cbf485538fe203
+SHA1 (tahoe-lafs-1.16.0rc0.tar.bz2) = 45cf552634bb0aa8316ad6f85bede2b79ae763ba
+RMD160 (tahoe-lafs-1.16.0rc0.tar.bz2) = 9f9b5604b6be3b140dc5e4d609bdd9f7b05bda7a
+SHA512 (tahoe-lafs-1.16.0rc0.tar.bz2) = 9b93ec36bc30fafbb1f1e3f3d3a6b8e1210e3c486f17110143c9c03d6298831f6de18795540c1a28a5a3379dd04841507ddf9665b20a8e59c5ec418142b561e4
+Size (tahoe-lafs-1.16.0rc0.tar.bz2) = 12250437 bytes
diff --git a/tahoe-lafs/patches/patch-setup.py b/tahoe-lafs/patches/patch-setup.py
deleted file mode 100644
index e50d083d16..0000000000
--- a/tahoe-lafs/patches/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- setup.py.orig	2021-02-02 19:56:32.000000000 +0000
-+++ setup.py
-@@ -110,7 +110,7 @@ install_requires = [
-     "six >= 1.10.0",
- 
-     # for 'tahoe invite' and 'tahoe join'
--    "magic-wormhole >= 0.10.2",
-+#    "magic-wormhole >= 0.10.2",
- 
-     # Eliot is contemplating dropping Python 2 support.  Stick to a version we
-     # know works on Python 2.7.
diff --git a/tahoe-lafs/patches/patch-src_allmydata___auto__deps.py b/tahoe-lafs/patches/patch-src_allmydata___auto__deps.py
deleted file mode 100644
index df52aec647..0000000000
--- a/tahoe-lafs/patches/patch-src_allmydata___auto__deps.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/allmydata/_auto_deps.py.orig	2021-02-02 19:56:32.000000000 +0000
-+++ src/allmydata/_auto_deps.py
-@@ -26,7 +26,7 @@ package_imports = [
-     ('enum34',           'enum'),
-     ('pycparser',        'pycparser'),
-     ('PyYAML',           'yaml'),
--    ('magic-wormhole',   'wormhole'),
-+#    ('magic-wormhole',   'wormhole'),
-     ('setuptools',       'setuptools'),
-     ('eliot',            'eliot'),
-     ('attrs',            'attr'),
diff --git a/tahoe-lafs/patches/patch-src_allmydata_scripts_create__node.py b/tahoe-lafs/patches/patch-src_allmydata_scripts_create__node.py
deleted file mode 100644
index a44ae78950..0000000000
--- a/tahoe-lafs/patches/patch-src_allmydata_scripts_create__node.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/allmydata/scripts/create_node.py.orig	2021-02-02 19:56:32.000000000 +0000
-+++ src/allmydata/scripts/create_node.py
-@@ -10,7 +10,7 @@ from allmydata.scripts.default_nodedir i
- from allmydata.util.assertutil import precondition
- from allmydata.util.encodingutil import listdir_unicode, argv_to_unicode, quote_local_unicode_path, get_io_encoding
- from allmydata.util import fileutil, i2p_provider, iputil, tor_provider
--from wormhole import wormhole
-+#from wormhole import wormhole
- 
- 
- dummy_tac = """
diff --git a/tahoe-lafs/patches/patch-src_allmydata_scripts_tahoe__invite.py b/tahoe-lafs/patches/patch-src_allmydata_scripts_tahoe__invite.py
deleted file mode 100644
index f342d988d8..0000000000
--- a/tahoe-lafs/patches/patch-src_allmydata_scripts_tahoe__invite.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/allmydata/scripts/tahoe_invite.py.orig	2021-02-02 19:56:32.000000000 +0000
-+++ src/allmydata/scripts/tahoe_invite.py
-@@ -6,7 +6,7 @@ from os.path import join
- from twisted.python import usage
- from twisted.internet import defer, reactor
- 
--from wormhole import wormhole
-+#from wormhole import wormhole
- 
- from allmydata.util import configutil
- from allmydata.util.encodingutil import argv_to_abspath


Home | Main Index | Thread Index | Old Index