SHA256
1
0
forked from pool/trytond

Accepting request 872368 from Application:ERP:GNUHealth:Factory

- fix_werkzeug.patch adjusted
- Version 5.0.33 - Security fix for https://bugs.tryton.org/issue10068

OBS-URL: https://build.opensuse.org/request/show/872368
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/trytond?expand=0&rev=55
This commit is contained in:
Dominique Leuenberger 2021-02-15 22:19:15 +00:00 committed by Git OBS Bridge
commit 3b4d0761e0
5 changed files with 25 additions and 11 deletions

View File

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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:259fb92bb0ecdf20bcf1991321d6d5c4970acbf81eff517b3ca8bb84bdda3a47
size 659619

3
trytond-5.0.33.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c19a18ead60c49b7a3e3ed8fa2dacca4ead73fbd1665781377ee38a24f5a02fb
size 659717

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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>
- Version 5.0.33 - Security fix for https://bugs.tryton.org/issue10068
-------------------------------------------------------------------
Tue Feb 2 08:53:34 UTC 2021 - Axel Braun <axel.braun@gmx.de>

View File

@ -20,7 +20,7 @@
%define majorver 5.0
%define base_name tryton
Name: trytond
Version: %{majorver}.32
Version: %{majorver}.33
Release: 0
Summary: An Enterprise Resource Planning (ERP) system
License: GPL-3.0-or-later