pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net py-onionbalance: depend on py-cryptodome (py-crypt...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3963cc95384c
branches:  trunk
changeset: 401570:3963cc95384c
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Sep 19 21:25:51 2019 +0000

description:
py-onionbalance: depend on py-cryptodome (py-crypto is dead); use ALTERNATIVES; bump revision

diffstat:

 net/Makefile                                |   3 +--
 net/onionbalance/DESCR                      |   6 ------
 net/onionbalance/Makefile                   |  21 ---------------------
 net/py-onionbalance/ALTERNATIVES            |   2 ++
 net/py-onionbalance/Makefile                |  19 ++++++++++---------
 net/py-onionbalance/Makefile.common         |   6 ------
 net/py-onionbalance/PLIST                   |   6 +++---
 net/py-onionbalance/distinfo                |   4 +++-
 net/py-onionbalance/patches/patch-setup.cfg |  12 ++++++++++++
 net/py-onionbalance/patches/patch-setup.py  |  15 +++++++++++++++
 10 files changed, 46 insertions(+), 48 deletions(-)

diffs (181 lines):

diff -r e4daf2a8d3ce -r 3963cc95384c net/Makefile
--- a/net/Makefile      Thu Sep 19 20:26:53 2019 +0000
+++ b/net/Makefile      Thu Sep 19 21:25:51 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1269 2019/09/15 13:00:33 nia Exp $
+# $NetBSD: Makefile,v 1.1270 2019/09/19 21:25:51 adam Exp $
 #
 
 COMMENT=       Networking tools
@@ -450,7 +450,6 @@
 SUBDIR+=       oinkmaster
 SUBDIR+=       omniNotify
 SUBDIR+=       omniORB
-SUBDIR+=       onionbalance
 SUBDIR+=       openag
 SUBDIR+=       openconnect
 SUBDIR+=       openh323
diff -r e4daf2a8d3ce -r 3963cc95384c net/onionbalance/DESCR
--- a/net/onionbalance/DESCR    Thu Sep 19 20:26:53 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-The OnionBalance software allows for Tor hidden service requests to be
-distributed across multiple backend Tor instances.  OnionBalance
-provides load-balancing while also making onion services more resilient
-and reliable by eliminating single points-of-failure.
-
-This is a meta-package for convenience.
diff -r e4daf2a8d3ce -r 3963cc95384c net/onionbalance/Makefile
--- a/net/onionbalance/Makefile Thu Sep 19 20:26:53 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2019/04/25 07:33:12 maya Exp $
-
-PKGREVISION= 1
-.include "../../net/py-onionbalance/Makefile.common"
-
-PKGNAME=       onionbalance-${VERSION}
-CATEGORIES=    net
-MASTER_FILES=  # empty
-DISTFILES=     # empty
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://onionbalance.readthedocs.org/
-COMMENT=       Tor onion service load balancer
-LICENSE=       gnu-gpl-v3
-
-DEPENDS+=      ${PYPKGPREFIX}-onionbalance>=${VERSION}:../../net/py-onionbalance
-
-META_PACKAGE=  yes
-
-.include "../../lang/python/pyversion.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r e4daf2a8d3ce -r 3963cc95384c net/py-onionbalance/ALTERNATIVES
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/py-onionbalance/ALTERNATIVES  Thu Sep 19 21:25:51 2019 +0000
@@ -0,0 +1,2 @@
+bin/onionbalance @PREFIX@/bin/onionbalance-@PYVERSSUFFIX@
+bin/onionbalance-config @PREFIX@/bin/onionbalance-config-@PYVERSSUFFIX@
diff -r e4daf2a8d3ce -r 3963cc95384c net/py-onionbalance/Makefile
--- a/net/py-onionbalance/Makefile      Thu Sep 19 20:26:53 2019 +0000
+++ b/net/py-onionbalance/Makefile      Thu Sep 19 21:25:51 2019 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2018/10/24 11:52:33 adam Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/19 21:25:52 adam Exp $
 
-.include "../../net/py-onionbalance/Makefile.common"
-
-DISTNAME=      OnionBalance-${VERSION}
+DISTNAME=      OnionBalance-0.1.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGREVISION=   1
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=O/OnionBalance/}
 
@@ -12,7 +11,7 @@
 COMMENT=       Tor onion service load balancer
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      ${PYPKGPREFIX}-crypto>=2.6.1:../../security/py-crypto
+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>=0.4.0:../../devel/py-stem
@@ -21,20 +20,22 @@
 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
 
-PYTHON_SELF_CONFLICT=  yes
-
+PYSETUPTESTTARGET=     pytest
 REPLACE_PYTHON+=       onionbalance.py
 REPLACE_PYTHON+=       docs/conf.py
 
 CHECK_INTERPRETER_SKIP+=       test/scripts/install-chutney.sh
 CHECK_INTERPRETER_SKIP+=       test/scripts/install-tor.sh
 
-do-test:
-       cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
+post-install:
+       cd ${DESTDIR}${PREFIX}/bin && \
+       ${MV} onionbalance onionbalance-${PYVERSSUFFIX} && \
+       ${MV} onionbalance-config onionbalance-config-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff -r e4daf2a8d3ce -r 3963cc95384c net/py-onionbalance/Makefile.common
--- a/net/py-onionbalance/Makefile.common       Thu Sep 19 20:26:53 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1 2018/10/23 03:18:06 riastradh Exp $
-
-# used by net/onionbalance/Makefile
-# used by net/py-onionbalance/Makefile
-
-VERSION=       0.1.8
diff -r e4daf2a8d3ce -r 3963cc95384c net/py-onionbalance/PLIST
--- a/net/py-onionbalance/PLIST Thu Sep 19 20:26:53 2019 +0000
+++ b/net/py-onionbalance/PLIST Thu Sep 19 21:25:51 2019 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2018/10/24 11:52:33 adam Exp $
-bin/onionbalance
-bin/onionbalance-config
+@comment $NetBSD: PLIST,v 1.3 2019/09/19 21:25:52 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
diff -r e4daf2a8d3ce -r 3963cc95384c net/py-onionbalance/distinfo
--- a/net/py-onionbalance/distinfo      Thu Sep 19 20:26:53 2019 +0000
+++ b/net/py-onionbalance/distinfo      Thu Sep 19 21:25:51 2019 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2018/10/24 11:52:33 adam Exp $
+$NetBSD: distinfo,v 1.3 2019/09/19 21:25:52 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
diff -r e4daf2a8d3ce -r 3963cc95384c net/py-onionbalance/patches/patch-setup.cfg
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/py-onionbalance/patches/patch-setup.cfg       Thu Sep 19 21:25:51 2019 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-setup.cfg,v 1.1 2019/09/19 21:25:52 adam Exp $
+
+[pytest] section in setup.cfg files is no longer supported.
+
+--- setup.cfg.orig     2019-09-19 21:12:50.000000000 +0000
++++ setup.cfg
+@@ -1,4 +1,4 @@
+-[pytest]
++[tool:pytest]
+ norecursedirs = .tox _build tor chutney
+ 
+ [bdist_wheel]
diff -r e4daf2a8d3ce -r 3963cc95384c net/py-onionbalance/patches/patch-setup.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/py-onionbalance/patches/patch-setup.py        Thu Sep 19 21:25:51 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.1 2019/09/19 21:25:52 adam Exp $
+
+Replace pycrypto with pycryptodome.
+
+--- setup.py.orig      2019-09-19 21:01:51.000000000 +0000
++++ setup.py
+@@ -43,7 +43,7 @@ setup(
+         'setuptools',
+         'stem>=1.4.0-dev',
+         'PyYAML>=3.11',
+-        'pycrypto>=2.6.1',
++        'pycryptodome',
+         'future>=0.14.0',
+         'setproctitle',
+         ],



Home | Main Index | Thread Index | Old Index