Index: head/security/theonionbox/Makefile =================================================================== --- head/security/theonionbox/Makefile (revision 482014) +++ head/security/theonionbox/Makefile (revision 482015) @@ -1,62 +1,55 @@ # $FreeBSD$ PORTNAME= theonionbox -PORTVERSION= 4.2.1 -PORTREVISION= 1 +PORTVERSION= 4.3.0 CATEGORIES= security net python MASTER_SITES= CHEESESHOP -PATCH_SITES= https://github.com/ralphwetzel/${PORTNAME}/commit/ -PATCHFILES= f273bd0bfb90b4a3d9692c613fe93a836df62e00.patch:-p1 \ - 14a2027fd4abd6c59e60994532400ce6bb47f8c6.patch:-p1 \ - a86c4239b5c13c01e8c405985f08f7795f68d3a6.patch:-p1 \ - f29082a6d78c8a635312daff95e6bacea5353cd7.patch:-p1 - MAINTAINER= yuri@FreeBSD.org COMMENT= Web interface to monitor Tor node operation LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apscheduler>=3.4:devel/py-apscheduler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bottle>=0.12.13:www/py-bottle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.4.0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysocks>=1.6.7:net/py-pysocks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>2.18:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stem>=1.5.4:security/py-stem@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.4:devel/py-tzlocal@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.5:devel/py-tzlocal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.22:net/py-urllib3@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} # workaround for bug#230613: missing internal sqlite3 module in python py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=3.2:devel/py-futures@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist noflavors NO_ARCH= yes POST_PLIST= correct-plist OPTIONS_DEFINE= DOCS post-patch: @${MV} ${WRKSRC}/FreeBSD/${PORTNAME}.sh ${WRKSRC}/FreeBSD/${PORTNAME} @${REINPLACE_CMD} ' \ s|"/your/path/to/${PORTNAME}"|"${PREFIX}"|; \ s|${PORTNAME}_dir}/${PORTNAME}\.py|${PORTNAME}_dir}/bin/${PORTNAME}|; \ s|/config/${PORTNAME}.cfg|/etc/${PORTNAME}/${PORTNAME}|; \ s|"/usr/local/bin/python"|"${PYTHON_CMD}"|' \ ${WRKSRC}/FreeBSD/${PORTNAME} post-patch-DOCS-off: @${REINPLACE_CMD} "s|('share/doc/${PORTNAME}', \['docs/\*\.\*'\]),||" ${WRKSRC}/setup.py post-install: @${CHMOD} +x ${STAGEDIR}${PREFIX}/etc/rc.d/${PORTNAME} correct-plist: @${REINPLACE_CMD} ' \ s|^etc/${PORTNAME}/${PORTNAME}.example$$|@sample & etc/${PORTNAME}/${PORTNAME}|; \ s|^etc/${PORTNAME}$$|@dir &|; \ s|^etc/rc.d$$|@dir &|; \ s|^share/doc/${PORTNAME}$$|@dir &|' \ ${TMPPLIST} .include Index: head/security/theonionbox/distinfo =================================================================== --- head/security/theonionbox/distinfo (revision 482014) +++ head/security/theonionbox/distinfo (revision 482015) @@ -1,11 +1,3 @@ -TIMESTAMP = 1534208455 -SHA256 (theonionbox-4.2.1.tar.gz) = 834a6e15d7074a74331866b2d05b18435ede0e5fd061def9f3e6ff7c9e2b481a -SIZE (theonionbox-4.2.1.tar.gz) = 13117993 -SHA256 (f273bd0bfb90b4a3d9692c613fe93a836df62e00.patch) = a51fd5c8495d428d249b69cfcb70df46934a279e08a5c7ef7a37f963e4eeb5e5 -SIZE (f273bd0bfb90b4a3d9692c613fe93a836df62e00.patch) = 6515 -SHA256 (14a2027fd4abd6c59e60994532400ce6bb47f8c6.patch) = b246772cad64c3c6503d9e6f36cf97cddb6b75f255b792718426f9c9a2e923de -SIZE (14a2027fd4abd6c59e60994532400ce6bb47f8c6.patch) = 4045 -SHA256 (a86c4239b5c13c01e8c405985f08f7795f68d3a6.patch) = 4113c547f4d40e88ab61c560739e37461cef22a773016c347c1ad0a6110c0a4c -SIZE (a86c4239b5c13c01e8c405985f08f7795f68d3a6.patch) = 5310 -SHA256 (f29082a6d78c8a635312daff95e6bacea5353cd7.patch) = 18d2fb40cb5e44e0f9f721d60a69010cf8b10aad53542bed9d3bc6bad4bfd260 -SIZE (f29082a6d78c8a635312daff95e6bacea5353cd7.patch) = 795 +TIMESTAMP = 1539462973 +SHA256 (theonionbox-4.3.0.tar.gz) = 30b614fa8a3c9145e9e70fa479eaa775a9ea82911aa6615de1a1fad2b6a821a6 +SIZE (theonionbox-4.3.0.tar.gz) = 13126370 Index: head/security/theonionbox/files/patch-setup.py =================================================================== --- head/security/theonionbox/files/patch-setup.py (revision 482014) +++ head/security/theonionbox/files/patch-setup.py (revision 482015) @@ -1,40 +1,34 @@ ---- setup.py.orig 2018-05-28 18:32:09 UTC +--- setup.py.orig 2018-10-13 20:39:26 UTC +++ setup.py -@@ -294,18 +294,9 @@ package_data_exclude = { +@@ -295,18 +295,9 @@ package_data_exclude = { } data_files = [ - ('docs', ['docs/*.*']), - ('', ['readme/README.html']), - ('config', ['theonionbox/config/*.*']), - ('service', []), - ('service/FreeBSD', ['FreeBSD/theonionbox.sh']), - ('service/init.d', ['init.d/theonionbox.sh']), - ('service/systemd', ['systemd/theonionbox.service']), - ('support', []), - ('support/osxtemp', []), - ('support/osxtemp/libsmc', ['support/osxtemp/libsmc/LICENSE', 'support/osxtemp/libsmc/Makefile']), - ('support/osxtemp/libsmc/include', ['support/osxtemp/libsmc/include/smc.h']), - ('support/osxtemp/libsmc/src', ['support/osxtemp/libsmc/src/smc.c']), + ('share/doc/theonionbox', ['docs/*.*']), + ('etc/theonionbox', ['theonionbox/config/*.*']), + ('etc/rc.d', ['FreeBSD/theonionbox']), ] # print(generate_data_files(data_files)) -@@ -374,13 +365,12 @@ setup( +@@ -375,8 +366,7 @@ setup( }, install_requires=[ 'psutil>=5.4.0', - 'apscheduler>=2.1.2, <3.*; python_version<"3.0"', - 'apscheduler>=3.4; python_version>="3.0"', + 'apscheduler>=3.5.1', 'requests>2.18', 'PySocks>=1.6.7', 'bottle>=0.12.13', - 'stem>=1.5.4', -- 'tzlocal>=1.5', -+ 'tzlocal>=1.4', - 'futures>=3.2; python_version<"3.0"', - 'urllib3>=1.22' - ], Index: head/security/theonionbox/files/patch-theonionbox_theonionbox.py =================================================================== --- head/security/theonionbox/files/patch-theonionbox_theonionbox.py (revision 482014) +++ head/security/theonionbox/files/patch-theonionbox_theonionbox.py (revision 482015) @@ -1,23 +1,23 @@ ---- theonionbox/theonionbox.py.orig 2018-05-27 22:03:29 UTC +--- theonionbox/theonionbox.py.orig 2018-10-12 18:06:09 UTC +++ theonionbox/theonionbox.py -@@ -505,17 +505,17 @@ required_modules = { +@@ -520,17 +520,17 @@ required_modules = { }, 'apscheduler2': { 'module': 'apscheduler', - 'version': '>=2.1.2, <3.*; python_version<"3.0"' + 'version': '>=3.4' }, 'apscheduler3': { 'module': 'apscheduler', - 'version': '>=3.4; python_version>="3.0"' + 'version': '>=3.4' }, 'requests': { 'version': '>=2.18.0' }, 'tzlocal': { - 'version': '>=1.5' + 'version': '>=1.4' }, 'pysocks': { 'version': '>=1.6.7'