Attachment #208999 for bug #241827

View | Details | Raw Unified | Return to bug 241827
Collapse All | Expand All

Lines 2-8 Link Here

(-)security/theonionbox/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= theonionbox	3	PORTNAME= theonionbox
4	DISTVERSION= 4.3.1	4	DISTVERSION= 4.3.1
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= security net python	6	CATEGORIES= security net python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8		8




--- setup.py.orig	2019-05-10 21:59:01 UTC
+++ setup.py
@@ -295,19 +295,9 @@ package_data_exclude = {
 }

 ]
 # 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=[




--- 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
     }
 }
 

Return to bug 241827

Lines 1-4 Link Here

(-)security/theonionbox/files/patch-setup.py (-1 / +14 lines)
1	--- setup.py.orig 2019-05-11 04:02:35 UTC	1	--- setup.py.orig 2019-05-10 21:59:01 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -295,19 +295,9 @@ package_data_exclude = {	3	@@ -295,19 +295,9 @@ package_data_exclude = {
4	}	4	}
Lines 23-25 Link Here
23	]	23	]
24	# print(generate_data_files(data_files))	24	# print(generate_data_files(data_files))
25		25
		26	@@ -381,10 +371,10 @@ setup(
		27	'requests>=2.21',
		28	'PySocks>=1.6.7',
		29	'bottle>=0.12.13',
		30	- 'stem>=1.5.4, <=1.6',
		31	+ 'stem>=1.5.4',
		32	'tzlocal>=1.5',
		33	'futures>=3.2; python_version<"3.0"',
		34	- 'urllib3>=1.24.2, <1.25' # '<1.25' due to requests 2.21 requirement
		35	+ 'urllib3>=1.21.1,<1.26' # copied (except the exclusions) from requests 2.22
		36	],
		37	long_description_content_type='text/x-rst; charset=UTF-8',
		38	classifiers=[

Line 0 Link Here

(-)security/theonionbox/files/patch-theonionbox_theonionbox.py (+20 lines)
	1	--- theonionbox/theonionbox.py.orig 2019-11-09 13:37:29 UTC
	2	+++ theonionbox/theonionbox.py
	3	@@ -513,7 +513,7 @@ required_modules = {
	4	'info': "Check 'https://pypi.python.org/pypi/psutil' for installation instructions."
	5	},
	6	'stem': {
	7	- 'version': '>=1.5.4, <=1.6'
	8	+ 'version': '>=1.5.4'
	9	},
	10	'bottle': {
	11	'version': '>=0.12.13'
	12	@@ -539,7 +539,7 @@ required_modules = {
	13	'version': '>=3.2; python_version<"3.0"'
	14	},
	15	'urllib3': {
	16	- 'version': '>=1.24.2, <1.25'
	17	+ 'version': '>=1.21.1,<1.26' #copied (except the exclusions) from requests 2.22
	18	}
	19	}
	20