CVS commit: pkgsrc/net/py-onionbalance

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/py-onionbalance
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sun, 13 Apr 2025 08:05:55 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 13 08:05:55 UTC 2025

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

Log Message:
py-onionbalance: update to 0.2.3.

## v0.2.3 - 2024-12-11

* Maintenance:
    * Fix used-before-assignment ([tpo/onion-services/onionbalance!4][]).
    * Fix import on functional tests ([tpo/onion-services/onionbalance!5][]).
    * Drop dependency on future (thanks to Lumir Balhar) ([tpo/onion-services/onionbalance!6][]).
    * The v2 codebase was finally removed (thanks to Federico Ceratto)
      ([tpo/onion-services/onionbalance#8][]).
    * Fix coding style issues found by flake8 ([tpo/onion-services/onionbalance!9][]).
* Workflow:
    * CI was fixed and updated, and now uses [GitLab CI][].
    * Added Git tags to all previous releases.
* Repository:
    * The Onionbalance repository was moved to
      [gitlab.torproject.org/tpo/onion-services/onionbalance][onionbalance-repo].
    * The old repository at [github.com/torproject/onionbalance][old-repository] is
      configured as a mirror.
* Documentation:
    * Onionbalance documentation was migrated to [Onion MkDocs][], then updated and
      included in the [Onion Services Ecosystem][ecosystem]
      ([tpo/onion-services/onionbalance#28][]).
    * New canonical documentation URL is
      [onionservices.torproject.org/apps/base/onionbalance][onionbalance-docs].
      The old documentation URLs are kept as redirects
      (https://onionbalance-v3.readthedocs.io and
      https://onionbalance.readthedocs.io).
    * Updated this ChangeLog to include dates for all releases.

## v0.2.2 - 2021-07-29

* Add an OBv3 hacking guide.
* Remove tox and simplify build procedure.
* A single OnionBalance can now support multiple onion services.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/py-onionbalance/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/py-onionbalance/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/py-onionbalance/distinfo
cvs rdiff -u -r1.3 -r1.4 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.13 pkgsrc/net/py-onionbalance/Makefile:1.14
--- pkgsrc/net/py-onionbalance/Makefile:1.13    Sun Oct 13 10:10:50 2024
+++ pkgsrc/net/py-onionbalance/Makefile Sun Apr 13 08:05:55 2025
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.13 2024/10/13 10:10:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2025/04/13 08:05:55 wiz Exp $
 
-DISTNAME=      OnionBalance-0.2.1
+DISTNAME=      onionbalance-0.2.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=    net python
-MASTER_SITES=  ${MASTER_SITE_PYPI:=O/OnionBalance/}
+MASTER_SITES=  ${MASTER_SITE_PYPI:=o/onionbalance/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://onionbalance.readthedocs.io/
 COMMENT=       Tor onion service load balancer
 LICENSE=       gnu-gpl-v3
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
-DEPENDS+=      ${PYPKGPREFIX}-future>=0.14.0:../../devel/py-future
 DEPENDS+=      ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
 DEPENDS+=      ${PYPKGPREFIX}-stem>=1.8:../../devel/py-stem
 DEPENDS+=      ${PYPKGPREFIX}-yaml>=4.2:../../textproc/py-yaml
@@ -23,25 +23,10 @@ TEST_DEPENDS+=      ${PYPKGPREFIX}-tox-[0-9]*
 
 USE_LANGUAGES= # none
 
-USE_PKG_RESOURCES=     yes
-
-# https://gitlab.torproject.org/tpo/onion-services/onionbalance/-/issues/36
-PYTHON_VERSIONS_INCOMPATIBLE=  312 313
-
-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 && \
        ${MV} onionbalance onionbalance-${PYVERSSUFFIX} && \
        ${MV} onionbalance-config onionbalance-config-${PYVERSSUFFIX} || ${TRUE}
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-onionbalance/PLIST
diff -u pkgsrc/net/py-onionbalance/PLIST:1.5 pkgsrc/net/py-onionbalance/PLIST:1.6
--- pkgsrc/net/py-onionbalance/PLIST:1.5        Thu Jul 13 07:30:17 2023
+++ pkgsrc/net/py-onionbalance/PLIST    Sun Apr 13 08:05:55 2025
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2023/07/13 07:30:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/04/13 08:05:55 wiz 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}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/onionbalance/__init__.py
 ${PYSITELIB}/onionbalance/__init__.pyc
 ${PYSITELIB}/onionbalance/__init__.pyo
@@ -53,39 +53,6 @@ ${PYSITELIB}/onionbalance/config_generat
 ${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

Index: pkgsrc/net/py-onionbalance/distinfo
diff -u pkgsrc/net/py-onionbalance/distinfo:1.7 pkgsrc/net/py-onionbalance/distinfo:1.8
--- pkgsrc/net/py-onionbalance/distinfo:1.7     Thu Jul 13 07:30:17 2023
+++ pkgsrc/net/py-onionbalance/distinfo Sun Apr 13 08:05:55 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2023/07/13 07:30:17 adam Exp $
+$NetBSD: distinfo,v 1.8 2025/04/13 08:05:55 wiz Exp $
 
-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
+BLAKE2s (onionbalance-0.2.3.tar.gz) = 934901c0b1e053a168f3c7d83a5e39c788d70db71d4733bc44bd29f869e0f9f0
+SHA512 (onionbalance-0.2.3.tar.gz) = 9e38f9d52f00b761023e5039318219e52642d9732603c5fbcb89a6d66085f950a2934b1a23596def62eb993bb4587a789921b8bade5473f7ea7ab2fb0e269c84
+Size (onionbalance-0.2.3.tar.gz) = 87213 bytes
+SHA1 (patch-setup.py) = 7186cabc88934038695a7170eba1cde0a7c9cb4c

Index: pkgsrc/net/py-onionbalance/patches/patch-setup.py
diff -u pkgsrc/net/py-onionbalance/patches/patch-setup.py:1.3 pkgsrc/net/py-onionbalance/patches/patch-setup.py:1.4
--- pkgsrc/net/py-onionbalance/patches/patch-setup.py:1.3       Thu Jul 13 07:30:18 2023
+++ pkgsrc/net/py-onionbalance/patches/patch-setup.py   Sun Apr 13 08:05:55 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-setup.py,v 1.3 2023/07/13 07:30:18 adam Exp $
+$NetBSD: patch-setup.py,v 1.4 2025/04/13 08:05:55 wiz Exp $
 
 Replace pycryptodomex with pycryptodome.
 
---- setup.py.orig      2021-01-22 15:01:09.000000000 +0000
+--- setup.py.orig      2025-04-09 15:31:17.000000000 +0000
 +++ setup.py
-@@ -46,7 +46,7 @@ setup(
+@@ -47,7 +47,7 @@ setup(
          'setuptools',
          'stem>=1.8',
          'PyYAML>=4.2b1',
 -        'pycryptodomex',
 +        'pycryptodome',
-         'future>=0.14.0',
          'setproctitle',
          'cryptography>=2.5',
+     ],

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index