Index: branches/2019Q4/security/theonionbox/Makefile
===================================================================
--- branches/2019Q4/security/theonionbox/Makefile	(revision 518440)
+++ branches/2019Q4/security/theonionbox/Makefile	(revision 518441)
@@ -1,57 +1,57 @@
 # $FreeBSD$
 
 PORTNAME=	theonionbox
 DISTVERSION=	4.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net python
 MASTER_SITES=	CHEESESHOP
 
 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} \
 		${PY_FUTURES} \
 		${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.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
 
 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 <bsd.port.mk>
Index: branches/2019Q4/security/theonionbox/files/patch-setup.py
===================================================================
--- branches/2019Q4/security/theonionbox/files/patch-setup.py	(revision 518440)
+++ branches/2019Q4/security/theonionbox/files/patch-setup.py	(revision 518441)
@@ -1,25 +1,38 @@
---- setup.py.orig	2019-05-11 04:02:35 UTC
+--- setup.py.orig	2019-05-10 21:59:01 UTC
 +++ setup.py
 @@ -295,19 +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']),
 -    ('service/Docker', ['Docker/Dockerfile', 'Docker/theonionbox.cfg']),
 -    ('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))
  
+@@ -381,10 +371,10 @@ setup(
+         'requests>=2.21',
+         'PySocks>=1.6.7',
+         'bottle>=0.12.13',
+-        'stem>=1.5.4, <=1.6',
++        'stem>=1.5.4',
+         'tzlocal>=1.5',
+         'futures>=3.2; python_version<"3.0"',
+-        'urllib3>=1.24.2, <1.25'    # '<1.25' due to requests 2.21 requirement
++        'urllib3>=1.21.1,<1.26' # copied (except the exclusions) from requests 2.22
+     ],
+     long_description_content_type='text/x-rst; charset=UTF-8',
+     classifiers=[
Index: branches/2019Q4/security/theonionbox/files/patch-theonionbox_theonionbox.py
===================================================================
--- branches/2019Q4/security/theonionbox/files/patch-theonionbox_theonionbox.py	(nonexistent)
+++ branches/2019Q4/security/theonionbox/files/patch-theonionbox_theonionbox.py	(revision 518441)
@@ -0,0 +1,20 @@
+--- theonionbox/theonionbox.py.orig	2019-11-09 13:37:29 UTC
++++ theonionbox/theonionbox.py
+@@ -513,7 +513,7 @@ required_modules = {
+         'info': "Check 'https://pypi.python.org/pypi/psutil' for installation instructions."
+     },
+     'stem': {
+-        'version': '>=1.5.4, <=1.6'
++        'version': '>=1.5.4'
+     },
+     'bottle': {
+         'version': '>=0.12.13'
+@@ -539,7 +539,7 @@ required_modules = {
+         'version': '>=3.2; python_version<"3.0"'
+     },
+     'urllib3': {
+-        'version': '>=1.24.2, <1.25'
++        'version': '>=1.21.1,<1.26'    #copied (except the exclusions) from requests 2.22
+     }
+ }
+ 

Property changes on: branches/2019Q4/security/theonionbox/files/patch-theonionbox_theonionbox.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q4
===================================================================
--- branches/2019Q4	(revision 518440)
+++ branches/2019Q4	(revision 518441)

Property changes on: branches/2019Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r518295