From nobody Wed Jun 29 04:29:41 2022 X-Original-To: dev-commits-ports-branches@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 7303B8612D9; Wed, 29 Jun 2022 04:29:42 +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 4LXpQZ1MyLz3MXS; Wed, 29 Jun 2022 04:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656476982; 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=q6oIcyh9Dp2cX3GHNul6lFEyOMZU0tIljnM87elsR+g=; b=ZEUmDoW4R4wubRs2jLxO2Rrut6j88rgEcvEutuTwmW+6jcWniY8PvBiRrXV4d0KLm4XX1q s3Y4LymJFlE6Z/EXw3iZ1Y2hhf8VvoWCUlZMLdXS5noYVSTZ0DHAPmfRmAXkLDicy81Pbx 11+mQTcsL/jpQv+Kym6OhkWX5BxDNBAKNK4jNTbVvnXl3mtqb04M2stMCHQXRnQFZVNB3q 11YC9cvYH3DgVlhRoEjNwcyCUJZ46v0ObhvwKe89n09RPn3UmlOCsA+3qWYa04CJgVWQNi NMl26rP+El3mo0alWJozx/APEpZsI0OZ5187/BUkPhoO2sF0HKkyDuhodkBxEw== 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 E9BD52935; Wed, 29 Jun 2022 04:29:41 +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 25T4TfVC091154; Wed, 29 Jun 2022 04:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25T4TfP4091153; Wed, 29 Jun 2022 04:29:41 GMT (envelope-from git) Date: Wed, 29 Jun 2022 04:29:41 GMT Message-Id: <202206290429.25T4TfP4091153@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Ashish SHUKLA Subject: git: 70c7530875e7 - 2022Q2 - net-im/py-matrix-synapse: Update to 1.58.1 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 70c7530875e778973f691cbb11bdbe3b5440cf51 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656476982; 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=q6oIcyh9Dp2cX3GHNul6lFEyOMZU0tIljnM87elsR+g=; b=gA5D8/Vdg7YQgSLkbJyqfWFkosbd71D2UonpuQfBrLNNa6XaCjQbuiJpXG7OBCA5lexqZa OAEuDAO7cp8IK3zPBp3qcKbuO045bR10izwlkuN2vWnALbu9Nk0Z9K8Gw5s1zYer9MU3jY gtKKOVqq/owHGe+gUDpHcfFrIIxz0nXDBcIcG5tg2erUpkmz6RZcoN1dN7Wdky6g7yLiwI RiJZzAwEp8vw5HbLiWKdIYqgy0w9L7jDxW0h7DvHgPKC7M7MrWMarD7SGaLb+ZIQERtrqg SC7LENNlkY/wbq8nWG3rs2hSFJkqplVj2YUqH9esLOXvrKAwC0D7wVxr30Oo3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656476982; a=rsa-sha256; cv=none; b=u+Qjcabw0HdlOIPMeJtRYHHEvdXfs+hL03ahVb2rYUL36HuMg3r/j5JwhAqlmVDPzsWcFA eg3W8Bx3yPy6Dn+pyl4En/jCrosgLP/txOriJO088+LK+IyBwy6H+i8Hi3gKP7/e5GApnU WcqYbskVC10y63uYdWziomHr9jVGuEE16vysRN9xpsSYpR6CJ1s+HImSkIbPwLY42O1tm3 bZa4mU7I7CwNVuomfnkiPweaExTl98zWarRb9owfD6ZaR2NEWW86V0tWh1Ywu48TBDVdpw yu3pwIh6KfVcYdxwcc/eJ2fATcIRHZJiUQlsha6U/QssHkdmFxh1X5ykNzoGZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=70c7530875e778973f691cbb11bdbe3b5440cf51 commit 70c7530875e778973f691cbb11bdbe3b5440cf51 Author: Sascha Biberhofer AuthorDate: 2022-05-10 14:45:51 +0000 Commit: Ashish SHUKLA CommitDate: 2022-06-29 04:13:01 +0000 net-im/py-matrix-synapse: Update to 1.58.1 (cherry picked from commit 5f0906db0fbc37b5770b4625e3b8db01b6382140) --- net-im/py-matrix-synapse/Makefile | 18 +++++++++++++----- net-im/py-matrix-synapse/distinfo | 6 +++--- net-im/py-matrix-synapse/files/patch-pyproject.toml | 11 +++++++++++ .../files/patch-synapse_python__dependencies.py | 11 ----------- net-im/py-matrix-synapse/files/pkg-message.in | 9 +++++++++ 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index 47fbe7aba7a2..86daae0ccc9a 100644 --- a/net-im/py-matrix-synapse/Makefile +++ b/net-im/py-matrix-synapse/Makefile @@ -2,7 +2,7 @@ PORTNAME= matrix-synapse DISTVERSIONPREFIX= v -DISTVERSION= 1.57.1 +DISTVERSION= 1.58.1 CATEGORIES= net-im python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,10 +12,13 @@ COMMENT= Matrix protocol reference homeserver LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}poetry2setup>=1.0.0:devel/py-poetry2setup@${PY_FLAVOR} + # Keep the RUN_DEPENDS layout similar to the master/synapse/python_dependencies.py file RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}frozendict>=1:devel/py-frozendict@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=2.1.0:devel/py-unpaddedbase64@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.4.0:devel/py-canonicaljson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}signedjson>=1.1.0:security/py-signedjson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pynacl>=1.2.1:security/py-pynacl@${PY_FLAVOR} \ @@ -34,13 +37,13 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_F ${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.2:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.4.0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}attrs>19.2.0:devel/py-attrs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.3:www/py-bleach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.10.0:devel/py-typing-extensions@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ijson>=3.1.4:devel/py-ijson@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.7.0:www/py-pyjwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=16.1:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matrix-common>=1.1.0:devel/py-matrix-common@${PY_FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss @@ -74,13 +77,15 @@ PLIST_FILES= "@sample ${ETCDIR}/log.config.sample" DOCS= README.rst UPGRADE.rst CHANGES.md docs/postgres.md PORTDOCS= ${DOCS:T} -OPTIONS_DEFINE= DOCS LDAP OIDC PGSQL REDIS SQLITE URLPREVIEW +OPTIONS_DEFINE= DOCS JWT LDAP OIDC PGSQL REDIS SQLITE URLPREVIEW OPTIONS_DEFAULT= PGSQL SQLITE +JWT_DESC= Add dependencies for JSON web tokens OIDC_DESC= Add dependencies for OpenID Connect based logins REDIS_DESC= Add support replication over Redis for synapse workers URLPREVIEW_DESC= Add dependencies necessary for URL previews +JWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.6.4:www/py-pyjwt@${PY_FLAVOR} LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3@${PY_FLAVOR} OIDC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authlib>=0.14.0:security/py-authlib@${PY_FLAVOR} PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>2.8:databases/py-psycopg2@${PY_FLAVOR} @@ -96,6 +101,9 @@ URLPREVIEW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.2.0:devel/py-lxml@${PY_FL RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.4:devel/py-importlib-metadata@${PY_FLAVOR} .endif +pre-configure: + cd ${WRKSRC} && poetry2setup > setup.py + post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/log.config ${STAGEDIR}${ETCDIR}/log.config.sample diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo index d0ba9224cbf1..363ca167e23f 100644 --- a/net-im/py-matrix-synapse/distinfo +++ b/net-im/py-matrix-synapse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650652816 -SHA256 (matrix-org-synapse-v1.57.1_GH0.tar.gz) = 07926e1601bd2973ea16baabd41268939ceeb90f6a8c98b31a3610de61dc5ad1 -SIZE (matrix-org-synapse-v1.57.1_GH0.tar.gz) = 7834623 +TIMESTAMP = 1651864723 +SHA256 (matrix-org-synapse-v1.58.1_GH0.tar.gz) = 3e64e102ee9e848c70b923a68001990541bb749e9fb3fe2cf4f643ad40955add +SIZE (matrix-org-synapse-v1.58.1_GH0.tar.gz) = 7881275 diff --git a/net-im/py-matrix-synapse/files/patch-pyproject.toml b/net-im/py-matrix-synapse/files/patch-pyproject.toml new file mode 100644 index 000000000000..903aba718c30 --- /dev/null +++ b/net-im/py-matrix-synapse/files/patch-pyproject.toml @@ -0,0 +1,11 @@ +--- pyproject.toml.orig 2022-05-07 18:29:37 UTC ++++ pyproject.toml +@@ -146,7 +146,7 @@ bleach = ">=1.4.3" + typing-extensions = ">=3.10.0" + # We enforce that we have a `cryptography` version that bundles an `openssl` + # with the latest security patches. +-cryptography = ">=3.4.7" ++cryptography = "*" + # ijson 3.1.4 fixes a bug with "." in property names + ijson = ">=3.1.4" + matrix-common = "~=1.1.0" diff --git a/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py b/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py deleted file mode 100644 index 2cace56065f0..000000000000 --- a/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py +++ /dev/null @@ -1,11 +0,0 @@ ---- synapse/python_dependencies.py.orig 2022-04-20 00:17:17 UTC -+++ synapse/python_dependencies.py -@@ -82,7 +82,7 @@ REQUIREMENTS = [ - "typing-extensions>=3.10.0", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. -- "cryptography>=3.4.7", -+ "cryptography", - # ijson 3.1.4 fixes a bug with "." in property names - "ijson>=3.1.4", - "matrix-common~=1.1.0", diff --git a/net-im/py-matrix-synapse/files/pkg-message.in b/net-im/py-matrix-synapse/files/pkg-message.in index 5041454e8d04..7121cf97a00f 100644 --- a/net-im/py-matrix-synapse/files/pkg-message.in +++ b/net-im/py-matrix-synapse/files/pkg-message.in @@ -74,4 +74,13 @@ section of the configuration file, is set to true. See the upgrade notes[1] for [1] https://matrix-org.github.io/synapse/v1.56/upgrade#change-in-behaviour-for-postgresql-databases-with-unsafe-locale EOM } +{ type: upgrade + maximum_version: 1.62.0 + message: <