update to 15.0.20220427; unbreaks with recent py-werkzeug

This commit is contained in:
robert 2022-04-27 18:30:33 +00:00
parent a0e2ef261a
commit bd83bba7d2
5 changed files with 16473 additions and 9171 deletions

View File

@ -1,7 +1,7 @@
COMMENT= all-in-one management software
MV= 13.0
SV= 20220110
MV= 15.0
SV= 20220427
V= ${MV}.${SV}
DISTNAME= odoo_${V}
@ -31,8 +31,10 @@ RUN_DEPENDS= converters/py-html2text${MODPY_FLAVOR} \
devel/py-stdnum${MODPY_FLAVOR} \
devel/py-xlsxwriter${MODPY_FLAVOR} \
graphics/py-Pillow${MODPY_FLAVOR} \
graphics/py-qrcode${MODPY_FLAVOR} \
lang/node \
print/py-reportlab${MODPY_FLAVOR} \
security/py-openssl${MODPY_FLAVOR} \
security/py-passlib${MODPY_FLAVOR} \
sysutils/py-psutil${MODPY_FLAVOR} \
telephony/py-phonenumbers${MODPY_FLAVOR} \

View File

@ -1,2 +1,2 @@
SHA256 (odoo_13.0.20220110.tar.gz) = ALlzAK215HAcpWn5aUerJnyT4zTXqypLYkkXWOifAA4=
SIZE (odoo_13.0.20220110.tar.gz) = 252847657
SHA256 (odoo_15.0.20220427.tar.gz) = fzvQqcMxBibF8W752z+geY/SRsB7Gocb9CopvMzCNNQ=
SIZE (odoo_15.0.20220427.tar.gz) = 248443013

View File

@ -1,7 +1,7 @@
Index: odoo/service/server.py
--- odoo/service/server.py.orig
+++ odoo/service/server.py
@@ -70,14 +70,14 @@ def memory_info(process):
@@ -71,14 +71,14 @@ def memory_info(process):
# psutil < 2.0 does not have memory_info, >= 3.0 does not have get_memory_info
pmem = (getattr(process, 'memory_info', None) or process.get_memory_info)()
# MacOSX allocates very large vms to all processes so we only monitor the rss usage.
@ -18,7 +18,7 @@ Index: odoo/service/server.py
soft, hard = resource.getrlimit(rlimit)
resource.setrlimit(rlimit, (config['limit_memory_hard'], hard))
@@ -1020,7 +1020,7 @@ class WorkerHTTP(Worker):
@@ -1073,7 +1073,7 @@ class WorkerHTTP(Worker):
# latencies & b/w saturation. This timeout is also essential to protect against accidental
# DoS due to idle HTTP connections.
sock_timeout = os.environ.get("ODOO_HTTP_SOCKET_TIMEOUT")

View File

@ -0,0 +1,21 @@
https://github.com/odoo/odoo/pull/88803/commits/24f04fd6cff7df11b57c084c7da07f22c8bc4564
Index: odoo/tools/_vendor/sessions.py
--- odoo/tools/_vendor/sessions.py.orig
+++ odoo/tools/_vendor/sessions.py
@@ -19,14 +19,13 @@ import os
import re
import tempfile
from hashlib import sha1
-from os import path
+from os import path, replace as rename
from pickle import dump
from pickle import HIGHEST_PROTOCOL
from pickle import load
from time import time
from werkzeug.datastructures import CallbackDict
-from werkzeug.posixemulation import rename
_sha1_re = re.compile(r"^[a-f0-9]{40}$")

File diff suppressed because it is too large Load Diff