diff --git a/security/boofuzz/Makefile b/security/boofuzz/Makefile index eca13b5b191..95385f1fd56 100644 --- a/security/boofuzz/Makefile +++ b/security/boofuzz/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2019/07/12 20:49:00 sthen Exp $ +# $OpenBSD: Makefile,v 1.4 2019/12/12 16:16:51 jasper Exp $ COMMENT = extensible network protocol fuzzer -MODPY_EGG_VERSION = 0.1.5 +MODPY_EGG_VERSION = 0.1.6 DISTNAME = boofuzz-${MODPY_EGG_VERSION} CATEGORIES = security @@ -29,6 +29,8 @@ RUN_DEPENDS = databases/py-ldap3 \ www/py-flask \ www/py-tornado +# XXX: Stick with python2 until py-impacket has been updated +# to a version > 0.9.15 MODPY_PI = Yes MODPY_SETUPTOOLS = Yes diff --git a/security/boofuzz/distinfo b/security/boofuzz/distinfo index c94fa480bd4..b1e2830834a 100644 --- a/security/boofuzz/distinfo +++ b/security/boofuzz/distinfo @@ -1,2 +1,2 @@ -SHA256 (boofuzz-0.1.5.tar.gz) = H0ClhVJQbCPXp8ToERtOld3HKQdEJMVshmFt1M9ExlM= -SIZE (boofuzz-0.1.5.tar.gz) = 1056746 +SHA256 (boofuzz-0.1.6.tar.gz) = TrDtTKTn82BYxMoGukb+pHPWP0kxRl9naX3zlanulOk= +SIZE (boofuzz-0.1.6.tar.gz) = 1164087 diff --git a/security/boofuzz/patches/patch-setup_py b/security/boofuzz/patches/patch-setup_py index c211b785d86..f98ded2c730 100644 --- a/security/boofuzz/patches/patch-setup_py +++ b/security/boofuzz/patches/patch-setup_py @@ -1,18 +1,22 @@ -$OpenBSD: patch-setup_py,v 1.2 2019/06/02 11:42:21 jasper Exp $ +$OpenBSD: patch-setup_py,v 1.3 2019/12/12 16:16:52 jasper Exp $ Relax overly strict dependencies Index: setup.py --- setup.py.orig +++ setup.py -@@ -33,8 +33,8 @@ setup( - packages=find_packages(exclude=['unit_tests', 'requests', 'examples', 'utils', 'web', 'new_examples']), - package_data={'boofuzz': ['web/templates/*', 'web/static/css/*', 'web/static/js/*']}, - install_requires=[ -- 'future', 'pyserial', 'pydot', 'tornado~=4.0', 'six', 'backports.shutil_get_terminal_size', -- 'Flask~=1.0', 'impacket', 'colorama', 'attrs', 'click', 'psutil', 'ldap3==2.5.1'], -+ 'future', 'pyserial', 'pydot', 'tornado', 'six', 'backports.shutil_get_terminal_size', -+ 'Flask', 'impacket', 'colorama', 'attrs', 'click', 'psutil', 'ldap3'], - extras_require={ - # This list is duplicated in tox.ini. Make sure to change both! - 'dev': ['tox', +@@ -60,12 +60,12 @@ setup( + "Flask", + "future", + "impacket", +- "ldap3==2.5.1", ++ "ldap3", + "psutil", + "pyserial", + "pydot", + "six", +- "tornado~=5.0", ++ "tornado", + ], + extras_require=extra_requirements, + python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*", diff --git a/security/boofuzz/pkg/PLIST b/security/boofuzz/pkg/PLIST index 8a615954597..a21c1886054 100644 --- a/security/boofuzz/pkg/PLIST +++ b/security/boofuzz/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2019/06/02 11:42:21 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.3 2019/12/12 16:16:52 jasper Exp $ bin/boo lib/python${MODPY_VERSION}/site-packages/boofuzz/ lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ @@ -98,6 +98,8 @@ lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/bit_field.py lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/bit_field.pyc lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/byte.py lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/byte.pyc +lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/bytes.py +lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/bytes.pyc lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/delim.py lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/delim.pyc lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/dword.py @@ -149,6 +151,7 @@ lib/python${MODPY_VERSION}/site-packages/boofuzz/web/app.pyc lib/python${MODPY_VERSION}/site-packages/boofuzz/web/static/ lib/python${MODPY_VERSION}/site-packages/boofuzz/web/static/css/ lib/python${MODPY_VERSION}/site-packages/boofuzz/web/static/css/boofuzz.css +lib/python${MODPY_VERSION}/site-packages/boofuzz/web/static/favicon.ico lib/python${MODPY_VERSION}/site-packages/boofuzz/web/static/js/ lib/python${MODPY_VERSION}/site-packages/boofuzz/web/static/js/index.js lib/python${MODPY_VERSION}/site-packages/boofuzz/web/templates/