From nobody Tue Nov 15 16:47:13 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 4NBXCQ0tNvz4hCbM; Tue, 15 Nov 2022 16:47:14 +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 4NBXCQ0HW4z3w3s; Tue, 15 Nov 2022 16:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668530834; 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=/FJGZ2PVLKZJ9XqmPrUvtDmqDT8vxOrQleIthNqYCZ0=; b=MMRbhd65md0oOoSRaHA941W868aFsJvdWjIknCy2M7CBkn3KL8JI8Okc9FMz3YIUz2Z7x1 nQSr97zVjJInafysjyiA5eW66Dg1IijlwvnoCKtFwaa9jWrmAEeSJMNc8RwocQ+Okii73G o2Ozww+dg/cfGvHdzTdmlWu8OJc5FYY/h7Jw5AER2QUCtQSML0lf42Zyh476vbVQHkMnPn trtpnNPuN9nJBz9lTUTnk1EsLKdZkw77/jeH7qJHQHyzYfQnndQaTFHrTWvbZ5PzutXhNJ oukx++5rNmVAxR/UXsHUUYW9lv379HkiLz5+ku/HpLa6hEzsL171ywoUNfp9sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668530834; 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=/FJGZ2PVLKZJ9XqmPrUvtDmqDT8vxOrQleIthNqYCZ0=; b=vjqUxL1DfN82eAQfDBUpk7Ziy1JikUIXy7/NRSsnTVBXQeZo0fyzNhy4ejGehbZgtWlf8E 0h6nm8OUfExJo14/nhl9KeubaE2fnUjAVGt7lr0GPd4yN7nnLVRs3OaIbYAFmxKEDvGDjK n82EghsHD0Lago9BE7U0X6zm0DAJ/W2wPCyb2yaI45Zo5YzgXPqy/7i00cS7KmCCT2iFpI 7ZEHF1k1BidxoUyLYSQhmere6T7606xGSLNfUrqM+BMGXjsykvM8sE3BOK0ew67RItPUba mRE83sXvEPfP+9PPYvoPCqXr2UZvWe2ku8LbsBVufV6w8Qa+uhFCFavrcVaJSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668530834; a=rsa-sha256; cv=none; b=qqmb/TBIe9BXyilIRTR2/2U6LNdAn/BDsnTL5KBs0rzu9236XgyOm3aLe5zAJouBv9eU3h lgpmv39/n/yGGRBfqZxkTlJPKBzDh3E0P9hIxgWrn/XC8Z4Vq00n+5fPrTl7MMKro0KQG9 Hkoa0/D2yh/F2pSVqkCLGjg4Zh/voBAaabd56rupwpNuhwpKO6B+y4X+5IqFUYHg//tC2i jsaAs6qBNHsuqWtkZTiAUOkJkCs27X7PpE8njRnmJzsZdnmx2iyYCdNRgmpyCA9nnpB33/ 8b+1Awu2zXNQS6k/ADJ1sTjKmWPm0oAdIGCBaLHgvUld+uddTU/4aayTK94Qug== 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 4NBXCP6TKRzTS4; Tue, 15 Nov 2022 16:47:13 +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 2AFGlDfm044052; Tue, 15 Nov 2022 16:47:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AFGlDeG044051; Tue, 15 Nov 2022 16:47:13 GMT (envelope-from git) Date: Tue, 15 Nov 2022 16:47:13 GMT Message-Id: <202211151647.2AFGlDeG044051@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: 5870c06b9793 - main - finance/odoo: Fix issues with latest version of py-werkzeug 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: 5870c06b97934edd150809f8c75cff0d2345fd29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=5870c06b97934edd150809f8c75cff0d2345fd29 commit 5870c06b97934edd150809f8c75cff0d2345fd29 Author: Jose Alonso Cardenas Marquez AuthorDate: 2022-11-15 16:44:46 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2022-11-15 16:47:03 +0000 finance/odoo: Fix issues with latest version of py-werkzeug - Fix path to odoo.conf file PR: 267331 266478 Reported by: Dimitri Kaparis --- finance/odoo/Makefile | 5 ++++- finance/odoo/files/odoo.in | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile index 1d34eb0e6e1e..980993e56112 100644 --- a/finance/odoo/Makefile +++ b/finance/odoo/Makefile @@ -1,6 +1,6 @@ PORTNAME= odoo PORTVERSION= 15.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance www PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -93,6 +93,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/hr/models/hr_employee.py + @${REINPLACE_CMD} -i "" -e 's|(index !== |(index == |g' \ + ${WRKSRC}/odoo/addons/web/static/src/legacy/js/libs/content-disposition.js \ + ${WRKSRC}/odoo/addons/web/static/src/core/network/download.js post-extract: @cd ${WRKSRC}/addons/ && ${MV} * ${WRKSRC}/odoo/addons/ diff --git a/finance/odoo/files/odoo.in b/finance/odoo/files/odoo.in index 17dcf6d6b05b..896557434bc0 100644 --- a/finance/odoo/files/odoo.in +++ b/finance/odoo/files/odoo.in @@ -40,7 +40,7 @@ initdb_cmd="odoo_initdb" start_precmd="odoo_start_precmd" command=/usr/local/bin/odoo -command_args="--database=${odoo_database} --data-dir=${odoo_datadir} --logfile=/var/log/${name}.log --config=%%LOCALBASE%%/etc/odoo.conf ${odoo_flags}" +command_args="--database=${odoo_database} --data-dir=${odoo_datadir} --logfile=/var/log/${name}.log --config=%%LOCALBASE%%/etc/odoo/odoo.conf ${odoo_flags}" odoo_start_precmd() { odoo_datadir_check