[pkgsrc/trunk]: pkgsrc/filesystems/tahoe-lafs tahoe-lafs: Revert to status qu...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/filesystems/tahoe-lafs tahoe-lafs: Revert to status qu...
From: gdt <gdt%pkgsrc.org@localhost>
Date: Fri, 19 Mar 2021 14:25:37 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c45743f955ea
branches:  trunk
changeset: 449012:c45743f955ea
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Fri Mar 19 12:56:36 2021 +0000

description:
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.

diffstat:

 filesystems/tahoe-lafs/Makefile |   86 ++++++------
 filesystems/tahoe-lafs/PLIST    |  271 +++++++++------------------------------
 filesystems/tahoe-lafs/distinfo |   10 +-
 3 files changed, 114 insertions(+), 253 deletions(-)

diffs (truncated from 740 to 300 lines):

diff -r 69c2ae6c1a2d -r c45743f955ea filesystems/tahoe-lafs/Makefile
--- a/filesystems/tahoe-lafs/Makefile   Fri Mar 19 12:19:28 2021 +0000
+++ b/filesystems/tahoe-lafs/Makefile   Fri Mar 19 12:56:36 2021 +0000
@@ -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@localhost
@@ -12,47 +13,34 @@
 
 USE_TOOLS=     gmake
 
-BROKEN=                bulk builds are not happy and this is not important
-
-# \todo: fix nevow doc location
-
-PYTHON_VERSIONS_ACCEPTED=      27 # py-xml via py-nevow, py-zbase32, py-cryptopp
-DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+# TODO
+# fix nevow: doc location
 
-# 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
-# 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
+# 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}-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}-zfec>=1.1.0:../../converters/py-zfec
+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
-DEPENDS+=      ${PYPKGPREFIX}-distro-[0-9]*:../../devel/py-distro
+# 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}-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
 
-# 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 @@
 # 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 -r 69c2ae6c1a2d -r c45743f955ea filesystems/tahoe-lafs/PLIST
--- a/filesystems/tahoe-lafs/PLIST      Fri Mar 19 12:19:28 2021 +0000
+++ b/filesystems/tahoe-lafs/PLIST      Fri Mar 19 12:56:36 2021 +0000
@@ -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/_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/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/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/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/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/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_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_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/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/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_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
Prev by Date: [pkgsrc/trunk]: pkgsrc/filesystems/tahoe-lafs tahoe-lafs: depend on py-crypto...
Next by Date: [pkgsrc/trunk]: pkgsrc/emulators/qemu Fix curses, patch by leot%NetBSD.org@localhost
Previous by Thread: [pkgsrc/trunk]: pkgsrc/filesystems/tahoe-lafs tahoe-lafs: depend on py-crypto...
Next by Thread: [pkgsrc/trunk]: pkgsrc/emulators/qemu Fix curses, patch by leot%NetBSD.org@localhost
Indexes:
Home | Main Index | Thread Index | Old Index