Thu Sep 19 21:25:52 2019 UTC ()
py-onionbalance: depend on py-cryptodome (py-crypto is dead); use ALTERNATIVES; bump revision


(adam)
diff -r1.1269 -r1.1270 pkgsrc/net/Makefile
diff -r1.1 -r0 pkgsrc/net/onionbalance/DESCR
diff -r1.2 -r0 pkgsrc/net/onionbalance/Makefile
diff -r0 -r1.1 pkgsrc/net/py-onionbalance/ALTERNATIVES
diff -r1.2 -r1.3 pkgsrc/net/py-onionbalance/Makefile
diff -r1.2 -r1.3 pkgsrc/net/py-onionbalance/PLIST
diff -r1.2 -r1.3 pkgsrc/net/py-onionbalance/distinfo
diff -r1.1 -r0 pkgsrc/net/py-onionbalance/Makefile.common
diff -r0 -r1.1 pkgsrc/net/py-onionbalance/patches/patch-setup.cfg
diff -r0 -r1.1 pkgsrc/net/py-onionbalance/patches/patch-setup.py
cvs diff -r1.1269 -r1.1270 pkgsrc/net/Makefile (expand / switch to unified diff)

--- pkgsrc/net/Makefile 2019/09/15 13:00:33 1.1269
+++ pkgsrc/net/Makefile 2019/09/19 21:25:51 1.1270
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1269 2019/09/15 13:00:33 nia Exp $ 1# $NetBSD: Makefile,v 1.1270 2019/09/19 21:25:51 adam Exp $
2# 2#
3 3
4COMMENT= Networking tools 4COMMENT= Networking tools
5 5
6SUBDIR+= 3proxy 6SUBDIR+= 3proxy
7SUBDIR+= 6tunnel 7SUBDIR+= 6tunnel
8SUBDIR+= DarwinStreamingServer 8SUBDIR+= DarwinStreamingServer
9SUBDIR+= GeoIP 9SUBDIR+= GeoIP
10SUBDIR+= Geomyidae 10SUBDIR+= Geomyidae
11SUBDIR+= IglooFTP 11SUBDIR+= IglooFTP
12SUBDIR+= LaBrea 12SUBDIR+= LaBrea
13SUBDIR+= ORBit 13SUBDIR+= ORBit
14SUBDIR+= ORBit2 14SUBDIR+= ORBit2
@@ -440,27 +440,26 @@ SUBDIR+= ntopng @@ -440,27 +440,26 @@ SUBDIR+= ntopng
440SUBDIR+= ntp4 440SUBDIR+= ntp4
441SUBDIR+= nyx 441SUBDIR+= nyx
442SUBDIR+= obfs4proxy 442SUBDIR+= obfs4proxy
443SUBDIR+= ocaml-conduit 443SUBDIR+= ocaml-conduit
444SUBDIR+= ocaml-ipaddr 444SUBDIR+= ocaml-ipaddr
445SUBDIR+= ocaml-protocol_version_header 445SUBDIR+= ocaml-protocol_version_header
446SUBDIR+= ocamlnet 446SUBDIR+= ocamlnet
447SUBDIR+= ocsinventory-agent 447SUBDIR+= ocsinventory-agent
448SUBDIR+= ocsync 448SUBDIR+= ocsync
449SUBDIR+= oidentd 449SUBDIR+= oidentd
450SUBDIR+= oinkmaster 450SUBDIR+= oinkmaster
451SUBDIR+= omniNotify 451SUBDIR+= omniNotify
452SUBDIR+= omniORB 452SUBDIR+= omniORB
453SUBDIR+= onionbalance 
454SUBDIR+= openag 453SUBDIR+= openag
455SUBDIR+= openconnect 454SUBDIR+= openconnect
456SUBDIR+= openh323 455SUBDIR+= openh323
457SUBDIR+= openntpd 456SUBDIR+= openntpd
458SUBDIR+= openresolv 457SUBDIR+= openresolv
459SUBDIR+= openrsync 458SUBDIR+= openrsync
460SUBDIR+= openslp 459SUBDIR+= openslp
461SUBDIR+= openvmps 460SUBDIR+= openvmps
462SUBDIR+= openvpn 461SUBDIR+= openvpn
463SUBDIR+= openvpn-acct-wtmpx 462SUBDIR+= openvpn-acct-wtmpx
464SUBDIR+= openvpn-nagios 463SUBDIR+= openvpn-nagios
465SUBDIR+= openwbem 464SUBDIR+= openwbem
466SUBDIR+= ortp 465SUBDIR+= ortp
File Deleted: pkgsrc/net/onionbalance/Attic/DESCR
File Deleted: pkgsrc/net/onionbalance/Attic/Makefile
File Added: pkgsrc/net/py-onionbalance/ALTERNATIVES
bin/onionbalance @PREFIX@/bin/onionbalance-@PYVERSSUFFIX@
bin/onionbalance-config @PREFIX@/bin/onionbalance-config-@PYVERSSUFFIX@
cvs diff -r1.2 -r1.3 pkgsrc/net/py-onionbalance/Makefile (expand / switch to unified diff)

--- pkgsrc/net/py-onionbalance/Makefile 2018/10/24 11:52:33 1.2
+++ pkgsrc/net/py-onionbalance/Makefile 2019/09/19 21:25:52 1.3
@@ -1,41 +1,42 @@ @@ -1,41 +1,42 @@
1# $NetBSD: Makefile,v 1.2 2018/10/24 11:52:33 adam Exp $ 1# $NetBSD: Makefile,v 1.3 2019/09/19 21:25:52 adam Exp $
2 2
3.include "../../net/py-onionbalance/Makefile.common" 3DISTNAME= OnionBalance-0.1.8
4 
5DISTNAME= OnionBalance-${VERSION} 
6PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
 5PKGREVISION= 1
7CATEGORIES= net python 6CATEGORIES= net python
8MASTER_SITES= ${MASTER_SITE_PYPI:=O/OnionBalance/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=O/OnionBalance/}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://onionbalance.readthedocs.io/ 10HOMEPAGE= https://onionbalance.readthedocs.io/
12COMMENT= Tor onion service load balancer 11COMMENT= Tor onion service load balancer
13LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
14 13
15DEPENDS+= ${PYPKGPREFIX}-crypto>=2.6.1:../../security/py-crypto 14DEPENDS+= ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
16DEPENDS+= ${PYPKGPREFIX}-future>=0.14.0:../../devel/py-future 15DEPENDS+= ${PYPKGPREFIX}-future>=0.14.0:../../devel/py-future
17DEPENDS+= ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle 16DEPENDS+= ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
18DEPENDS+= ${PYPKGPREFIX}-stem>=0.4.0:../../devel/py-stem 17DEPENDS+= ${PYPKGPREFIX}-stem>=0.4.0:../../devel/py-stem
19DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml 18DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
20TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock 19TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
21TEST_DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect 20TEST_DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
22TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 21TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
23TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock 22TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
 23TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
24TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox 24TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
25 25
26USE_LANGUAGES= # none 26USE_LANGUAGES= # none
27 27
28PYTHON_SELF_CONFLICT= yes 28PYSETUPTESTTARGET= pytest
29 
30REPLACE_PYTHON+= onionbalance.py 29REPLACE_PYTHON+= onionbalance.py
31REPLACE_PYTHON+= docs/conf.py 30REPLACE_PYTHON+= docs/conf.py
32 31
33CHECK_INTERPRETER_SKIP+= test/scripts/install-chutney.sh 32CHECK_INTERPRETER_SKIP+= test/scripts/install-chutney.sh
34CHECK_INTERPRETER_SKIP+= test/scripts/install-tor.sh 33CHECK_INTERPRETER_SKIP+= test/scripts/install-tor.sh
35 34
36do-test: 35post-install:
37 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} 36 cd ${DESTDIR}${PREFIX}/bin && \
 37 ${MV} onionbalance onionbalance-${PYVERSSUFFIX} && \
 38 ${MV} onionbalance-config onionbalance-config-${PYVERSSUFFIX} || ${TRUE}
38 39
39.include "../../lang/python/application.mk" 40.include "../../lang/python/application.mk"
40.include "../../lang/python/egg.mk" 41.include "../../lang/python/egg.mk"
41.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/net/py-onionbalance/PLIST (expand / switch to unified diff)

--- pkgsrc/net/py-onionbalance/PLIST 2018/10/24 11:52:33 1.2
+++ pkgsrc/net/py-onionbalance/PLIST 2019/09/19 21:25:52 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1@comment $NetBSD: PLIST,v 1.2 2018/10/24 11:52:33 adam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2019/09/19 21:25:52 adam Exp $
2bin/onionbalance 2bin/onionbalance-${PYVERSSUFFIX}
3bin/onionbalance-config 3bin/onionbalance-config-${PYVERSSUFFIX}
4${PYSITELIB}/${EGG_INFODIR}/PKG-INFO 4${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
5${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt 5${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
6${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt 6${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
7${PYSITELIB}/${EGG_INFODIR}/entry_points.txt 7${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
8${PYSITELIB}/${EGG_INFODIR}/pbr.json 8${PYSITELIB}/${EGG_INFODIR}/pbr.json
9${PYSITELIB}/${EGG_INFODIR}/requires.txt 9${PYSITELIB}/${EGG_INFODIR}/requires.txt
10${PYSITELIB}/${EGG_INFODIR}/top_level.txt 10${PYSITELIB}/${EGG_INFODIR}/top_level.txt
11${PYSITELIB}/onionbalance/__init__.py 11${PYSITELIB}/onionbalance/__init__.py
12${PYSITELIB}/onionbalance/__init__.pyc 12${PYSITELIB}/onionbalance/__init__.pyc
13${PYSITELIB}/onionbalance/__init__.pyo 13${PYSITELIB}/onionbalance/__init__.pyo
14${PYSITELIB}/onionbalance/__main__.py 14${PYSITELIB}/onionbalance/__main__.py
15${PYSITELIB}/onionbalance/__main__.pyc 15${PYSITELIB}/onionbalance/__main__.pyc
16${PYSITELIB}/onionbalance/__main__.pyo 16${PYSITELIB}/onionbalance/__main__.pyo
cvs diff -r1.2 -r1.3 pkgsrc/net/py-onionbalance/distinfo (expand / switch to unified diff)

--- pkgsrc/net/py-onionbalance/distinfo 2018/10/24 11:52:33 1.2
+++ pkgsrc/net/py-onionbalance/distinfo 2019/09/19 21:25:52 1.3
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1$NetBSD: distinfo,v 1.2 2018/10/24 11:52:33 adam Exp $ 1$NetBSD: distinfo,v 1.3 2019/09/19 21:25:52 adam Exp $
2 2
3SHA1 (OnionBalance-0.1.8.tar.gz) = ec37b1ed1314318853f6f149c265853462c4be77 3SHA1 (OnionBalance-0.1.8.tar.gz) = ec37b1ed1314318853f6f149c265853462c4be77
4RMD160 (OnionBalance-0.1.8.tar.gz) = fbdfe5e4e815595c89f5d0fdfc1a3ea290c6e519 4RMD160 (OnionBalance-0.1.8.tar.gz) = fbdfe5e4e815595c89f5d0fdfc1a3ea290c6e519
5SHA512 (OnionBalance-0.1.8.tar.gz) = dc43a8419a6bb2d3b44dfa6f6be3ea7ed4e303c41b64249e82156610d712b5c717be47c90e6b8b37f6d4308dd616cc4312aa6132a73a8a9136f1027375a4cca6 5SHA512 (OnionBalance-0.1.8.tar.gz) = dc43a8419a6bb2d3b44dfa6f6be3ea7ed4e303c41b64249e82156610d712b5c717be47c90e6b8b37f6d4308dd616cc4312aa6132a73a8a9136f1027375a4cca6
6Size (OnionBalance-0.1.8.tar.gz) = 55919 bytes 6Size (OnionBalance-0.1.8.tar.gz) = 55919 bytes
 7SHA1 (patch-setup.cfg) = 19d538a5032010eeecfb7419c611d50be77ddb01
 8SHA1 (patch-setup.py) = ff228d5030dfd0a826cff04986a30a9cd1a066e2
File Deleted: pkgsrc/net/py-onionbalance/Attic/Makefile.common
File Added: pkgsrc/net/py-onionbalance/patches/Attic/patch-setup.cfg
$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]
File Added: pkgsrc/net/py-onionbalance/patches/patch-setup.py
$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',
         ],