pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net
Module Name: pkgsrc
Committed By: adam
Date: Thu Sep 19 21:25:52 UTC 2019
Modified Files:
pkgsrc/net: Makefile
pkgsrc/net/py-onionbalance: Makefile PLIST distinfo
Added Files:
pkgsrc/net/py-onionbalance: ALTERNATIVES
pkgsrc/net/py-onionbalance/patches: patch-setup.cfg patch-setup.py
Removed Files:
pkgsrc/net/onionbalance: DESCR Makefile
pkgsrc/net/py-onionbalance: Makefile.common
Log Message:
py-onionbalance: depend on py-cryptodome (py-crypto is dead); use ALTERNATIVES; bump revision
To generate a diff of this commit:
cvs rdiff -u -r1.1269 -r1.1270 pkgsrc/net/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/net/onionbalance/DESCR
cvs rdiff -u -r1.2 -r0 pkgsrc/net/onionbalance/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/py-onionbalance/ALTERNATIVES
cvs rdiff -u -r1.2 -r1.3 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/Makefile.common
cvs rdiff -u -r0 -r1.1 pkgsrc/net/py-onionbalance/patches/patch-setup.cfg \
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/Makefile
diff -u pkgsrc/net/Makefile:1.1269 pkgsrc/net/Makefile:1.1270
--- pkgsrc/net/Makefile:1.1269 Sun Sep 15 13:00:33 2019
+++ pkgsrc/net/Makefile Thu Sep 19 21:25:51 2019
@@ -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+= oidentd
SUBDIR+= oinkmaster
SUBDIR+= omniNotify
SUBDIR+= omniORB
-SUBDIR+= onionbalance
SUBDIR+= openag
SUBDIR+= openconnect
SUBDIR+= openh323
Index: pkgsrc/net/py-onionbalance/Makefile
diff -u pkgsrc/net/py-onionbalance/Makefile:1.2 pkgsrc/net/py-onionbalance/Makefile:1.3
--- pkgsrc/net/py-onionbalance/Makefile:1.2 Wed Oct 24 11:52:33 2018
+++ pkgsrc/net/py-onionbalance/Makefile Thu Sep 19 21:25:52 2019
@@ -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 @@ HOMEPAGE= https://onionbalance.readthedo
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}-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
-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"
Index: pkgsrc/net/py-onionbalance/PLIST
diff -u pkgsrc/net/py-onionbalance/PLIST:1.2 pkgsrc/net/py-onionbalance/PLIST:1.3
--- pkgsrc/net/py-onionbalance/PLIST:1.2 Wed Oct 24 11:52:33 2018
+++ pkgsrc/net/py-onionbalance/PLIST Thu Sep 19 21:25:52 2019
@@ -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
Index: pkgsrc/net/py-onionbalance/distinfo
diff -u pkgsrc/net/py-onionbalance/distinfo:1.2 pkgsrc/net/py-onionbalance/distinfo:1.3
--- pkgsrc/net/py-onionbalance/distinfo:1.2 Wed Oct 24 11:52:33 2018
+++ pkgsrc/net/py-onionbalance/distinfo Thu Sep 19 21:25:52 2019
@@ -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
Added files:
Index: pkgsrc/net/py-onionbalance/ALTERNATIVES
diff -u /dev/null pkgsrc/net/py-onionbalance/ALTERNATIVES:1.1
--- /dev/null Thu Sep 19 21:25:52 2019
+++ pkgsrc/net/py-onionbalance/ALTERNATIVES Thu Sep 19 21:25:52 2019
@@ -0,0 +1,2 @@
+bin/onionbalance @PREFIX@/bin/onionbalance-@PYVERSSUFFIX@
+bin/onionbalance-config @PREFIX@/bin/onionbalance-config-@PYVERSSUFFIX@
Index: pkgsrc/net/py-onionbalance/patches/patch-setup.cfg
diff -u /dev/null pkgsrc/net/py-onionbalance/patches/patch-setup.cfg:1.1
--- /dev/null Thu Sep 19 21:25:52 2019
+++ pkgsrc/net/py-onionbalance/patches/patch-setup.cfg Thu Sep 19 21:25:52 2019
@@ -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]
Index: pkgsrc/net/py-onionbalance/patches/patch-setup.py
diff -u /dev/null pkgsrc/net/py-onionbalance/patches/patch-setup.py:1.1
--- /dev/null Thu Sep 19 21:25:52 2019
+++ pkgsrc/net/py-onionbalance/patches/patch-setup.py Thu Sep 19 21:25:52 2019
@@ -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