From 3ba14dd771f113333a7d6769fb566a1942ce02389b1de58f7408bcbd21d47ad9 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Fri, 12 Feb 2021 18:10:27 +0000 Subject: [PATCH 1/3] Update to trytond Version 5.0.33 - Bugfix Release OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=114 --- trytond-5.0.32.tar.gz | 3 --- trytond-5.0.33.tar.gz | 3 +++ trytond.changes | 5 +++++ trytond.spec | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 trytond-5.0.32.tar.gz create mode 100644 trytond-5.0.33.tar.gz diff --git a/trytond-5.0.32.tar.gz b/trytond-5.0.32.tar.gz deleted file mode 100644 index 073e1c4..0000000 --- a/trytond-5.0.32.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:259fb92bb0ecdf20bcf1991321d6d5c4970acbf81eff517b3ca8bb84bdda3a47 -size 659619 diff --git a/trytond-5.0.33.tar.gz b/trytond-5.0.33.tar.gz new file mode 100644 index 0000000..aace616 --- /dev/null +++ b/trytond-5.0.33.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c19a18ead60c49b7a3e3ed8fa2dacca4ead73fbd1665781377ee38a24f5a02fb +size 659717 diff --git a/trytond.changes b/trytond.changes index 53cf36a..eb864ff 100644 --- a/trytond.changes +++ b/trytond.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 12 18:10:08 UTC 2021 - Axel Braun + +- Version 5.0.33 - Bugfix Release + ------------------------------------------------------------------- Tue Feb 2 08:53:34 UTC 2021 - Axel Braun diff --git a/trytond.spec b/trytond.spec index ebac038..804622a 100644 --- a/trytond.spec +++ b/trytond.spec @@ -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 From b3e1933d81249a4c0b424287813367dbde3ca3e498bb7c39fc852e637dfc59e9 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Sun, 14 Feb 2021 08:15:23 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=115 --- trytond.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trytond.changes b/trytond.changes index eb864ff..0b649bd 100644 --- a/trytond.changes +++ b/trytond.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Feb 12 18:10:08 UTC 2021 - Axel Braun -- Version 5.0.33 - Bugfix Release +- Version 5.0.33 - Security fix for https://bugs.tryton.org/issue10068 ------------------------------------------------------------------- Tue Feb 2 08:53:34 UTC 2021 - Axel Braun From 394d4977091714bb833d977a4ff7c6bf47864937ebb4df127337b970b49bbf99 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Mon, 15 Feb 2021 11:45:05 +0000 Subject: [PATCH 3/3] - fix_werkzeug.patch adjusted OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=116 --- fix_werkzeug.patch | 18 +++++++++++------- trytond.changes | 5 +++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/fix_werkzeug.patch b/fix_werkzeug.patch index c120f41..0632b27 100644 --- a/fix_werkzeug.patch +++ b/fix_werkzeug.patch @@ -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: diff --git a/trytond.changes b/trytond.changes index 0b649bd..ac9d47c 100644 --- a/trytond.changes +++ b/trytond.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 15 11:44:23 UTC 2021 - Axel Braun + +- fix_werkzeug.patch adjusted + ------------------------------------------------------------------- Fri Feb 12 18:10:08 UTC 2021 - Axel Braun