tahoe-lafs: Revert to status quo antedeletionbellum

The newer versions have a number of runtime dependencies (not checked
at build time, as seems to be the unfortunate custom) that aren't
currently in pkgsrc.  Given that this code is quite stable and likely
has users, it's better to stay how it was.

3 files changed, 110 insertions, 249 deletions

diff --git a/filesystems/tahoe-lafs/Makefile b/filesystems/tahoe-lafs/Makefile
index 9176ec10174..2890a06983a 100644
--- a/filesystems/tahoe-lafs/Makefile
+++ b/filesystems/tahoe-lafs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2021/03/18 23:23:31 gdt Exp $
+# $NetBSD: Makefile,v 1.48 2021/03/19 12:56:36 gdt Exp $
 
-DISTNAME=	tahoe-lafs-1.15.0
+DISTNAME=	tahoe-lafs-1.12.1
+PKGREVISION=	2
 CATEGORIES=	filesystems
-MASTER_SITES=	https://tahoe-lafs.org/downloads/
+MASTER_SITES=	https://tahoe-lafs.org/source/tahoe-lafs/tarballs/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,47 +13,34 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS=	gmake
 
-BROKEN=		bulk builds are not happy and this is not important
+# TODO
+# fix nevow: doc location
 
-# \todo: fix nevow doc location
+# Included egg darcsver, but depend anyway.
+BUILD_DEPENDS+=	${PYPKGPREFIX}-darcsver-[0-9]*:../../devel/py-darcsver
 
-PYTHON_VERSIONS_ACCEPTED=	27 # py-xml via py-nevow, py-zbase32, py-cryptopp
-DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-
-# from tahoe's setup.py
+DEPENDS+=	${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-zfec>=1.1.0:../../converters/py-zfec
-# \todo zope.interface
+DEPENDS+=	${PYPKGPREFIX}-zbase32-[0-9]*:../../converters/py-zbase32
+DEPENDS+=	${PYPKGPREFIX}-simplejson>=1.4:../../converters/py-simplejson
+DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+DEPENDS+=	${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
+DEPENDS+=	${PYPKGPREFIX}-pyutil-[0-9]*:../../devel/py-pyutil
+# Included egg setuptools_trial, not used.
+# Included egg setuptools_darcs, used (no package yet).
 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
-# 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}-asn1>=0.1.8:../../security/py-asn1
+DEPENDS+=	${PYPKGPREFIX}-asn1-modules>=0.0.5:../../security/py-asn1-modules
+DEPENDS+=	${PYPKGPREFIX}-characteristic>=14.0.0:../../devel/py-characteristic
+DEPENDS+=	${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
+DEPENDS+=	${PYPKGPREFIX}-cryptopp>=0.6.0:../../security/py-cryptopp
+DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.14:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-nevow>=0.11.1:../../www/py-nevow
+DEPENDS+=	${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
 DEPENDS+=	${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
-DEPENDS+=	${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
-DEPENDS+=	${PYPKGPREFIX}-magic-wormhole-[0-9]*:../../net/py-magic-wormhole
-DEPENDS+=	${PYPKGPREFIX}-eliot-[0-9]*:../../sysutils/py-eliot17
-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
-
-# 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
 
-# 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
-#DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.14:../../security/py-OpenSSL
-#DEPENDS+=	${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
+PYTHON_VERSIONS_ACCEPTED=	27 # py-xml via py-nevow, py-zbase32, py-cryptopp, py-darcsver
 
 # Note that there is an upstream (inherited from setuptools) bug
 #   https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1258#comment:29 that
@@ -60,13 +48,25 @@ DEPENDS+=       ${PYPKGPREFIX}-txtorcon-[0-9]*:../../net/py-txtorcon
 # installed.  If you get mysterious failures, pkg_delete the installed
 # version.
 
+# OK: 1.9.1, 1.9.2, 1.10a2
+# BAD: 1.10a1
+#BAD_DISTFILE_MODES=yes
+.if defined(BAD_DISTFILE_MODES)
+# Distfile has files mode 600, which leads to root-owned 600 files in
+# the binary package.
+post-extract:
+	${ECHO} "Fixing distfile contents to be world readable:"
+	chmod -R +r ${WRKSRC}
+.endif
+
+REPLACE_PYTHON+=	src/allmydata/storage/shares.py
+
 PKG_GROUPS=		tahoes
 PKG_USERS=		tahoes:tahoes
 PKG_GECOS.tahoes=	tahoe server
 
-# \todo Convert do-test to use tox
-#do-test:
-#	cd ${WRKSRC} && py.test-2.7
+do-test:
+	cd ${WRKSRC} && py.test-2.7
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/filesystems/tahoe-lafs/PLIST b/filesystems/tahoe-lafs/PLIST
index 1ee6b7f7058..66de2feb29d 100644
--- a/filesystems/tahoe-lafs/PLIST
+++ b/filesystems/tahoe-lafs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2021/03/18 17:57:08 gdt Exp $
+@comment $NetBSD: PLIST,v 1.12 2021/03/19 12:56:36 gdt Exp $
 bin/tahoe
 ${PYSITELIB}/allmydata/__init__.py
 ${PYSITELIB}/allmydata/__init__.pyc
@@ -9,9 +9,6 @@ ${PYSITELIB}/allmydata/__main__.pyo
 ${PYSITELIB}/allmydata/_auto_deps.py
 ${PYSITELIB}/allmydata/_auto_deps.pyc
 ${PYSITELIB}/allmydata/_auto_deps.pyo
-${PYSITELIB}/allmydata/_monkeypatch.py
-${PYSITELIB}/allmydata/_monkeypatch.pyc
-${PYSITELIB}/allmydata/_monkeypatch.pyo
 ${PYSITELIB}/allmydata/_version.py
 ${PYSITELIB}/allmydata/_version.pyc
 ${PYSITELIB}/allmydata/_version.pyo
@@ -30,24 +27,6 @@ ${PYSITELIB}/allmydata/codec.pyo
 ${PYSITELIB}/allmydata/control.py
 ${PYSITELIB}/allmydata/control.pyc
 ${PYSITELIB}/allmydata/control.pyo
-${PYSITELIB}/allmydata/crypto/__init__.py
-${PYSITELIB}/allmydata/crypto/__init__.pyc
-${PYSITELIB}/allmydata/crypto/__init__.pyo
-${PYSITELIB}/allmydata/crypto/aes.py
-${PYSITELIB}/allmydata/crypto/aes.pyc
-${PYSITELIB}/allmydata/crypto/aes.pyo
-${PYSITELIB}/allmydata/crypto/ed25519.py
-${PYSITELIB}/allmydata/crypto/ed25519.pyc
-${PYSITELIB}/allmydata/crypto/ed25519.pyo
-${PYSITELIB}/allmydata/crypto/error.py
-${PYSITELIB}/allmydata/crypto/error.pyc
-${PYSITELIB}/allmydata/crypto/error.pyo
-${PYSITELIB}/allmydata/crypto/rsa.py
-${PYSITELIB}/allmydata/crypto/rsa.pyc
-${PYSITELIB}/allmydata/crypto/rsa.pyo
-${PYSITELIB}/allmydata/crypto/util.py
-${PYSITELIB}/allmydata/crypto/util.pyc
-${PYSITELIB}/allmydata/crypto/util.pyo
 ${PYSITELIB}/allmydata/deep_stats.py
 ${PYSITELIB}/allmydata/deep_stats.pyc
 ${PYSITELIB}/allmydata/deep_stats.pyo
@@ -63,6 +42,9 @@ ${PYSITELIB}/allmydata/frontends/auth.pyo
 ${PYSITELIB}/allmydata/frontends/ftpd.py
 ${PYSITELIB}/allmydata/frontends/ftpd.pyc
 ${PYSITELIB}/allmydata/frontends/ftpd.pyo
+${PYSITELIB}/allmydata/frontends/magic_folder.py
+${PYSITELIB}/allmydata/frontends/magic_folder.pyc
+${PYSITELIB}/allmydata/frontends/magic_folder.pyo
 ${PYSITELIB}/allmydata/frontends/sftpd.py
 ${PYSITELIB}/allmydata/frontends/sftpd.pyc
 ${PYSITELIB}/allmydata/frontends/sftpd.pyo
@@ -108,9 +90,6 @@ ${PYSITELIB}/allmydata/immutable/encode.pyo
 ${PYSITELIB}/allmydata/immutable/filenode.py
 ${PYSITELIB}/allmydata/immutable/filenode.pyc
 ${PYSITELIB}/allmydata/immutable/filenode.pyo
-${PYSITELIB}/allmydata/immutable/happiness_upload.py
-${PYSITELIB}/allmydata/immutable/happiness_upload.pyc
-${PYSITELIB}/allmydata/immutable/happiness_upload.pyo
 ${PYSITELIB}/allmydata/immutable/layout.py
 ${PYSITELIB}/allmydata/immutable/layout.pyc
 ${PYSITELIB}/allmydata/immutable/layout.pyo
@@ -144,6 +123,12 @@ ${PYSITELIB}/allmydata/introducer/interfaces.pyo
 ${PYSITELIB}/allmydata/introducer/server.py
 ${PYSITELIB}/allmydata/introducer/server.pyc
 ${PYSITELIB}/allmydata/introducer/server.pyo
+${PYSITELIB}/allmydata/magicfolderdb.py
+${PYSITELIB}/allmydata/magicfolderdb.pyc
+${PYSITELIB}/allmydata/magicfolderdb.pyo
+${PYSITELIB}/allmydata/magicpath.py
+${PYSITELIB}/allmydata/magicpath.pyc
+${PYSITELIB}/allmydata/magicpath.pyo
 ${PYSITELIB}/allmydata/monitor.py
 ${PYSITELIB}/allmydata/monitor.pyc
 ${PYSITELIB}/allmydata/monitor.pyo
@@ -207,15 +192,18 @@ ${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/magic_folder_cli.py
+${PYSITELIB}/allmydata/scripts/magic_folder_cli.pyc
+${PYSITELIB}/allmydata/scripts/magic_folder_cli.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/startstop_node.py
+${PYSITELIB}/allmydata/scripts/startstop_node.pyc
+${PYSITELIB}/allmydata/scripts/startstop_node.pyo
 ${PYSITELIB}/allmydata/scripts/stats_gatherer.py
 ${PYSITELIB}/allmydata/scripts/stats_gatherer.pyc
 ${PYSITELIB}/allmydata/scripts/stats_gatherer.pyo
@@ -231,15 +219,9 @@ ${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
-${PYSITELIB}/allmydata/scripts/tahoe_invite.py
-${PYSITELIB}/allmydata/scripts/tahoe_invite.pyc
-${PYSITELIB}/allmydata/scripts/tahoe_invite.pyo
 ${PYSITELIB}/allmydata/scripts/tahoe_ls.py
 ${PYSITELIB}/allmydata/scripts/tahoe_ls.pyc
 ${PYSITELIB}/allmydata/scripts/tahoe_ls.pyo
@@ -255,21 +237,6 @@ ${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
@@ -312,9 +279,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/bench_dirnode.py
+${PYSITELIB}/allmydata/test/bench_dirnode.pyc
+${PYSITELIB}/allmydata/test/bench_dirnode.pyo
 ${PYSITELIB}/allmydata/test/check_grid.py
 ${PYSITELIB}/allmydata/test/check_grid.pyc
 ${PYSITELIB}/allmydata/test/check_grid.pyo
@@ -333,9 +300,6 @@ ${PYSITELIB}/allmydata/test/cli/__init__.pyo
 ${PYSITELIB}/allmydata/test/cli/common.py
 ${PYSITELIB}/allmydata/test/cli/common.pyc
 ${PYSITELIB}/allmydata/test/cli/common.pyo
-${PYSITELIB}/allmydata/test/cli/test_alias.py
-${PYSITELIB}/allmydata/test/cli/test_alias.pyc
-${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
@@ -354,30 +318,18 @@ ${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
 ${PYSITELIB}/allmydata/test/cli/test_list.py
 ${PYSITELIB}/allmydata/test/cli/test_list.pyc
 ${PYSITELIB}/allmydata/test/cli/test_list.pyo
+${PYSITELIB}/allmydata/test/cli/test_magic_folder.py
+${PYSITELIB}/allmydata/test/cli/test_magic_folder.pyc
+${PYSITELIB}/allmydata/test/cli/test_magic_folder.pyo
 ${PYSITELIB}/allmydata/test/cli/test_mv.py
 ${PYSITELIB}/allmydata/test/cli/test_mv.pyc
 ${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_status.py
-${PYSITELIB}/allmydata/test/cli/test_status.pyc
-${PYSITELIB}/allmydata/test/cli/test_status.pyo
-${PYSITELIB}/allmydata/test/cli_node_api.py
-${PYSITELIB}/allmydata/test/cli_node_api.pyc
-${PYSITELIB}/allmydata/test/cli_node_api.pyo
 ${PYSITELIB}/allmydata/test/common.py
 ${PYSITELIB}/allmydata/test/common.pyc
 ${PYSITELIB}/allmydata/test/common.pyo
@@ -387,15 +339,6 @@ ${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/pycryptopp-rsa-2048-priv.txt
-${PYSITELIB}/allmydata/test/data/pycryptopp-rsa-2048-pub.txt
-${PYSITELIB}/allmydata/test/data/pycryptopp-rsa-2048-sig.txt
-${PYSITELIB}/allmydata/test/eliotutil.py
-${PYSITELIB}/allmydata/test/eliotutil.pyc
-${PYSITELIB}/allmydata/test/eliotutil.pyo
-${PYSITELIB}/allmydata/test/matchers.py
-${PYSITELIB}/allmydata/test/matchers.pyc
-${PYSITELIB}/allmydata/test/matchers.pyo
 ${PYSITELIB}/allmydata/test/mutable/__init__.py
 ${PYSITELIB}/allmydata/test/mutable/__init__.pyc
 ${PYSITELIB}/allmydata/test/mutable/__init__.pyo
@@ -450,30 +393,15 @@ ${PYSITELIB}/allmydata/test/mutable/util.pyo
 ${PYSITELIB}/allmydata/test/no_network.py
 ${PYSITELIB}/allmydata/test/no_network.pyc
 ${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/test_abbreviate.py
-${PYSITELIB}/allmydata/test/test_abbreviate.pyc
-${PYSITELIB}/allmydata/test/test_abbreviate.pyo
+${PYSITELIB}/allmydata/test/run_trial.py
+${PYSITELIB}/allmydata/test/run_trial.pyc
+${PYSITELIB}/allmydata/test/run_trial.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
 ${PYSITELIB}/allmydata/test/test_base62.py
 ${PYSITELIB}/allmydata/test/test_base62.pyc
 ${PYSITELIB}/allmydata/test/test_base62.pyo
@@ -486,42 +414,24 @@ ${PYSITELIB}/allmydata/test/test_client.pyo
 ${PYSITELIB}/allmydata/test/test_codec.py
 ${PYSITELIB}/allmydata/test/test_codec.pyc
 ${PYSITELIB}/allmydata/test/test_codec.pyo
-${PYSITELIB}/allmydata/test/test_common_util.py
-${PYSITELIB}/allmydata/test/test_common_util.pyc
-${PYSITELIB}/allmydata/test/test_common_util.pyo
 ${PYSITELIB}/allmydata/test/test_configutil.py
 ${PYSITELIB}/allmydata/test/test_configutil.pyc
 ${PYSITELIB}/allmydata/test/test_configutil.pyo
-${PYSITELIB}/allmydata/test/test_connection_status.py
-${PYSITELIB}/allmydata/test/test_connection_status.pyc
-${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_crawler.py
 ${PYSITELIB}/allmydata/test/test_crawler.pyc
 ${PYSITELIB}/allmydata/test/test_crawler.pyo
-${PYSITELIB}/allmydata/test/test_crypto.py
-${PYSITELIB}/allmydata/test/test_crypto.pyc
-${PYSITELIB}/allmydata/test/test_crypto.pyo
 ${PYSITELIB}/allmydata/test/test_deepcheck.py
 ${PYSITELIB}/allmydata/test/test_deepcheck.pyc
 ${PYSITELIB}/allmydata/test/test_deepcheck.pyo
-${PYSITELIB}/allmydata/test/test_deferredutil.py
-${PYSITELIB}/allmydata/test/test_deferredutil.pyc
-${PYSITELIB}/allmydata/test/test_deferredutil.pyo
-${PYSITELIB}/allmydata/test/test_dictutil.py
-${PYSITELIB}/allmydata/test/test_dictutil.pyc
-${PYSITELIB}/allmydata/test/test_dictutil.pyo
 ${PYSITELIB}/allmydata/test/test_dirnode.py
 ${PYSITELIB}/allmydata/test/test_dirnode.pyc
 ${PYSITELIB}/allmydata/test/test_dirnode.pyo
 ${PYSITELIB}/allmydata/test/test_download.py
 ${PYSITELIB}/allmydata/test/test_download.pyc
 ${PYSITELIB}/allmydata/test/test_download.pyo
-${PYSITELIB}/allmydata/test/test_eliotutil.py
-${PYSITELIB}/allmydata/test/test_eliotutil.pyc
-${PYSITELIB}/allmydata/test/test_eliotutil.pyo
 ${PYSITELIB}/allmydata/test/test_encode.py
 ${PYSITELIB}/allmydata/test/test_encode.pyc
 ${PYSITELIB}/allmydata/test/test_encode.pyo
@@ -534,21 +444,12 @@ ${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
 ${PYSITELIB}/allmydata/test/test_hashtree.py
 ${PYSITELIB}/allmydata/test/test_hashtree.pyc
 ${PYSITELIB}/allmydata/test/test_hashtree.pyo
-${PYSITELIB}/allmydata/test/test_hashutil.py
-${PYSITELIB}/allmydata/test/test_hashutil.pyc
-${PYSITELIB}/allmydata/test/test_hashutil.pyo
 ${PYSITELIB}/allmydata/test/test_helper.py
 ${PYSITELIB}/allmydata/test/test_helper.pyc
 ${PYSITELIB}/allmydata/test/test_helper.pyo
-${PYSITELIB}/allmydata/test/test_humanreadable.py
-${PYSITELIB}/allmydata/test/test_humanreadable.pyc
-${PYSITELIB}/allmydata/test/test_humanreadable.pyo
 ${PYSITELIB}/allmydata/test/test_hung_server.py
 ${PYSITELIB}/allmydata/test/test_hung_server.pyc
 ${PYSITELIB}/allmydata/test/test_hung_server.pyo
@@ -570,12 +471,12 @@ ${PYSITELIB}/allmydata/test/test_iputil.pyo
 ${PYSITELIB}/allmydata/test/test_json_metadata.py
 ${PYSITELIB}/allmydata/test/test_json_metadata.pyc
 ${PYSITELIB}/allmydata/test/test_json_metadata.pyo
-${PYSITELIB}/allmydata/test/test_log.py
-${PYSITELIB}/allmydata/test/test_log.pyc
-${PYSITELIB}/allmydata/test/test_log.pyo
-${PYSITELIB}/allmydata/test/test_monitor.py
-${PYSITELIB}/allmydata/test/test_monitor.pyc
-${PYSITELIB}/allmydata/test/test_monitor.pyo
+${PYSITELIB}/allmydata/test/test_magic_folder.py
+${PYSITELIB}/allmydata/test/test_magic_folder.pyc
+${PYSITELIB}/allmydata/test/test_magic_folder.pyo
+${PYSITELIB}/allmydata/test/test_magicpath.py
+${PYSITELIB}/allmydata/test/test_magicpath.pyc
+${PYSITELIB}/allmydata/test/test_magicpath.pyo
 ${PYSITELIB}/allmydata/test/test_multi_introducers.py
 ${PYSITELIB}/allmydata/test/test_multi_introducers.pyc
 ${PYSITELIB}/allmydata/test/test_multi_introducers.pyo
@@ -591,15 +492,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_pipeline.py
-${PYSITELIB}/allmydata/test/test_pipeline.pyc
-${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
@@ -609,12 +501,6 @@ ${PYSITELIB}/allmydata/test/test_runner.pyo
 ${PYSITELIB}/allmydata/test/test_sftp.py
 ${PYSITELIB}/allmydata/test/test_sftp.pyc
 ${PYSITELIB}/allmydata/test/test_sftp.pyo
-${PYSITELIB}/allmydata/test/test_spans.py
-${PYSITELIB}/allmydata/test/test_spans.pyc
-${PYSITELIB}/allmydata/test/test_spans.pyo
-${PYSITELIB}/allmydata/test/test_statistics.py
-${PYSITELIB}/allmydata/test/test_statistics.pyc
-${PYSITELIB}/allmydata/test/test_statistics.pyo
 ${PYSITELIB}/allmydata/test/test_stats.py
 ${PYSITELIB}/allmydata/test/test_stats.pyc
 ${PYSITELIB}/allmydata/test/test_stats.pyo
@@ -624,18 +510,9 @@ ${PYSITELIB}/allmydata/test/test_storage.pyo
 ${PYSITELIB}/allmydata/test/test_storage_client.py
 ${PYSITELIB}/allmydata/test/test_storage_client.pyc
 ${PYSITELIB}/allmydata/test/test_storage_client.pyo
-${PYSITELIB}/allmydata/test/test_storage_web.py
-${PYSITELIB}/allmydata/test/test_storage_web.pyc
-${PYSITELIB}/allmydata/test/test_storage_web.pyo
 ${PYSITELIB}/allmydata/test/test_system.py
 ${PYSITELIB}/allmydata/test/test_system.pyc
 ${PYSITELIB}/allmydata/test/test_system.pyo
-${PYSITELIB}/allmydata/test/test_testing.py
-${PYSITELIB}/allmydata/test/test_testing.pyc
-${PYSITELIB}/allmydata/test/test_testing.pyo
-${PYSITELIB}/allmydata/test/test_time_format.py
-${PYSITELIB}/allmydata/test/test_time_format.pyc
-${PYSITELIB}/allmydata/test/test_time_format.pyo
 ${PYSITELIB}/allmydata/test/test_tor_provider.py
 ${PYSITELIB}/allmydata/test/test_tor_provider.pyc
 ${PYSITELIB}/allmydata/test/test_tor_provider.pyo
@@ -651,36 +528,21 @@ ${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/web/__init__.py
 ${PYSITELIB}/allmydata/test/web/__init__.pyc
 ${PYSITELIB}/allmydata/test/web/__init__.pyo
 ${PYSITELIB}/allmydata/test/web/common.py
 ${PYSITELIB}/allmydata/test/web/common.pyc
 ${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_grid.py
 ${PYSITELIB}/allmydata/test/web/test_grid.pyc
 ${PYSITELIB}/allmydata/test/web/test_grid.pyo
 ${PYSITELIB}/allmydata/test/web/test_introducer.py
 ${PYSITELIB}/allmydata/test/web/test_introducer.pyc
 ${PYSITELIB}/allmydata/test/web/test_introducer.pyo
-${PYSITELIB}/allmydata/test/web/test_logs.py
-${PYSITELIB}/allmydata/test/web/test_logs.pyc
-${PYSITELIB}/allmydata/test/web/test_logs.pyo
-${PYSITELIB}/allmydata/test/web/test_private.py
-${PYSITELIB}/allmydata/test/web/test_private.pyc
-${PYSITELIB}/allmydata/test/web/test_private.pyo
 ${PYSITELIB}/allmydata/test/web/test_root.py
 ${PYSITELIB}/allmydata/test/web/test_root.pyc
 ${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
@@ -690,12 +552,6 @@ ${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/testing/__init__.py
-${PYSITELIB}/allmydata/testing/__init__.pyc
-${PYSITELIB}/allmydata/testing/__init__.pyo
-${PYSITELIB}/allmydata/testing/web.py
-${PYSITELIB}/allmydata/testing/web.pyc
-${PYSITELIB}/allmydata/testing/web.pyo
 ${PYSITELIB}/allmydata/unknown.py
 ${PYSITELIB}/allmydata/unknown.pyc
 ${PYSITELIB}/allmydata/unknown.pyo
@@ -705,9 +561,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
@@ -720,6 +573,9 @@ ${PYSITELIB}/allmydata/util/base32.pyo
 ${PYSITELIB}/allmydata/util/base62.py
 ${PYSITELIB}/allmydata/util/base62.pyc
 ${PYSITELIB}/allmydata/util/base62.pyo
+${PYSITELIB}/allmydata/util/cachedir.py
+${PYSITELIB}/allmydata/util/cachedir.pyc
+${PYSITELIB}/allmydata/util/cachedir.pyo
 ${PYSITELIB}/allmydata/util/configutil.py
 ${PYSITELIB}/allmydata/util/configutil.pyc
 ${PYSITELIB}/allmydata/util/configutil.pyo
@@ -738,18 +594,15 @@ ${PYSITELIB}/allmydata/util/deferredutil.pyo
 ${PYSITELIB}/allmydata/util/dictutil.py
 ${PYSITELIB}/allmydata/util/dictutil.pyc
 ${PYSITELIB}/allmydata/util/dictutil.pyo
-${PYSITELIB}/allmydata/util/eliotutil.py
-${PYSITELIB}/allmydata/util/eliotutil.pyc
-${PYSITELIB}/allmydata/util/eliotutil.pyo
 ${PYSITELIB}/allmydata/util/encodingutil.py
 ${PYSITELIB}/allmydata/util/encodingutil.pyc
 ${PYSITELIB}/allmydata/util/encodingutil.pyo
+${PYSITELIB}/allmydata/util/fake_inotify.py
+${PYSITELIB}/allmydata/util/fake_inotify.pyc
+${PYSITELIB}/allmydata/util/fake_inotify.pyo
 ${PYSITELIB}/allmydata/util/fileutil.py
 ${PYSITELIB}/allmydata/util/fileutil.pyc
 ${PYSITELIB}/allmydata/util/fileutil.pyo
-${PYSITELIB}/allmydata/util/gcutil.py
-${PYSITELIB}/allmydata/util/gcutil.pyc
-${PYSITELIB}/allmydata/util/gcutil.pyo
 ${PYSITELIB}/allmydata/util/happinessutil.py
 ${PYSITELIB}/allmydata/util/happinessutil.pyc
 ${PYSITELIB}/allmydata/util/happinessutil.pyo
@@ -768,6 +621,12 @@ ${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
 ${PYSITELIB}/allmydata/util/log.py
 ${PYSITELIB}/allmydata/util/log.pyc
 ${PYSITELIB}/allmydata/util/log.pyo
@@ -780,18 +639,27 @@ ${PYSITELIB}/allmydata/util/namespace.pyo
 ${PYSITELIB}/allmydata/util/netstring.py
 ${PYSITELIB}/allmydata/util/netstring.pyc
 ${PYSITELIB}/allmydata/util/netstring.pyo
+${PYSITELIB}/allmydata/util/nummedobj.py
+${PYSITELIB}/allmydata/util/nummedobj.pyc
+${PYSITELIB}/allmydata/util/nummedobj.pyo
 ${PYSITELIB}/allmydata/util/observer.py
 ${PYSITELIB}/allmydata/util/observer.pyc
 ${PYSITELIB}/allmydata/util/observer.pyo
 ${PYSITELIB}/allmydata/util/pipeline.py
 ${PYSITELIB}/allmydata/util/pipeline.pyc
 ${PYSITELIB}/allmydata/util/pipeline.pyo
+${PYSITELIB}/allmydata/util/pkgresutil.py
+${PYSITELIB}/allmydata/util/pkgresutil.pyc
+${PYSITELIB}/allmydata/util/pkgresutil.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/repeatable_random.py
+${PYSITELIB}/allmydata/util/repeatable_random.pyc
+${PYSITELIB}/allmydata/util/repeatable_random.pyo
 ${PYSITELIB}/allmydata/util/rrefutil.py
 ${PYSITELIB}/allmydata/util/rrefutil.pyc
 ${PYSITELIB}/allmydata/util/rrefutil.pyo
@@ -816,15 +684,9 @@ ${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,15 +695,13 @@ ${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
 ${PYSITELIB}/allmydata/web/directory.pyc
 ${PYSITELIB}/allmydata/web/directory.pyo
 ${PYSITELIB}/allmydata/web/directory.xhtml
+${PYSITELIB}/allmydata/web/download-status-timeline.xhtml
 ${PYSITELIB}/allmydata/web/download-status.xhtml
 ${PYSITELIB}/allmydata/web/filenode.py
 ${PYSITELIB}/allmydata/web/filenode.pyc
@@ -856,17 +716,14 @@ ${PYSITELIB}/allmydata/web/introweb.py
 ${PYSITELIB}/allmydata/web/introweb.pyc
 ${PYSITELIB}/allmydata/web/introweb.pyo
 ${PYSITELIB}/allmydata/web/literal-check-results.xhtml
-${PYSITELIB}/allmydata/web/logs.py
-${PYSITELIB}/allmydata/web/logs.pyc
-${PYSITELIB}/allmydata/web/logs.pyo
+${PYSITELIB}/allmydata/web/magic_folder.py
+${PYSITELIB}/allmydata/web/magic_folder.pyc
+${PYSITELIB}/allmydata/web/magic_folder.pyo
 ${PYSITELIB}/allmydata/web/manifest.xhtml
 ${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/private.py
-${PYSITELIB}/allmydata/web/private.pyc
-${PYSITELIB}/allmydata/web/private.pyo
 ${PYSITELIB}/allmydata/web/publish-status.xhtml
 ${PYSITELIB}/allmydata/web/rename-form.xhtml
 ${PYSITELIB}/allmydata/web/retrieve-status.xhtml
@@ -875,14 +732,15 @@ ${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.js
+${PYSITELIB}/allmydata/web/static/d3-2.4.6.time.js
+${PYSITELIB}/allmydata/web/static/download_status_timeline.js
 ${PYSITELIB}/allmydata/web/static/icon.png
 ${PYSITELIB}/allmydata/web/static/img/connected-no.png
-${PYSITELIB}/allmydata/web/static/img/connected-no.svg
 ${PYSITELIB}/allmydata/web/static/img/connected-not-configured.png
-${PYSITELIB}/allmydata/web/static/img/connected-not-configured.svg
 ${PYSITELIB}/allmydata/web/static/img/connected-yes.png
-${PYSITELIB}/allmydata/web/static/img/connected-yes.svg
 ${PYSITELIB}/allmydata/web/static/img/logo.png
+${PYSITELIB}/allmydata/web/static/jquery-1.11.0.js
 ${PYSITELIB}/allmydata/web/static/tahoe.css
 ${PYSITELIB}/allmydata/web/statistics.xhtml
 ${PYSITELIB}/allmydata/web/status.py
@@ -892,9 +750,6 @@ ${PYSITELIB}/allmydata/web/status.xhtml
 ${PYSITELIB}/allmydata/web/storage.py
 ${PYSITELIB}/allmydata/web/storage.pyc
 ${PYSITELIB}/allmydata/web/storage.pyo
-${PYSITELIB}/allmydata/web/storage_plugins.py
-${PYSITELIB}/allmydata/web/storage_plugins.pyc
-${PYSITELIB}/allmydata/web/storage_plugins.pyo
 ${PYSITELIB}/allmydata/web/storage_status.xhtml
 ${PYSITELIB}/allmydata/web/unlinked.py
 ${PYSITELIB}/allmydata/web/unlinked.pyc
@@ -911,9 +766,15 @@ ${PYSITELIB}/allmydata/windows/__init__.pyo
 ${PYSITELIB}/allmydata/windows/fixups.py
 ${PYSITELIB}/allmydata/windows/fixups.pyc
 ${PYSITELIB}/allmydata/windows/fixups.pyo
+${PYSITELIB}/allmydata/windows/inotify.py
+${PYSITELIB}/allmydata/windows/inotify.pyc
+${PYSITELIB}/allmydata/windows/inotify.pyo
 ${PYSITELIB}/allmydata/windows/registry.py
 ${PYSITELIB}/allmydata/windows/registry.pyc
 ${PYSITELIB}/allmydata/windows/registry.pyo
+${PYSITELIB}/allmydata/windows/tahoesvc.py
+${PYSITELIB}/allmydata/windows/tahoesvc.pyc
+${PYSITELIB}/allmydata/windows/tahoesvc.pyo
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
diff --git a/filesystems/tahoe-lafs/distinfo b/filesystems/tahoe-lafs/distinfo
index d4cd504a7b0..b994b48e8ec 100644
--- a/filesystems/tahoe-lafs/distinfo
+++ b/filesystems/tahoe-lafs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2021/03/18 17:57:08 gdt Exp $
+$NetBSD: distinfo,v 1.16 2021/03/19 12:56:36 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 (tahoe-lafs-1.12.1.tar.bz2) = cc9c86eecd232fde73bb7078f8c6c4a48536f303
+RMD160 (tahoe-lafs-1.12.1.tar.bz2) = f8fc325c24f3d9c471d2eb1939db661775611388
+SHA512 (tahoe-lafs-1.12.1.tar.bz2) = b1017119164d9a7522d8fc0b1405b0634cb6c0386735847d7261e02cb4d08fdb5af13f6feccec73b789efa5bea6f91008f93368514fcb073638aca686086e3ab
+Size (tahoe-lafs-1.12.1.tar.bz2) = 1387606 bytes