Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2ECDE84D52 for ; Thu, 13 Jul 2023 07:30:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id z7SsYp6WwaUT for ; Thu, 13 Jul 2023 07:30:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4F2C284FEB for ; Thu, 13 Jul 2023 07:30:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 457ABFBDB; Thu, 13 Jul 2023 07:30:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1689233418138760" MIME-Version: 1.0 Date: Thu, 13 Jul 2023 07:30:18 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/net/py-onionbalance To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20230713073018.457ABFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1689233418138760 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu Jul 13 07:30:18 UTC 2023 Modified Files: pkgsrc/net/py-onionbalance: Makefile PLIST distinfo pkgsrc/net/py-onionbalance/patches: patch-setup.py Log Message: py-onionbalance: updated to 0.2.1 0.2.1 v2 codebase now uses Cryptodome instead of the deprecated PyCrypto library. v3 codebase is now more flexible when it comes to requiring a live consensus. This should increase the reachability of Onionbalance in scenarios where the network is having trouble establishing a new consensus. v3 support for connecting to the control port through a Unix socket. Patch by Peter Tripp. Introduce status socket support for v3 onions. Patch by vporton. Sending a SIGHUP signal now reloads the v3 config. Patch by Peter Chung. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/py-onionbalance/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-onionbalance/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-onionbalance/distinfo cvs rdiff -u -r1.2 -r1.3 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. --_----------=_1689233418138760 Content-Disposition: inline Content-Length: 5523 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/py-onionbalance/Makefile diff -u pkgsrc/net/py-onionbalance/Makefile:1.10 pkgsrc/net/py-onionbalance/Makefile:1.11 --- pkgsrc/net/py-onionbalance/Makefile:1.10 Wed Oct 19 13:56:32 2022 +++ pkgsrc/net/py-onionbalance/Makefile Thu Jul 13 07:30:17 2023 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2022/10/19 13:56:32 nia Exp $ +# $NetBSD: Makefile,v 1.11 2023/07/13 07:30:17 adam Exp $ -DISTNAME= OnionBalance-0.2.0 +DISTNAME= OnionBalance-0.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} -PKGREVISION= 2 CATEGORIES= net python MASTER_SITES= ${MASTER_SITE_PYPI:=O/OnionBalance/} @@ -20,18 +19,23 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9] TEST_DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock -TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox USE_LANGUAGES= # none -PYSETUPTESTTARGET= pytest +USE_PKG_RESOURCES= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 -PYTHON_VERSIONED_DEPENDENCIES+= setuptools -PYTHON_VERSIONED_DEPENDENCIES+= cryptography -USE_PKG_RESOURCES= yes +SUBST_CLASSES+= crypto +SUBST_STAGE.crypto= pre-configure +SUBST_MESSAGE.crypto= Replace Cryptodome with Crypto +SUBST_FILES.crypto= onionbalance/config_generator/config_generator.py +SUBST_FILES.crypto+= onionbalance/hs_v2/descriptor.py +SUBST_FILES.crypto+= onionbalance/hs_v2/manager.py +SUBST_FILES.crypto+= onionbalance/hs_v2/service.py +SUBST_FILES.crypto+= onionbalance/hs_v2/util.py +SUBST_SED.crypto= -e 's,Cryptodome,Crypto,g' post-install: cd ${DESTDIR}${PREFIX}/bin && \ @@ -39,5 +43,4 @@ post-install: ${MV} onionbalance-config onionbalance-config-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" -.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-onionbalance/PLIST diff -u pkgsrc/net/py-onionbalance/PLIST:1.4 pkgsrc/net/py-onionbalance/PLIST:1.5 --- pkgsrc/net/py-onionbalance/PLIST:1.4 Tue May 12 18:40:35 2020 +++ pkgsrc/net/py-onionbalance/PLIST Thu Jul 13 07:30:17 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2020/05/12 18:40:35 adam Exp $ +@comment $NetBSD: PLIST,v 1.5 2023/07/13 07:30:17 adam Exp $ bin/onionbalance-${PYVERSSUFFIX} bin/onionbalance-config-${PYVERSSUFFIX} ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO @@ -37,6 +37,9 @@ ${PYSITELIB}/onionbalance/common/schedul ${PYSITELIB}/onionbalance/common/signalhandler.py ${PYSITELIB}/onionbalance/common/signalhandler.pyc ${PYSITELIB}/onionbalance/common/signalhandler.pyo +${PYSITELIB}/onionbalance/common/status.py +${PYSITELIB}/onionbalance/common/status.pyc +${PYSITELIB}/onionbalance/common/status.pyo ${PYSITELIB}/onionbalance/common/util.py ${PYSITELIB}/onionbalance/common/util.pyc ${PYSITELIB}/onionbalance/common/util.pyo @@ -119,6 +122,9 @@ ${PYSITELIB}/onionbalance/hs_v3/params.p ${PYSITELIB}/onionbalance/hs_v3/service.py ${PYSITELIB}/onionbalance/hs_v3/service.pyc ${PYSITELIB}/onionbalance/hs_v3/service.pyo +${PYSITELIB}/onionbalance/hs_v3/status.py +${PYSITELIB}/onionbalance/hs_v3/status.pyc +${PYSITELIB}/onionbalance/hs_v3/status.pyo ${PYSITELIB}/onionbalance/hs_v3/stem_controller.py ${PYSITELIB}/onionbalance/hs_v3/stem_controller.pyc ${PYSITELIB}/onionbalance/hs_v3/stem_controller.pyo Index: pkgsrc/net/py-onionbalance/distinfo diff -u pkgsrc/net/py-onionbalance/distinfo:1.6 pkgsrc/net/py-onionbalance/distinfo:1.7 --- pkgsrc/net/py-onionbalance/distinfo:1.6 Tue Oct 26 11:06:40 2021 +++ pkgsrc/net/py-onionbalance/distinfo Thu Jul 13 07:30:17 2023 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2021/10/26 11:06:40 nia Exp $ +$NetBSD: distinfo,v 1.7 2023/07/13 07:30:17 adam Exp $ -BLAKE2s (OnionBalance-0.2.0.tar.gz) = 57384f458f2cc16ccc954c24e66c7af27040e51af49d7aae19cb34204c97cf79 -SHA512 (OnionBalance-0.2.0.tar.gz) = 74601210d9d0703043fdc424120f3b2b5ef7daeeed512ce18cd21f81298a17f738914d6782d2ee868c0f58af1ffe7a25c0de95f8cc70a7dfac4c3a60352130a6 -Size (OnionBalance-0.2.0.tar.gz) = 92830 bytes -SHA1 (patch-setup.py) = cf1f186b0824931a53e03ff30d3070a78eb03f23 +BLAKE2s (OnionBalance-0.2.1.tar.gz) = 9e0f7f7037a7a535e59db8a30a9f8f83725c13ffba1f7ea6095f41e9fef3cb7f +SHA512 (OnionBalance-0.2.1.tar.gz) = 78e047156ed01f560564968f2b50f2a04893cd1d7ff49b5d5964c9f07ee779129893fd365aa590d3e8cd2bf465b9c3ae0d97c24ac1e07a7882bec0c5d065b3cd +Size (OnionBalance-0.2.1.tar.gz) = 95972 bytes +SHA1 (patch-setup.py) = ec78ae5e3e42fc71a5d7a9927f69012c9d3315c9 Index: pkgsrc/net/py-onionbalance/patches/patch-setup.py diff -u pkgsrc/net/py-onionbalance/patches/patch-setup.py:1.2 pkgsrc/net/py-onionbalance/patches/patch-setup.py:1.3 --- pkgsrc/net/py-onionbalance/patches/patch-setup.py:1.2 Tue May 12 18:40:35 2020 +++ pkgsrc/net/py-onionbalance/patches/patch-setup.py Thu Jul 13 07:30:18 2023 @@ -1,14 +1,14 @@ -$NetBSD: patch-setup.py,v 1.2 2020/05/12 18:40:35 adam Exp $ +$NetBSD: patch-setup.py,v 1.3 2023/07/13 07:30:18 adam Exp $ -Replace pycrypto with pycryptodome. +Replace pycryptodomex with pycryptodome. ---- setup.py.orig 2020-04-14 22:49:04.000000000 +0000 +--- setup.py.orig 2021-01-22 15:01:09.000000000 +0000 +++ setup.py @@ -46,7 +46,7 @@ setup( 'setuptools', 'stem>=1.8', 'PyYAML>=4.2b1', -- 'pycrypto>=2.6.1', +- 'pycryptodomex', + 'pycryptodome', 'future>=0.14.0', 'setproctitle', --_----------=_1689233418138760--