mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
finance/odoo: update to 14.0
This commit is contained in:
Jose Alonso Cardenas Marquez
parent
fb6f0471da
commit
1922821e4d
@ -1,6 +1,5 @@
|
||||
PORTNAME= odoo
|
||||
PORTVERSION= 13.0
|
||||
PORTREVISION= 3
|
||||
PORTVERSION= 14.0
|
||||
CATEGORIES= finance www
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
||||
@ -10,7 +9,7 @@ COMMENT= Suite of web based open source business apps
|
||||
LICENSE= LGPL3
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_TAGNAME= 0b6a2569920b6584652c39b3465998649fe305b4
|
||||
GH_TAGNAME= 19d77c2a03335eb95a686bd69a1b56b38e87d609
|
||||
|
||||
LIB_DEPENDS= libxml2.so:textproc/libxml2 \
|
||||
libxslt.so:textproc/libxslt \
|
||||
@ -60,7 +59,9 @@ RUN_DEPENDS= wkhtmltopdf>0:converters/wkhtmltopdf \
|
||||
${PYTHON_PKGNAMEPREFIX}xlrd>=1.2.0:textproc/py-xlrd@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}xlwt>=1.3.0:textproc/py-xlwt@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}ofxparse>=0.20:finance/py-ofxparse@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}ebaysdk>=2.1.3:finance/py-ebaysdk@${PY_FLAVOR}
|
||||
${PYTHON_PKGNAMEPREFIX}ebaysdk>=2.1.3:finance/py-ebaysdk@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR}
|
||||
|
||||
USES= cpe python:3.5+ pgsql shebangfix
|
||||
USE_PYTHON= distutils
|
||||
@ -87,11 +88,9 @@ post-patch:
|
||||
@${REINPLACE_CMD} -i "" -e 's|from werkzeug import url_encode|from werkzeug.urls import url_encode|g' \
|
||||
${WRKSRC}/odoo/addons/mail/models/mail_thread.py \
|
||||
${WRKSRC}/odoo/addons/mail/controllers/main.py \
|
||||
${WRKSRC}/odoo/addons/hr/models/hr_employee.py \
|
||||
${WRKSRC}/odoo/addons/hr_expense/wizard/hr_expense_sheet_register_payment.py
|
||||
${WRKSRC}/odoo/addons/hr/models/hr_employee.py
|
||||
@${REINPLACE_CMD} -i "" -e 's|werkzeug|werkzeug.urls|g' \
|
||||
${WRKSRC}/odoo/addons/web_editor/models/ir_attachment.py \
|
||||
${WRKSRC}/odoo/addons/odoo_referral/models/res_users.py
|
||||
${WRKSRC}/odoo/addons/web_editor/models/ir_attachment.py
|
||||
|
||||
post-extract:
|
||||
@cd ${WRKSRC}/addons/ && ${MV} * ${WRKSRC}/odoo/addons/
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1586296630
|
||||
SHA256 (odoo-odoo-13.0-0b6a2569920b6584652c39b3465998649fe305b4_GH0.tar.gz) = b36e0ed857155770bef89f4f418ea3cd8f323543e523980f39c1e54627ddfea7
|
||||
SIZE (odoo-odoo-13.0-0b6a2569920b6584652c39b3465998649fe305b4_GH0.tar.gz) = 114565953
|
||||
TIMESTAMP = 1630529228
|
||||
SHA256 (odoo-odoo-14.0-19d77c2a03335eb95a686bd69a1b56b38e87d609_GH0.tar.gz) = fa5ef383137c1c4e6562a26f13ac0280db25e1c552ca01a92fce88de78881420
|
||||
SIZE (odoo-odoo-14.0-19d77c2a03335eb95a686bd69a1b56b38e87d609_GH0.tar.gz) = 130640356
|
||||
|
||||
@ -52,7 +52,7 @@ odoo_start()
|
||||
{
|
||||
daemon -p ${pidfile} -u ${odoo_user} \
|
||||
${command} ${command_args}
|
||||
echo "Started"
|
||||
echo "Starting ${name}"
|
||||
}
|
||||
|
||||
odoo_datadir_check()
|
||||
@ -60,7 +60,7 @@ odoo_datadir_check()
|
||||
if [ ! -d "${odoo_datadir}" ]; then
|
||||
${mkdir_cmd} -p ${odoo_datadir}
|
||||
${chown_cmd} -R ${odoo_user}:${odoo_user} ${odoo_datadir}
|
||||
echo "Data directory created"
|
||||
echo "${name} data directory created"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -78,12 +78,12 @@ odoo_initdb()
|
||||
odoo_start_precmd
|
||||
daemon -p ${pidfile} -u ${odoo_user} \
|
||||
${command} ${command_args} -i all
|
||||
echo "Initializing database and starting odoo server"
|
||||
echo "Initializing database and starting ${name} server"
|
||||
}
|
||||
|
||||
odoo_restart()
|
||||
{
|
||||
echo "Performing restart"
|
||||
echo "Performing restart ${name}"
|
||||
odoo_stop
|
||||
sleep 5
|
||||
odoo_start
|
||||
@ -106,7 +106,7 @@ odoo_stop()
|
||||
then
|
||||
kill `cat ${pidfile}`
|
||||
rm ${pidfile}
|
||||
echo "Stopped"
|
||||
echo "Stopping ${name}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- odoo/addons/web_editor/models/ir_attachment.py 2021-09-04 18:48:12.921708000 -0500
|
||||
+++ odoo/addons/web_editor/models/ir_attachment.py 2021-09-04 18:48:25.791645000 -0500
|
||||
@@ -1,7 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
-from werkzeug.urls.urls import url_quote
|
||||
+from werkzeug.urls import url_quote
|
||||
|
||||
from odoo import api, models, fields, tools
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
--- odoo/http.py 2020-04-21 16:59:04.084246000 -0500
|
||||
+++ odoo/http.py 2020-04-21 17:04:53.110315000 -0500
|
||||
@@ -26,13 +26,14 @@
|
||||
|
||||
import babel.core
|
||||
from datetime import datetime, date
|
||||
+import secure_cookie.session
|
||||
import passlib.utils
|
||||
import psycopg2
|
||||
import json
|
||||
-import werkzeug.contrib.sessions
|
||||
import werkzeug.datastructures
|
||||
import werkzeug.exceptions
|
||||
import werkzeug.local
|
||||
+import werkzeug.middleware.shared_data
|
||||
import werkzeug.routing
|
||||
import werkzeug.wrappers
|
||||
import werkzeug.wsgi
|
||||
@@ -966,7 +967,7 @@
|
||||
class SessionExpiredException(Exception):
|
||||
pass
|
||||
|
||||
-class OpenERPSession(werkzeug.contrib.sessions.Session):
|
||||
+class OpenERPSession(secure_cookie.session.Session):
|
||||
def __init__(self, *args, **kwargs):
|
||||
self.inited = False
|
||||
self.modified = False
|
||||
@@ -1267,7 +1268,7 @@
|
||||
# Setup http sessions
|
||||
path = odoo.tools.config.session_dir
|
||||
_logger.debug('HTTP sessions stored in: %s', path)
|
||||
- return werkzeug.contrib.sessions.FilesystemSessionStore(
|
||||
+ return secure_cookie.session.FilesystemSessionStore(
|
||||
path, session_class=OpenERPSession, renew_missing=True)
|
||||
|
||||
@lazy_property
|
||||
@@ -1310,7 +1311,7 @@
|
||||
|
||||
if statics:
|
||||
_logger.info("HTTP Configuring static files")
|
||||
- app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, statics, cache_timeout=STATIC_CACHE)
|
||||
+ app = werkzeug.middleware.shared_data.SharedDataMiddleware(self.dispatch, statics, cache_timeout=STATIC_CACHE)
|
||||
self.dispatch = DisableCacheMiddleware(app)
|
||||
|
||||
def setup_session(self, httprequest):
|
||||
19
finance/odoo/files/patch-odoo_tools__vendor_sessions.py
Normal file
19
finance/odoo/files/patch-odoo_tools__vendor_sessions.py
Normal file
@ -0,0 +1,19 @@
|
||||
--- odoo/tools/_vendor/sessions.py 2021-09-04 18:46:08.432901000 -0500
|
||||
+++ odoo/tools/_vendor/sessions.py 2021-09-04 18:46:25.423822000 -0500
|
||||
@@ -26,7 +26,6 @@
|
||||
from time import time
|
||||
|
||||
from werkzeug.datastructures import CallbackDict
|
||||
-from werkzeug.posixemulation import rename
|
||||
|
||||
_sha1_re = re.compile(r"^[a-f0-9]{40}$")
|
||||
|
||||
@@ -198,7 +197,7 @@
|
||||
finally:
|
||||
f.close()
|
||||
try:
|
||||
- rename(tmp, fn)
|
||||
+ os.rename(tmp, fn)
|
||||
os.chmod(fn, self.mode)
|
||||
except (IOError, OSError):
|
||||
pass
|
||||
@ -37,7 +37,7 @@ Odoo ERP was installed
|
||||
7) If you want securizing Odoo access from web browser (https), you can use a
|
||||
web server like proxy. Look at following documentation:
|
||||
|
||||
https://www.odoo.com/documentation/13.0/setup/deploy.html#https
|
||||
https://www.odoo.com/documentation/14.0/setup/deploy.html#https
|
||||
|
||||
EOM
|
||||
}
|
||||
|
||||
23227
finance/odoo/pkg-plist
23227
finance/odoo/pkg-plist
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user