From nobody Sat Aug 27 19:36:11 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MFRlJ0G4Wz4b3tW; Sat, 27 Aug 2022 19:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MFRlH73Ccz3yrW; Sat, 27 Aug 2022 19:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661628972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tVmnun+OqVsfW090hPaSZDIPTVbeikebEnzJ5F8NAK8=; b=OwH9PvrE+pcCCIFFdpUw0eFvNv5eSk9OZ7alP4lYvwbttdaMEpI0a55eoMhErPwJf6lKSt p9sHGhslpBOQxpN8n4FvdRrKHF0qziM4wthM10TinzGPRHj6cc8mEer+GVcCnys7pLkzxo 2gRFjhuz69it2LygW8y/UMeNK/y4MFyilfwnpUTSFoRZYbtwUvmxANhmerisMV1MZlnptL FK9Gn7EtlfOGwz5QORQTQxk1+GEQWX9cAdJ7LzMA/cpUOvqmL9WM4mobags3kqCZvo1FTm z22DDMBwz/ivUIC8zQ3XAi7YMjDH0XVR9JL7NGYe707rKzEPjs9JOHMb5tNZSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MFRlH6572zrFZ; Sat, 27 Aug 2022 19:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27RJaBSI026319; Sat, 27 Aug 2022 19:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27RJaBjR026318; Sat, 27 Aug 2022 19:36:11 GMT (envelope-from git) Date: Sat, 27 Aug 2022 19:36:11 GMT Message-Id: <202208271936.27RJaBjR026318@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: ef361ef8235d - main - finance/odoo: update to 15.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef361ef8235d8b8d70b8c57818f1884ad757859b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661628972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tVmnun+OqVsfW090hPaSZDIPTVbeikebEnzJ5F8NAK8=; b=gNqnwShneLlKLu8NLo9Su15wsPxSi/Eu65EJkSh80It5gsUkPtuJzsHAspIZvKRj4YY+iV wSO9QkVFgcsJ2KVSSWXWangMI1KxFWOQWbmQRoLor0BagXKGGdo0E7aOEXPF5r5lZrLzah tYW25UxRS6HG92PrxHxIQ1Fa7m4ugcnN1dW6BLXZFqalFHDhZOeMSFR6/TwDLCP/CDgX2q 6BZOw2xzpxFt+EFaHJR5AFLMiEJ10/SPgLdMLZzLK6sZ1ZeOKvTpWzpCrzBrhbTrLDAWuQ 9235ge8O+yV0PLwySYSkFaU//cXsjnMtWwFd1kg73ET4OBGpu6dwgxKj5InjrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661628972; a=rsa-sha256; cv=none; b=nA+G7L3bwXHL2jxFQ/Yt3iEkKiigida0z4wilr4sPl85t5aVNHtQyrK+VRB2cSvKSSBkxS Ml+8qcKkV3V6u+QcHy39i6TeooUtzhoFMrpD7sOqPvImQsblWhfFiIC0G2I5FwtlsEm7SB /8uPhy4XopBahvdm27rDeNIkKAcDv6FOB1pdkBoOKypeypYr3//cYwe+eyETvDk5j1yQS+ P7pmkyKPXm7lSiRaW2k2CMS6YGr44JLl9dwpe+husUpXU0P4ZHmYL6Efdl6OQXQr6AmaGz c96463IDSDgy1FWMHsAWwxn5od1OpwIh+Mj/Pg8CdBsMCjGDpRsf0EcXypa3BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef361ef8235d8b8d70b8c57818f1884ad757859b commit ef361ef8235d8b8d70b8c57818f1884ad757859b Author: Jose Alonso Cardenas Marquez AuthorDate: 2022-08-27 19:26:25 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2022-08-27 19:26:25 +0000 finance/odoo: update to 15.0 ChangeLog at: https://github.com/odoo/odoo/commits/15.0 --- finance/odoo/Makefile | 10 +- finance/odoo/distinfo | 6 +- .../files/patch-odoo_tools__vendor_sessions.py | 19 - finance/odoo/files/pkg-message.in | 6 +- finance/odoo/pkg-plist | 12753 ++++++++++++------- 5 files changed, 8451 insertions(+), 4343 deletions(-) diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile index 80a3e7b4523b..a38422196fe4 100644 --- a/finance/odoo/Makefile +++ b/finance/odoo/Makefile @@ -1,6 +1,5 @@ PORTNAME= odoo -PORTVERSION= 14.0 -PORTREVISION= 3 +PORTVERSION= 15.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= 19d77c2a03335eb95a686bd69a1b56b38e87d609 +GH_TAGNAME= 02b4e98ebb2c45d9a4af10fe1bc732f048708f85 LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt \ @@ -77,6 +76,8 @@ GROUPS= ${USERS} USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message +CONFLICTS= odoo14 + ETCDIR= ${PREFIX}/etc/odoo post-patch: @@ -88,10 +89,7 @@ post-patch: ${WRKSRC}/odoo/addons/http_routing/models/ir_http.py @${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 - @${REINPLACE_CMD} -i "" -e 's|werkzeug|werkzeug.urls|g' \ - ${WRKSRC}/odoo/addons/web_editor/models/ir_attachment.py post-extract: @cd ${WRKSRC}/addons/ && ${MV} * ${WRKSRC}/odoo/addons/ diff --git a/finance/odoo/distinfo b/finance/odoo/distinfo index 9da8b613c39e..7877766de24c 100644 --- a/finance/odoo/distinfo +++ b/finance/odoo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630529228 -SHA256 (odoo-odoo-14.0-19d77c2a03335eb95a686bd69a1b56b38e87d609_GH0.tar.gz) = fa5ef383137c1c4e6562a26f13ac0280db25e1c552ca01a92fce88de78881420 -SIZE (odoo-odoo-14.0-19d77c2a03335eb95a686bd69a1b56b38e87d609_GH0.tar.gz) = 130640356 +TIMESTAMP = 1661575896 +SHA256 (odoo-odoo-15.0-02b4e98ebb2c45d9a4af10fe1bc732f048708f85_GH0.tar.gz) = bccfd6c683be0092c736b42cfc987b4b588e3c26865a96f2431b9ac6b3d5c3ec +SIZE (odoo-odoo-15.0-02b4e98ebb2c45d9a4af10fe1bc732f048708f85_GH0.tar.gz) = 140762887 diff --git a/finance/odoo/files/patch-odoo_tools__vendor_sessions.py b/finance/odoo/files/patch-odoo_tools__vendor_sessions.py deleted file mode 100644 index dcac41974344..000000000000 --- a/finance/odoo/files/patch-odoo_tools__vendor_sessions.py +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 diff --git a/finance/odoo/files/pkg-message.in b/finance/odoo/files/pkg-message.in index a1d2adf5f4d5..f1683356a51e 100644 --- a/finance/odoo/files/pkg-message.in +++ b/finance/odoo/files/pkg-message.in @@ -1,7 +1,7 @@ [ { type: install message: <