Update filesystems/tahoe-lafs to 1.12.1.

3 files changed, 195 insertions, 88 deletions

diff --git a/filesystems/tahoe-lafs/Makefile b/filesystems/tahoe-lafs/Makefile
index 1c3252d2917..6660605137e 100644
--- a/filesystems/tahoe-lafs/Makefile
+++ b/filesystems/tahoe-lafs/Makefile
@@ -1,12 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2017/01/01 14:43:39 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2017/01/28 09:09:50 riastradh Exp $
 
-VERSION=	1.10.2
-DISTNAME=	allmydata-tahoe-${VERSION}
-PKGNAME=	tahoe-lafs-${VERSION}
+DISTNAME=	tahoe-lafs-1.12.1
 CATEGORIES=	filesystems
-MASTER_SITES=	https://tahoe-lafs.org/source/tahoe-lafs/releases/
-#for beta, add
-#MASTER_SITES+=		http://tahoe-lafs.org/source/tahoe-lafs/tarballs/
+MASTER_SITES=	https://tahoe-lafs.org/source/tahoe-lafs/tarballs/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -16,9 +12,6 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS=	gmake
 
-# $WRKDIR/Makefile has 'python' hardcoded; this works after hand-patching
-TEST_TARGET=	test
-
 # TODO
 # fix nevow: doc location
 
@@ -26,24 +19,25 @@ TEST_TARGET=	test
 BUILD_DEPENDS+=	${PYPKGPREFIX}-darcsver-[0-9]*:../../devel/py-darcsver
 
 DEPENDS+=	${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
-DEPENDS+=	${PYPKGPREFIX}-zfec-[0-9]*:../../converters/py-zfec
+DEPENDS+=	${PYPKGPREFIX}-zfec>=1.1.0:../../converters/py-zfec
 DEPENDS+=	${PYPKGPREFIX}-zbase32-[0-9]*:../../converters/py-zbase32
-DEPENDS+=	${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
+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.8.0:../../net/py-foolscap
-DEPENDS+=	${PYPKGPREFIX}-twisted>=13.0.0:../../net/py-twisted
+DEPENDS+=	${PYPKGPREFIX}-foolscap>=0.12.6:../../net/py-foolscap
+DEPENDS+=	${PYPKGPREFIX}-twisted>=16.1.0:../../net/py-twisted
 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.13:../../security/py-OpenSSL
+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
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-twisted, py-xml via py-nevow, py-zbase32, py-cryptopp
 
@@ -72,6 +66,9 @@ PKG_GROUPS=	tahoes
 PKG_USERS=	tahoes:tahoes
 PKG_GECOS.tahoes=	tahoe server
 
+do-test:
+	cd ${WRKSRC} && py.test-2.7
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/tahoe-lafs/PLIST b/filesystems/tahoe-lafs/PLIST
index 41cdf82e862..597d81217a7 100644
--- a/filesystems/tahoe-lafs/PLIST
+++ b/filesystems/tahoe-lafs/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2015/08/14 20:37:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/01/28 09:09:50 riastradh Exp $
 bin/tahoe
 ${PYSITELIB}/allmydata/__init__.py
 ${PYSITELIB}/allmydata/__init__.pyc
 ${PYSITELIB}/allmydata/__init__.pyo
-${PYSITELIB}/allmydata/_appname.py
-${PYSITELIB}/allmydata/_appname.pyc
-${PYSITELIB}/allmydata/_appname.pyo
+${PYSITELIB}/allmydata/__main__.py
+${PYSITELIB}/allmydata/__main__.pyc
+${PYSITELIB}/allmydata/__main__.pyo
 ${PYSITELIB}/allmydata/_auto_deps.py
 ${PYSITELIB}/allmydata/_auto_deps.pyc
 ${PYSITELIB}/allmydata/_auto_deps.pyo
@@ -27,9 +27,9 @@ ${PYSITELIB}/allmydata/codec.pyo
 ${PYSITELIB}/allmydata/control.py
 ${PYSITELIB}/allmydata/control.pyc
 ${PYSITELIB}/allmydata/control.pyo
-${PYSITELIB}/allmydata/debugshell.py
-${PYSITELIB}/allmydata/debugshell.pyc
-${PYSITELIB}/allmydata/debugshell.pyo
+${PYSITELIB}/allmydata/deep_stats.py
+${PYSITELIB}/allmydata/deep_stats.pyc
+${PYSITELIB}/allmydata/deep_stats.pyo
 ${PYSITELIB}/allmydata/dirnode.py
 ${PYSITELIB}/allmydata/dirnode.pyc
 ${PYSITELIB}/allmydata/dirnode.pyo
@@ -39,12 +39,12 @@ ${PYSITELIB}/allmydata/frontends/__init__.pyo
 ${PYSITELIB}/allmydata/frontends/auth.py
 ${PYSITELIB}/allmydata/frontends/auth.pyc
 ${PYSITELIB}/allmydata/frontends/auth.pyo
-${PYSITELIB}/allmydata/frontends/drop_upload.py
-${PYSITELIB}/allmydata/frontends/drop_upload.pyc
-${PYSITELIB}/allmydata/frontends/drop_upload.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
@@ -120,18 +120,15 @@ ${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
-${PYSITELIB}/allmydata/key_generator.py
-${PYSITELIB}/allmydata/key_generator.pyc
-${PYSITELIB}/allmydata/key_generator.pyo
-${PYSITELIB}/allmydata/manhole.py
-${PYSITELIB}/allmydata/manhole.pyc
-${PYSITELIB}/allmydata/manhole.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
@@ -195,9 +192,9 @@ ${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/keygen.py
-${PYSITELIB}/allmydata/scripts/keygen.pyc
-${PYSITELIB}/allmydata/scripts/keygen.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
@@ -297,6 +294,42 @@ ${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/cli/__init__.py
+${PYSITELIB}/allmydata/test/cli/__init__.pyc
+${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_backup.py
+${PYSITELIB}/allmydata/test/cli/test_backup.pyc
+${PYSITELIB}/allmydata/test/cli/test_backup.pyo
+${PYSITELIB}/allmydata/test/cli/test_check.py
+${PYSITELIB}/allmydata/test/cli/test_check.pyc
+${PYSITELIB}/allmydata/test/cli/test_check.pyo
+${PYSITELIB}/allmydata/test/cli/test_cli.py
+${PYSITELIB}/allmydata/test/cli/test_cli.pyc
+${PYSITELIB}/allmydata/test/cli/test_cli.pyo
+${PYSITELIB}/allmydata/test/cli/test_cp.py
+${PYSITELIB}/allmydata/test/cli/test_cp.pyc
+${PYSITELIB}/allmydata/test/cli/test_cp.pyo
+${PYSITELIB}/allmydata/test/cli/test_create.py
+${PYSITELIB}/allmydata/test/cli/test_create.pyc
+${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_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/common.py
 ${PYSITELIB}/allmydata/test/common.pyc
 ${PYSITELIB}/allmydata/test/common.pyo
@@ -306,9 +339,63 @@ ${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/mutable/__init__.py
+${PYSITELIB}/allmydata/test/mutable/__init__.pyc
+${PYSITELIB}/allmydata/test/mutable/__init__.pyo
+${PYSITELIB}/allmydata/test/mutable/test_checker.py
+${PYSITELIB}/allmydata/test/mutable/test_checker.pyc
+${PYSITELIB}/allmydata/test/mutable/test_checker.pyo
+${PYSITELIB}/allmydata/test/mutable/test_datahandle.py
+${PYSITELIB}/allmydata/test/mutable/test_datahandle.pyc
+${PYSITELIB}/allmydata/test/mutable/test_datahandle.pyo
+${PYSITELIB}/allmydata/test/mutable/test_different_encoding.py
+${PYSITELIB}/allmydata/test/mutable/test_different_encoding.pyc
+${PYSITELIB}/allmydata/test/mutable/test_different_encoding.pyo
+${PYSITELIB}/allmydata/test/mutable/test_exceptions.py
+${PYSITELIB}/allmydata/test/mutable/test_exceptions.pyc
+${PYSITELIB}/allmydata/test/mutable/test_exceptions.pyo
+${PYSITELIB}/allmydata/test/mutable/test_filehandle.py
+${PYSITELIB}/allmydata/test/mutable/test_filehandle.pyc
+${PYSITELIB}/allmydata/test/mutable/test_filehandle.pyo
+${PYSITELIB}/allmydata/test/mutable/test_filenode.py
+${PYSITELIB}/allmydata/test/mutable/test_filenode.pyc
+${PYSITELIB}/allmydata/test/mutable/test_filenode.pyo
+${PYSITELIB}/allmydata/test/mutable/test_interoperability.py
+${PYSITELIB}/allmydata/test/mutable/test_interoperability.pyc
+${PYSITELIB}/allmydata/test/mutable/test_interoperability.pyo
+${PYSITELIB}/allmydata/test/mutable/test_multiple_encodings.py
+${PYSITELIB}/allmydata/test/mutable/test_multiple_encodings.pyc
+${PYSITELIB}/allmydata/test/mutable/test_multiple_encodings.pyo
+${PYSITELIB}/allmydata/test/mutable/test_multiple_versions.py
+${PYSITELIB}/allmydata/test/mutable/test_multiple_versions.pyc
+${PYSITELIB}/allmydata/test/mutable/test_multiple_versions.pyo
+${PYSITELIB}/allmydata/test/mutable/test_problems.py
+${PYSITELIB}/allmydata/test/mutable/test_problems.pyc
+${PYSITELIB}/allmydata/test/mutable/test_problems.pyo
+${PYSITELIB}/allmydata/test/mutable/test_repair.py
+${PYSITELIB}/allmydata/test/mutable/test_repair.pyc
+${PYSITELIB}/allmydata/test/mutable/test_repair.pyo
+${PYSITELIB}/allmydata/test/mutable/test_roundtrip.py
+${PYSITELIB}/allmydata/test/mutable/test_roundtrip.pyc
+${PYSITELIB}/allmydata/test/mutable/test_roundtrip.pyo
+${PYSITELIB}/allmydata/test/mutable/test_servermap.py
+${PYSITELIB}/allmydata/test/mutable/test_servermap.pyc
+${PYSITELIB}/allmydata/test/mutable/test_servermap.pyo
+${PYSITELIB}/allmydata/test/mutable/test_update.py
+${PYSITELIB}/allmydata/test/mutable/test_update.pyc
+${PYSITELIB}/allmydata/test/mutable/test_update.pyo
+${PYSITELIB}/allmydata/test/mutable/test_version.py
+${PYSITELIB}/allmydata/test/mutable/test_version.pyc
+${PYSITELIB}/allmydata/test/mutable/test_version.pyo
+${PYSITELIB}/allmydata/test/mutable/util.py
+${PYSITELIB}/allmydata/test/mutable/util.pyc
+${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/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
@@ -321,36 +408,18 @@ ${PYSITELIB}/allmydata/test/test_base62.pyo
 ${PYSITELIB}/allmydata/test/test_checker.py
 ${PYSITELIB}/allmydata/test/test_checker.pyc
 ${PYSITELIB}/allmydata/test/test_checker.pyo
-${PYSITELIB}/allmydata/test/test_cli.py
-${PYSITELIB}/allmydata/test/test_cli.pyc
-${PYSITELIB}/allmydata/test/test_cli.pyo
-${PYSITELIB}/allmydata/test/test_cli_backup.py
-${PYSITELIB}/allmydata/test/test_cli_backup.pyc
-${PYSITELIB}/allmydata/test/test_cli_backup.pyo
-${PYSITELIB}/allmydata/test/test_cli_check.py
-${PYSITELIB}/allmydata/test/test_cli_check.pyc
-${PYSITELIB}/allmydata/test/test_cli_check.pyo
-${PYSITELIB}/allmydata/test/test_cli_cp.py
-${PYSITELIB}/allmydata/test/test_cli_cp.pyc
-${PYSITELIB}/allmydata/test/test_cli_cp.pyo
-${PYSITELIB}/allmydata/test/test_cli_create_alias.py
-${PYSITELIB}/allmydata/test/test_cli_create_alias.pyc
-${PYSITELIB}/allmydata/test/test_cli_create_alias.pyo
-${PYSITELIB}/allmydata/test/test_cli_list.py
-${PYSITELIB}/allmydata/test/test_cli_list.pyc
-${PYSITELIB}/allmydata/test/test_cli_list.pyo
-${PYSITELIB}/allmydata/test/test_cli_mv.py
-${PYSITELIB}/allmydata/test/test_cli_mv.pyc
-${PYSITELIB}/allmydata/test/test_cli_mv.pyo
-${PYSITELIB}/allmydata/test/test_cli_put.py
-${PYSITELIB}/allmydata/test/test_cli_put.pyc
-${PYSITELIB}/allmydata/test/test_cli_put.pyo
 ${PYSITELIB}/allmydata/test/test_client.py
 ${PYSITELIB}/allmydata/test/test_client.pyc
 ${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_configutil.py
+${PYSITELIB}/allmydata/test/test_configutil.pyc
+${PYSITELIB}/allmydata/test/test_configutil.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
@@ -363,9 +432,6 @@ ${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_drop_upload.py
-${PYSITELIB}/allmydata/test/test_drop_upload.pyc
-${PYSITELIB}/allmydata/test/test_drop_upload.pyo
 ${PYSITELIB}/allmydata/test/test_encode.py
 ${PYSITELIB}/allmydata/test/test_encode.pyc
 ${PYSITELIB}/allmydata/test/test_encode.pyo
@@ -387,6 +453,9 @@ ${PYSITELIB}/allmydata/test/test_helper.pyo
 ${PYSITELIB}/allmydata/test/test_hung_server.py
 ${PYSITELIB}/allmydata/test/test_hung_server.pyc
 ${PYSITELIB}/allmydata/test/test_hung_server.pyo
+${PYSITELIB}/allmydata/test/test_i2p_provider.py
+${PYSITELIB}/allmydata/test/test_i2p_provider.pyc
+${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
@@ -402,12 +471,15 @@ ${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_keygen.py
-${PYSITELIB}/allmydata/test/test_keygen.pyc
-${PYSITELIB}/allmydata/test/test_keygen.pyo
-${PYSITELIB}/allmydata/test/test_mutable.py
-${PYSITELIB}/allmydata/test/test_mutable.pyc
-${PYSITELIB}/allmydata/test/test_mutable.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
 ${PYSITELIB}/allmydata/test/test_netstring.py
 ${PYSITELIB}/allmydata/test/test_netstring.pyc
 ${PYSITELIB}/allmydata/test/test_netstring.pyo
@@ -441,6 +513,9 @@ ${PYSITELIB}/allmydata/test/test_storage_client.pyo
 ${PYSITELIB}/allmydata/test/test_system.py
 ${PYSITELIB}/allmydata/test/test_system.pyc
 ${PYSITELIB}/allmydata/test/test_system.pyo
+${PYSITELIB}/allmydata/test/test_tor_provider.py
+${PYSITELIB}/allmydata/test/test_tor_provider.pyc
+${PYSITELIB}/allmydata/test/test_tor_provider.pyo
 ${PYSITELIB}/allmydata/test/test_upload.py
 ${PYSITELIB}/allmydata/test/test_upload.pyc
 ${PYSITELIB}/allmydata/test/test_upload.pyo
@@ -453,12 +528,30 @@ ${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_web.py
-${PYSITELIB}/allmydata/test/test_web.pyc
-${PYSITELIB}/allmydata/test/test_web.pyo
-${PYSITELIB}/allmydata/test/trialtest.py
-${PYSITELIB}/allmydata/test/trialtest.pyc
-${PYSITELIB}/allmydata/test/trialtest.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/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_root.py
+${PYSITELIB}/allmydata/test/web/test_root.pyc
+${PYSITELIB}/allmydata/test/web/test_root.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/unknown.py
 ${PYSITELIB}/allmydata/unknown.pyc
 ${PYSITELIB}/allmydata/unknown.pyo
@@ -483,6 +576,12 @@ ${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
+${PYSITELIB}/allmydata/util/connection_status.py
+${PYSITELIB}/allmydata/util/connection_status.pyc
+${PYSITELIB}/allmydata/util/connection_status.pyo
 ${PYSITELIB}/allmydata/util/consumer.py
 ${PYSITELIB}/allmydata/util/consumer.pyc
 ${PYSITELIB}/allmydata/util/consumer.pyo
@@ -513,6 +612,9 @@ ${PYSITELIB}/allmydata/util/hashutil.pyo
 ${PYSITELIB}/allmydata/util/humanreadable.py
 ${PYSITELIB}/allmydata/util/humanreadable.pyc
 ${PYSITELIB}/allmydata/util/humanreadable.pyo
+${PYSITELIB}/allmydata/util/i2p_provider.py
+${PYSITELIB}/allmydata/util/i2p_provider.pyc
+${PYSITELIB}/allmydata/util/i2p_provider.pyo
 ${PYSITELIB}/allmydata/util/idlib.py
 ${PYSITELIB}/allmydata/util/idlib.pyc
 ${PYSITELIB}/allmydata/util/idlib.pyo
@@ -552,6 +654,9 @@ ${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
@@ -570,9 +675,15 @@ ${PYSITELIB}/allmydata/util/statistics.pyo
 ${PYSITELIB}/allmydata/util/time_format.py
 ${PYSITELIB}/allmydata/util/time_format.pyc
 ${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/web/__init__.py
 ${PYSITELIB}/allmydata/web/__init__.pyc
 ${PYSITELIB}/allmydata/web/__init__.pyo
@@ -605,6 +716,9 @@ ${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/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
@@ -652,6 +766,9 @@ ${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
@@ -662,12 +779,5 @@ ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${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 7193af6ea5a..d2bcdedd314 100644
--- a/filesystems/tahoe-lafs/distinfo
+++ b/filesystems/tahoe-lafs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 00:15:02 agc Exp $
+$NetBSD: distinfo,v 1.13 2017/01/28 09:09:50 riastradh Exp $
 
-SHA1 (allmydata-tahoe-1.10.2.tar.bz2) = f8ea798bb137611fda620d610367846e094eb609
-RMD160 (allmydata-tahoe-1.10.2.tar.bz2) = e8ff2cdad3b01bad3f672a75f54f5027cdf9d1c0
-SHA512 (allmydata-tahoe-1.10.2.tar.bz2) = 79d4e3395aa7ef8e1e7c97eebdfcb75b3b36edb75aa5d5f805c568b842b9b2f4ea5f8529dbf32fbdd9cc467cf82f153aca09310bc3b69fa00efae7be8a7bc198
-Size (allmydata-tahoe-1.10.2.tar.bz2) = 1378204 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