CVS commit: pkgsrc/net/py-onionbalance

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue May 12 18:40:35 UTC 2020

Modified Files:
        pkgsrc/net/py-onionbalance: Makefile PLIST distinfo
        pkgsrc/net/py-onionbalance/patches: patch-setup.py
Removed Files:
        pkgsrc/net/py-onionbalance/patches: patch-setup.cfg

Log Message:
py-onionbalance: updated to 0.2.0

0.2.0
Allow migration from Tor to Onionbalance by reading tor private keys directly using the ‘key’ directive in the YAML config file. Also update onionbalance-config to support that.
Improve onionbalance-config for v3 onions. Simplify the output directory (and change docs to reflect so) and the wizard suggestions.

0.1.9
Initial support for v3 onions!


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/py-onionbalance/Makefile \
    pkgsrc/net/py-onionbalance/PLIST pkgsrc/net/py-onionbalance/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/py-onionbalance/patches/patch-setup.cfg
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-onionbalance/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/net/py-onionbalance/Makefile
diff -u pkgsrc/net/py-onionbalance/Makefile:1.3 pkgsrc/net/py-onionbalance/Makefile:1.4
--- pkgsrc/net/py-onionbalance/Makefile:1.3     Thu Sep 19 21:25:52 2019
+++ pkgsrc/net/py-onionbalance/Makefile Tue May 12 18:40:35 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2019/09/19 21:25:52 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/12 18:40:35 adam Exp $
 
-DISTNAME=      OnionBalance-0.1.8
+DISTNAME=      OnionBalance-0.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=   1
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=O/OnionBalance/}
 
@@ -12,10 +11,12 @@ COMMENT=    Tor onion service load balancer
 LICENSE=       gnu-gpl-v3
 
 DEPENDS+=      ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
+DEPENDS+=      ${PYPKGPREFIX}-cryptography>=2.5:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-future>=0.14.0:../../devel/py-future
 DEPENDS+=      ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
-DEPENDS+=      ${PYPKGPREFIX}-stem>=0.4.0:../../devel/py-stem
-DEPENDS+=      ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
+DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+DEPENDS+=      ${PYPKGPREFIX}-stem>=1.8:../../devel/py-stem
+DEPENDS+=      ${PYPKGPREFIX}-yaml>=4.2:../../textproc/py-yaml
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
@@ -29,6 +30,8 @@ PYSETUPTESTTARGET=    pytest
 REPLACE_PYTHON+=       onionbalance.py
 REPLACE_PYTHON+=       docs/conf.py
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 CHECK_INTERPRETER_SKIP+=       test/scripts/install-chutney.sh
 CHECK_INTERPRETER_SKIP+=       test/scripts/install-tor.sh
 
Index: pkgsrc/net/py-onionbalance/PLIST
diff -u pkgsrc/net/py-onionbalance/PLIST:1.3 pkgsrc/net/py-onionbalance/PLIST:1.4
--- pkgsrc/net/py-onionbalance/PLIST:1.3        Thu Sep 19 21:25:52 2019
+++ pkgsrc/net/py-onionbalance/PLIST    Tue May 12 18:40:35 2020
@@ -1,55 +1,133 @@
-@comment $NetBSD: PLIST,v 1.3 2019/09/19 21:25:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/05/12 18:40:35 adam Exp $
 bin/onionbalance-${PYVERSSUFFIX}
 bin/onionbalance-config-${PYVERSSUFFIX}
 ${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}/pbr.json
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/onionbalance/__init__.py
 ${PYSITELIB}/onionbalance/__init__.pyc
 ${PYSITELIB}/onionbalance/__init__.pyo
-${PYSITELIB}/onionbalance/__main__.py
-${PYSITELIB}/onionbalance/__main__.pyc
-${PYSITELIB}/onionbalance/__main__.pyo
-${PYSITELIB}/onionbalance/config.py
-${PYSITELIB}/onionbalance/config.pyc
-${PYSITELIB}/onionbalance/config.pyo
-${PYSITELIB}/onionbalance/consensus.py
-${PYSITELIB}/onionbalance/consensus.pyc
-${PYSITELIB}/onionbalance/consensus.pyo
-${PYSITELIB}/onionbalance/data/config.example.yaml
-${PYSITELIB}/onionbalance/data/torrc-instance
-${PYSITELIB}/onionbalance/data/torrc-server
-${PYSITELIB}/onionbalance/descriptor.py
-${PYSITELIB}/onionbalance/descriptor.pyc
-${PYSITELIB}/onionbalance/descriptor.pyo
-${PYSITELIB}/onionbalance/eventhandler.py
-${PYSITELIB}/onionbalance/eventhandler.pyc
-${PYSITELIB}/onionbalance/eventhandler.pyo
-${PYSITELIB}/onionbalance/instance.py
-${PYSITELIB}/onionbalance/instance.pyc
-${PYSITELIB}/onionbalance/instance.pyo
-${PYSITELIB}/onionbalance/log.py
-${PYSITELIB}/onionbalance/log.pyc
-${PYSITELIB}/onionbalance/log.pyo
+${PYSITELIB}/onionbalance/_version.py
+${PYSITELIB}/onionbalance/_version.pyc
+${PYSITELIB}/onionbalance/_version.pyo
+${PYSITELIB}/onionbalance/common/__init__.py
+${PYSITELIB}/onionbalance/common/__init__.pyc
+${PYSITELIB}/onionbalance/common/__init__.pyo
+${PYSITELIB}/onionbalance/common/argparser.py
+${PYSITELIB}/onionbalance/common/argparser.pyc
+${PYSITELIB}/onionbalance/common/argparser.pyo
+${PYSITELIB}/onionbalance/common/descriptor.py
+${PYSITELIB}/onionbalance/common/descriptor.pyc
+${PYSITELIB}/onionbalance/common/descriptor.pyo
+${PYSITELIB}/onionbalance/common/instance.py
+${PYSITELIB}/onionbalance/common/instance.pyc
+${PYSITELIB}/onionbalance/common/instance.pyo
+${PYSITELIB}/onionbalance/common/intro_point_set.py
+${PYSITELIB}/onionbalance/common/intro_point_set.pyc
+${PYSITELIB}/onionbalance/common/intro_point_set.pyo
+${PYSITELIB}/onionbalance/common/log.py
+${PYSITELIB}/onionbalance/common/log.pyc
+${PYSITELIB}/onionbalance/common/log.pyo
+${PYSITELIB}/onionbalance/common/scheduler.py
+${PYSITELIB}/onionbalance/common/scheduler.pyc
+${PYSITELIB}/onionbalance/common/scheduler.pyo
+${PYSITELIB}/onionbalance/common/signalhandler.py
+${PYSITELIB}/onionbalance/common/signalhandler.pyc
+${PYSITELIB}/onionbalance/common/signalhandler.pyo
+${PYSITELIB}/onionbalance/common/util.py
+${PYSITELIB}/onionbalance/common/util.pyc
+${PYSITELIB}/onionbalance/common/util.pyo
+${PYSITELIB}/onionbalance/config_generator/__init__.py
+${PYSITELIB}/onionbalance/config_generator/__init__.pyc
+${PYSITELIB}/onionbalance/config_generator/__init__.pyo
+${PYSITELIB}/onionbalance/config_generator/config_generator.py
+${PYSITELIB}/onionbalance/config_generator/config_generator.pyc
+${PYSITELIB}/onionbalance/config_generator/config_generator.pyo
+${PYSITELIB}/onionbalance/config_generator/data/config.example.yaml
+${PYSITELIB}/onionbalance/config_generator/data/torrc-instance-v2
+${PYSITELIB}/onionbalance/config_generator/data/torrc-instance-v3
+${PYSITELIB}/onionbalance/config_generator/data/torrc-server
+${PYSITELIB}/onionbalance/hs_v2/__init__.py
+${PYSITELIB}/onionbalance/hs_v2/__init__.pyc
+${PYSITELIB}/onionbalance/hs_v2/__init__.pyo
+${PYSITELIB}/onionbalance/hs_v2/config.py
+${PYSITELIB}/onionbalance/hs_v2/config.pyc
+${PYSITELIB}/onionbalance/hs_v2/config.pyo
+${PYSITELIB}/onionbalance/hs_v2/consensus.py
+${PYSITELIB}/onionbalance/hs_v2/consensus.pyc
+${PYSITELIB}/onionbalance/hs_v2/consensus.pyo
+${PYSITELIB}/onionbalance/hs_v2/descriptor.py
+${PYSITELIB}/onionbalance/hs_v2/descriptor.pyc
+${PYSITELIB}/onionbalance/hs_v2/descriptor.pyo
+${PYSITELIB}/onionbalance/hs_v2/eventhandler.py
+${PYSITELIB}/onionbalance/hs_v2/eventhandler.pyc
+${PYSITELIB}/onionbalance/hs_v2/eventhandler.pyo
+${PYSITELIB}/onionbalance/hs_v2/instance.py
+${PYSITELIB}/onionbalance/hs_v2/instance.pyc
+${PYSITELIB}/onionbalance/hs_v2/instance.pyo
+${PYSITELIB}/onionbalance/hs_v2/manager.py
+${PYSITELIB}/onionbalance/hs_v2/manager.pyc
+${PYSITELIB}/onionbalance/hs_v2/manager.pyo
+${PYSITELIB}/onionbalance/hs_v2/service.py
+${PYSITELIB}/onionbalance/hs_v2/service.pyc
+${PYSITELIB}/onionbalance/hs_v2/service.pyo
+${PYSITELIB}/onionbalance/hs_v2/settings.py
+${PYSITELIB}/onionbalance/hs_v2/settings.pyc
+${PYSITELIB}/onionbalance/hs_v2/settings.pyo
+${PYSITELIB}/onionbalance/hs_v2/status.py
+${PYSITELIB}/onionbalance/hs_v2/status.pyc
+${PYSITELIB}/onionbalance/hs_v2/status.pyo
+${PYSITELIB}/onionbalance/hs_v2/util.py
+${PYSITELIB}/onionbalance/hs_v2/util.pyc
+${PYSITELIB}/onionbalance/hs_v2/util.pyo
+${PYSITELIB}/onionbalance/hs_v3/__init__.py
+${PYSITELIB}/onionbalance/hs_v3/__init__.pyc
+${PYSITELIB}/onionbalance/hs_v3/__init__.pyo
+${PYSITELIB}/onionbalance/hs_v3/consensus.py
+${PYSITELIB}/onionbalance/hs_v3/consensus.pyc
+${PYSITELIB}/onionbalance/hs_v3/consensus.pyo
+${PYSITELIB}/onionbalance/hs_v3/descriptor.py
+${PYSITELIB}/onionbalance/hs_v3/descriptor.pyc
+${PYSITELIB}/onionbalance/hs_v3/descriptor.pyo
+${PYSITELIB}/onionbalance/hs_v3/ext/__init__.py
+${PYSITELIB}/onionbalance/hs_v3/ext/__init__.pyc
+${PYSITELIB}/onionbalance/hs_v3/ext/__init__.pyo
+${PYSITELIB}/onionbalance/hs_v3/ext/ed25519_exts_ref.py
+${PYSITELIB}/onionbalance/hs_v3/ext/ed25519_exts_ref.pyc
+${PYSITELIB}/onionbalance/hs_v3/ext/ed25519_exts_ref.pyo
+${PYSITELIB}/onionbalance/hs_v3/ext/slow_ed25519.py
+${PYSITELIB}/onionbalance/hs_v3/ext/slow_ed25519.pyc
+${PYSITELIB}/onionbalance/hs_v3/ext/slow_ed25519.pyo
+${PYSITELIB}/onionbalance/hs_v3/hashring.py
+${PYSITELIB}/onionbalance/hs_v3/hashring.pyc
+${PYSITELIB}/onionbalance/hs_v3/hashring.pyo
+${PYSITELIB}/onionbalance/hs_v3/instance.py
+${PYSITELIB}/onionbalance/hs_v3/instance.pyc
+${PYSITELIB}/onionbalance/hs_v3/instance.pyo
+${PYSITELIB}/onionbalance/hs_v3/manager.py
+${PYSITELIB}/onionbalance/hs_v3/manager.pyc
+${PYSITELIB}/onionbalance/hs_v3/manager.pyo
+${PYSITELIB}/onionbalance/hs_v3/onionbalance.py
+${PYSITELIB}/onionbalance/hs_v3/onionbalance.pyc
+${PYSITELIB}/onionbalance/hs_v3/onionbalance.pyo
+${PYSITELIB}/onionbalance/hs_v3/params.py
+${PYSITELIB}/onionbalance/hs_v3/params.pyc
+${PYSITELIB}/onionbalance/hs_v3/params.pyo
+${PYSITELIB}/onionbalance/hs_v3/service.py
+${PYSITELIB}/onionbalance/hs_v3/service.pyc
+${PYSITELIB}/onionbalance/hs_v3/service.pyo
+${PYSITELIB}/onionbalance/hs_v3/stem_controller.py
+${PYSITELIB}/onionbalance/hs_v3/stem_controller.pyc
+${PYSITELIB}/onionbalance/hs_v3/stem_controller.pyo
+${PYSITELIB}/onionbalance/hs_v3/tor_ed25519.py
+${PYSITELIB}/onionbalance/hs_v3/tor_ed25519.pyc
+${PYSITELIB}/onionbalance/hs_v3/tor_ed25519.pyo
+${PYSITELIB}/onionbalance/hs_v3/tor_node.py
+${PYSITELIB}/onionbalance/hs_v3/tor_node.pyc
+${PYSITELIB}/onionbalance/hs_v3/tor_node.pyo
 ${PYSITELIB}/onionbalance/manager.py
 ${PYSITELIB}/onionbalance/manager.pyc
 ${PYSITELIB}/onionbalance/manager.pyo
-${PYSITELIB}/onionbalance/scheduler.py
-${PYSITELIB}/onionbalance/scheduler.pyc
-${PYSITELIB}/onionbalance/scheduler.pyo
-${PYSITELIB}/onionbalance/service.py
-${PYSITELIB}/onionbalance/service.pyc
-${PYSITELIB}/onionbalance/service.pyo
-${PYSITELIB}/onionbalance/settings.py
-${PYSITELIB}/onionbalance/settings.pyc
-${PYSITELIB}/onionbalance/settings.pyo
-${PYSITELIB}/onionbalance/status.py
-${PYSITELIB}/onionbalance/status.pyc
-${PYSITELIB}/onionbalance/status.pyo
-${PYSITELIB}/onionbalance/util.py
-${PYSITELIB}/onionbalance/util.pyc
-${PYSITELIB}/onionbalance/util.pyo
Index: pkgsrc/net/py-onionbalance/distinfo
diff -u pkgsrc/net/py-onionbalance/distinfo:1.3 pkgsrc/net/py-onionbalance/distinfo:1.4
--- pkgsrc/net/py-onionbalance/distinfo:1.3     Thu Sep 19 21:25:52 2019
+++ pkgsrc/net/py-onionbalance/distinfo Tue May 12 18:40:35 2020
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2019/09/19 21:25:52 adam Exp $
+$NetBSD: distinfo,v 1.4 2020/05/12 18:40:35 adam Exp $
 
-SHA1 (OnionBalance-0.1.8.tar.gz) = ec37b1ed1314318853f6f149c265853462c4be77
-RMD160 (OnionBalance-0.1.8.tar.gz) = fbdfe5e4e815595c89f5d0fdfc1a3ea290c6e519
-SHA512 (OnionBalance-0.1.8.tar.gz) = dc43a8419a6bb2d3b44dfa6f6be3ea7ed4e303c41b64249e82156610d712b5c717be47c90e6b8b37f6d4308dd616cc4312aa6132a73a8a9136f1027375a4cca6
-Size (OnionBalance-0.1.8.tar.gz) = 55919 bytes
-SHA1 (patch-setup.cfg) = 19d538a5032010eeecfb7419c611d50be77ddb01
-SHA1 (patch-setup.py) = ff228d5030dfd0a826cff04986a30a9cd1a066e2
+SHA1 (OnionBalance-0.2.0.tar.gz) = 48ff20e6874b02a213471d659ff01bd22911c691
+RMD160 (OnionBalance-0.2.0.tar.gz) = 0e86a66ce0aea6218fbc1ad67ddafde48a885982
+SHA512 (OnionBalance-0.2.0.tar.gz) = 74601210d9d0703043fdc424120f3b2b5ef7daeeed512ce18cd21f81298a17f738914d6782d2ee868c0f58af1ffe7a25c0de95f8cc70a7dfac4c3a60352130a6
+Size (OnionBalance-0.2.0.tar.gz) = 92830 bytes
+SHA1 (patch-setup.py) = cf1f186b0824931a53e03ff30d3070a78eb03f23

Index: pkgsrc/net/py-onionbalance/patches/patch-setup.py
diff -u pkgsrc/net/py-onionbalance/patches/patch-setup.py:1.1 pkgsrc/net/py-onionbalance/patches/patch-setup.py:1.2
--- pkgsrc/net/py-onionbalance/patches/patch-setup.py:1.1       Thu Sep 19 21:25:52 2019
+++ pkgsrc/net/py-onionbalance/patches/patch-setup.py   Tue May 12 18:40:35 2020
@@ -1,15 +1,15 @@
-$NetBSD: patch-setup.py,v 1.1 2019/09/19 21:25:52 adam Exp $
+$NetBSD: patch-setup.py,v 1.2 2020/05/12 18:40:35 adam Exp $
 
 Replace pycrypto with pycryptodome.
 
---- setup.py.orig      2019-09-19 21:01:51.000000000 +0000
+--- setup.py.orig      2020-04-14 22:49:04.000000000 +0000
 +++ setup.py
-@@ -43,7 +43,7 @@ setup(
+@@ -46,7 +46,7 @@ setup(
          'setuptools',
-         'stem>=1.4.0-dev',
-         'PyYAML>=3.11',
+         'stem>=1.8',
+         'PyYAML>=4.2b1',
 -        'pycrypto>=2.6.1',
 +        'pycryptodome',
          'future>=0.14.0',
          'setproctitle',
-         ],
+         'cryptography>=2.5',