pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/filesystems/tahoe-lafs filesystems/tahoe-lafs: Update ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5674887cfc40
branches: trunk
changeset: 768393:5674887cfc40
user: gdt <gdt%pkgsrc.org@localhost>
date: Thu Oct 21 12:16:25 2021 +0000
description:
filesystems/tahoe-lafs: Update to 1.16.0
Packaging changes:
Mark as incompatible with python 2.7, compared to previous release
which is 2.7 only.
Rototill dependencies to align with setup.py, dropping several
previous ones.
Upstream news:
1.16.0:
The major change in this release is the completion of the Python 3
port -- while maintaining support for Python 2. A future release
will remove Python 2 support.
The previously deprecated subcommands "start", "stop", "restart"
and "daemonize" have been removed. You must now use "tahoe run"
(possibly along with your favourite daemonization software).
Several features are now removed: the Account Server,
stats-gatherer and FTP support.
Previous to 1.16, but new to pkgsrc in this update:
Magic Folder has been removed to a separate project.
New command 'tahoe status'.
diffstat:
filesystems/tahoe-lafs/Makefile | 105 ++-
filesystems/tahoe-lafs/PLIST | 297 ++++++---
filesystems/tahoe-lafs/distinfo | 9 +-
filesystems/tahoe-lafs/patches/patch-src_allmydata___auto__deps.py | 15 -
4 files changed, 253 insertions(+), 173 deletions(-)
diffs (truncated from 795 to 300 lines):
diff -r 82e98d7d01cd -r 5674887cfc40 filesystems/tahoe-lafs/Makefile
--- a/filesystems/tahoe-lafs/Makefile Thu Oct 21 12:06:22 2021 +0000
+++ b/filesystems/tahoe-lafs/Makefile Thu Oct 21 12:16:25 2021 +0000
@@ -1,46 +1,73 @@
-# $NetBSD: Makefile,v 1.51 2021/03/19 14:30:23 gdt Exp $
+# $NetBSD: Makefile,v 1.52 2021/10/21 12:16:25 gdt Exp $
-DISTNAME= tahoe-lafs-1.12.1
-PKGREVISION= 3
+VERSION_BASE= 1.16.0
+VERSION_RC=
+DISTNAME= tahoe-lafs-${VERSION_BASE}${VERSION_RC}
CATEGORIES= filesystems
-MASTER_SITES= https://tahoe-lafs.org/source/tahoe-lafs/tarballs/
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= https://tahoe-lafs.org/downloads/
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= gdt%NetBSD.org@localhost
HOMEPAGE= http://tahoe-lafs.org/
COMMENT= Distributed fault-tolerant least-authority filesystem
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
-# Included egg darcsver, but depend anyway.
-BUILD_DEPENDS+= ${PYPKGPREFIX}-darcsver-[0-9]*:../../devel/py-darcsver
-
-DEPENDS+= ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
-DEPENDS+= ${PYPKGPREFIX}-zfec>=1.1.0:../../converters/py-zfec
-DEPENDS+= ${PYPKGPREFIX}-zbase32-[0-9]*:../../converters/py-zbase32
-DEPENDS+= ${PYPKGPREFIX}-simplejson>=1.4:../../converters/py-simplejson
+# The world sees this as part of base python.
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}-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}-cryptodome-[0-9]*:../../security/py-cryptodome
-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
+
+## Dependencies are from tahoe's setup.py, in order
+# install_requires
+# setuptools 28.8.0
+DEPENDS+= ${PYPKGPREFIX}-zfec>=1.1.0:../../converters/py-zfec
+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
+# twisted needs tls, conch options. pkgsrc has tls.
+# TODO: conch??
+DEPENDS+= ${PYPKGPREFIX}-twisted>=19.10.0:../../net/py-twisted
+# bcrypt and appdirs required as twisted deps at runtime
+# TODO: resolve
+DEPENDS+= ${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
+DEPENDS+= ${PYPKGPREFIX}-appdirs-[0-9]*:../../devel/py-appdirs
DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
+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
+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
+# tor_requires
+DEPENDS+= ${PYPKGPREFIX}-txtorcon>=0.17.0:../../net/py-txtorcon
+# txi2p-requires
+# DEPENDS+= ${PYPKGPREFIX}-txi2p-tahoe>=0.3.5:../../net/py-txi2p-tahoe
-PYTHON_VERSIONS_ACCEPTED= 27 # py-xml via py-nevow, py-zbase32, py-cryptopp, py-darcsver
+# test_requires
+# pyflakes
+# coverage
+# mock
+# tox
+# pytest
+# pytest-twisted
+# hypothesis
+# treq
+# towncrier
+# testtools
+# fixtures
+# beautifulsoup4
+# html5lib
+# junitxml
+# tenacity
+# paramiko
+# pytest-timeout
# Note that there is an upstream (inherited from setuptools) bug
# https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1258#comment:29 that
@@ -48,25 +75,13 @@
# 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
-do-test:
- cd ${WRKSRC} && py.test-2.7
+# \todo Convert do-test to use tox
+#do-test:
+# cd ${WRKSRC} && py.test-3.8
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
diff -r 82e98d7d01cd -r 5674887cfc40 filesystems/tahoe-lafs/PLIST
--- a/filesystems/tahoe-lafs/PLIST Thu Oct 21 12:06:22 2021 +0000
+++ b/filesystems/tahoe-lafs/PLIST Thu Oct 21 12:16:25 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2021/03/19 12:56:36 gdt Exp $
+@comment $NetBSD: PLIST,v 1.13 2021/10/21 12:16:25 gdt Exp $
bin/tahoe
${PYSITELIB}/allmydata/__init__.py
${PYSITELIB}/allmydata/__init__.pyc
@@ -9,6 +9,9 @@
${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
@@ -27,6 +30,24 @@
${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
@@ -39,12 +60,6 @@
${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/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
@@ -90,6 +105,9 @@
${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
@@ -123,12 +141,6 @@
${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
@@ -192,21 +204,12 @@
${PYSITELIB}/allmydata/scripts/default_nodedir.py
${PYSITELIB}/allmydata/scripts/default_nodedir.pyc
${PYSITELIB}/allmydata/scripts/default_nodedir.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
${PYSITELIB}/allmydata/scripts/tahoe_add_alias.py
${PYSITELIB}/allmydata/scripts/tahoe_add_alias.pyc
${PYSITELIB}/allmydata/scripts/tahoe_add_alias.pyo
@@ -222,6 +225,9 @@
${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
@@ -237,12 +243,21 @@
${PYSITELIB}/allmydata/scripts/tahoe_put.py
${PYSITELIB}/allmydata/scripts/tahoe_put.pyc
${PYSITELIB}/allmydata/scripts/tahoe_put.pyo
+${PYSITELIB}/allmydata/scripts/tahoe_run.py
+${PYSITELIB}/allmydata/scripts/tahoe_run.pyc
+${PYSITELIB}/allmydata/scripts/tahoe_run.pyo
+${PYSITELIB}/allmydata/scripts/tahoe_status.py
+${PYSITELIB}/allmydata/scripts/tahoe_status.pyc
+${PYSITELIB}/allmydata/scripts/tahoe_status.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
@@ -279,30 +294,24 @@
${PYSITELIB}/allmydata/test/__init__.py
${PYSITELIB}/allmydata/test/__init__.pyc
${PYSITELIB}/allmydata/test/__init__.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
-${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
${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
Home |
Main Index |
Thread Index |
Old Index