Index: security/obfsproxy/Makefile =================================================================== --- security/obfsproxy/Makefile +++ security/obfsproxy/Makefile @@ -6,21 +6,27 @@ PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security net python -MASTER_SITES= http://www.c-s.li/ports/ +MASTER_SITES= CHEESESHOP MAINTAINER= cs@FreeBSD.org COMMENT= Pluggable transport proxy LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:security/py-pyptlib@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} + +NO_ARCH= yes USES= python:2.7 -USE_PYTHON= distutils +USE_PYTHON= autoplist distutils SUB_FILES= pkg-message -PYDISTUTILS_PKGNAME=obfsproxy + +do-test: + @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest) .include Index: security/obfsproxy/distinfo =================================================================== --- security/obfsproxy/distinfo +++ security/obfsproxy/distinfo @@ -1,2 +1,3 @@ -SHA256 (obfsproxy-0.2.13.tar.gz) = c29582f2f5b0316cbc7184e0529a5b246dfeeabd4e6c4dcb05b800256d6c9dd6 -SIZE (obfsproxy-0.2.13.tar.gz) = 95813 +TIMESTAMP = 1512989600 +SHA256 (obfsproxy-0.2.13.tar.gz) = 1e26c2faef1cfcf856ddf60e9647058a7c78fb0d47f05b58a0f847ed7cc41a66 +SIZE (obfsproxy-0.2.13.tar.gz) = 93435 Index: security/obfsproxy/files/patch-setup.py =================================================================== --- security/obfsproxy/files/patch-setup.py +++ security/obfsproxy/files/patch-setup.py @@ -1,19 +1,10 @@ ---- setup.py.orig 2017-11-03 11:21:18 UTC +--- setup.py.orig 2017-12-11 10:57:15 UTC +++ setup.py -@@ -31,12 +31,14 @@ setup( - install_requires = [ +@@ -32,7 +32,6 @@ setup( 'setuptools', 'PyCrypto', -- 'Twisted', + 'Twisted', - 'argparse', -+ 'Twisted_Core', 'pyptlib >= 0.0.6', 'pyyaml' ], - -+ if sys.version_info < (2, 7): -+ install_requires.append('argparse') -+ - extras_require = { - 'SOCKS': ["txsocksx"] - } Index: security/obfsproxy/pkg-plist =================================================================== --- security/obfsproxy/pkg-plist +++ /dev/null @@ -1,169 +0,0 @@ -bin/obfsproxy -%%PYTHON_SITELIBDIR%%/obfsproxy/__init__.py -%%PYTHON_SITELIBDIR%%/obfsproxy/__init__.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/__init__.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/_version.py -%%PYTHON_SITELIBDIR%%/obfsproxy/_version.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/_version.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/common/__init__.py -%%PYTHON_SITELIBDIR%%/obfsproxy/common/__init__.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/common/__init__.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/common/aes.py -%%PYTHON_SITELIBDIR%%/obfsproxy/common/aes.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/common/aes.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/common/argparser.py -%%PYTHON_SITELIBDIR%%/obfsproxy/common/argparser.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/common/argparser.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/common/heartbeat.py -%%PYTHON_SITELIBDIR%%/obfsproxy/common/heartbeat.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/common/heartbeat.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/common/hmac_sha256.py -%%PYTHON_SITELIBDIR%%/obfsproxy/common/hmac_sha256.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/common/hmac_sha256.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/common/log.py -%%PYTHON_SITELIBDIR%%/obfsproxy/common/log.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/common/log.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/common/modexp.py -%%PYTHON_SITELIBDIR%%/obfsproxy/common/modexp.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/common/modexp.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/common/rand.py -%%PYTHON_SITELIBDIR%%/obfsproxy/common/rand.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/common/rand.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/common/serialize.py -%%PYTHON_SITELIBDIR%%/obfsproxy/common/serialize.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/common/serialize.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/common/transport_config.py -%%PYTHON_SITELIBDIR%%/obfsproxy/common/transport_config.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/common/transport_config.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/managed/__init__.py -%%PYTHON_SITELIBDIR%%/obfsproxy/managed/__init__.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/managed/__init__.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/managed/client.py -%%PYTHON_SITELIBDIR%%/obfsproxy/managed/client.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/managed/client.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/managed/server.py -%%PYTHON_SITELIBDIR%%/obfsproxy/managed/server.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/managed/server.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/network/__init__.py -%%PYTHON_SITELIBDIR%%/obfsproxy/network/__init__.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/network/__init__.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/network/buffer.py -%%PYTHON_SITELIBDIR%%/obfsproxy/network/buffer.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/network/buffer.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/network/extended_orport.py -%%PYTHON_SITELIBDIR%%/obfsproxy/network/extended_orport.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/network/extended_orport.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/network/http.py -%%PYTHON_SITELIBDIR%%/obfsproxy/network/http.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/network/http.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/network/launch_transport.py -%%PYTHON_SITELIBDIR%%/obfsproxy/network/launch_transport.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/network/launch_transport.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/network/network.py -%%PYTHON_SITELIBDIR%%/obfsproxy/network/network.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/network/network.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks.py -%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks5.py -%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks5.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks5.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/pyobfsproxy.py -%%PYTHON_SITELIBDIR%%/obfsproxy/pyobfsproxy.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/pyobfsproxy.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/test/__init__.py -%%PYTHON_SITELIBDIR%%/obfsproxy/test/__init__.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/test/__init__.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_aes.py -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_aes.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_aes.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_buffer.py -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_buffer.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_buffer.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_obfs3_dh.py -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_obfs3_dh.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_obfs3_dh.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks.py -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks5.py -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks5.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks5.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/test/tester.py -%%PYTHON_SITELIBDIR%%/obfsproxy/test/tester.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/test/tester.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/__init__.py -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/__init__.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/__init__.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_b64.py -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_b64.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_b64.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_obfs3_dh.py -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_obfs3_dh.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_obfs3_dh.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_scramblesuit.py -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_scramblesuit.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_scramblesuit.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/__init__.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/__init__.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/__init__.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/b64.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/b64.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/b64.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/base.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/base.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/base.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/dummy.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/dummy.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/dummy.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs2.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs2.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs2.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3_dh.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3_dh.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3_dh.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/__init__.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/__init__.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/__init__.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/const.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/const.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/const.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/fifobuf.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/fifobuf.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/fifobuf.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/message.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/message.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/message.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/mycrypto.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/mycrypto.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/mycrypto.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/packetmorpher.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/packetmorpher.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/packetmorpher.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/probdist.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/probdist.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/probdist.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/replay.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/replay.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/replay.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/scramblesuit.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/scramblesuit.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/scramblesuit.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/state.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/state.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/state.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/ticket.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/ticket.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/ticket.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/uniformdh.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/uniformdh.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/uniformdh.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/util.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/util.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/util.pyo -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/transports.py -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/transports.pyc -%%PYTHON_SITELIBDIR%%/obfsproxy/transports/transports.pyo