rpm/trytond
SHA256
1
0
Fork 0
forked from pool/trytond
Code Pull Requests Activity

- fix_werkzeug.patch adjusted

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=116
This commit is contained in:
Axel Braun 2021-02-15 11:45:05 +00:00 committed by Git OBS Bridge
parent b3e1933d81
commit 394d497709
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fix_werkzeug.patch
View File

@ -1,13 +1,11 @@
Index: trytond-5.0.18/trytond/wsgi.py diff -U 3 -dHrN -- a/trytond/wsgi.py b/trytond/wsgi.py
=================================================================== --- a/trytond/wsgi.py 2021-02-12 10:14:41.000000000 +0100
--- trytond-5.0.18.orig/trytond/wsgi.py +++ b/trytond/wsgi.py 2021-02-15 12:37:50.432511576 +0100
+++ trytond-5.0.18/trytond/wsgi.py @@ -10,13 +10,23 @@
@@ -9,8 +9,19 @@ import traceback
from werkzeug.wrappers import Response from werkzeug.wrappers import Response
from werkzeug.routing import Map, Rule from werkzeug.routing import Map, Rule
from werkzeug.exceptions import abort, HTTPException, InternalServerError from werkzeug.exceptions import abort, HTTPException, InternalServerError
-from werkzeug.contrib.fixers import ProxyFix -from werkzeug.contrib.fixers import ProxyFix
-from werkzeug.wsgi import SharedDataMiddleware
+try: +try:
+ from werkzeug.middleware.proxy_fix import ProxyFix + from werkzeug.middleware.proxy_fix import ProxyFix
+ +
@ -17,6 +15,12 @@ Index: trytond-5.0.18/trytond/wsgi.py
+ x_port=num_proxies, x_prefix=num_proxies) + x_port=num_proxies, x_prefix=num_proxies)
+except ImportError: +except ImportError:
+ from werkzeug.contrib.fixers import ProxyFix as NumProxyFix + from werkzeug.contrib.fixers import ProxyFix as NumProxyFix
try:
from werkzeug.security import safe_join
except ImportError:
safe_join = posixpath.join
-
-from werkzeug.wsgi import SharedDataMiddleware
+try: +try:
+ from werkzeug.middleware.shared_data import SharedDataMiddleware + from werkzeug.middleware.shared_data import SharedDataMiddleware
+except ImportError: +except ImportError:
@ -24,7 +28,7 @@ Index: trytond-5.0.18/trytond/wsgi.py
import wrapt import wrapt
@@ -150,6 +161,6 @@ if config.get('web', 'root'): @@ -157,6 +167,6 @@
app.wsgi_app = SharedDataMiddlewareIndex(app.wsgi_app, static_files) app.wsgi_app = SharedDataMiddlewareIndex(app.wsgi_app, static_files)
num_proxies = config.getint('web', 'num_proxies') num_proxies = config.getint('web', 'num_proxies')
if num_proxies: if num_proxies:

5
trytond.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 15 11:44:23 UTC 2021 - Axel Braun <axel.braun@gmx.de>
- fix_werkzeug.patch adjusted
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 12 18:10:08 UTC 2021 - Axel Braun <axel.braun@gmx.de> Fri Feb 12 18:10:08 UTC 2021 - Axel Braun <axel.braun@gmx.de>