From nobody Sun Apr 02 19:33:18 2023 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 4PqPMM1Tv0z446CL; Sun, 2 Apr 2023 19:33:19 +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 4PqPMM0Jzcz4NQS; Sun, 2 Apr 2023 19:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680463999; 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=qlbQYRWJkgp+vHZ3v8uKnSgD4An1iPpl+rAOO5EtUGY=; b=XHIM+YuI3J3W15GNTLAnGXakTidTUxv45dvHXuVMm/HHESkNrpPELjsLdYZgtfI+s7xGaO VojlLXRf1xgyDmUtNLEtn+ErIDVKAYKFXcq6er5H1BsVc5Ilug+AAOG69yC9d7ofGk+MbZ RBvNREHnaKgJnEpNoRS/tW6T9uNCTBUVOdc/QcjX6YbquUTjEmWqsnJNi3nKN0SZdSLdgA XlUDeYlziawU88UfL6iwORT201d9RDjJVYEsc4ND4co1soxQGOTN/It4MhYYC3ETrW++2f VS/0SPSE5cU/6AmPvs3V4rC5bA14WXe4XUsgAVDyhIkzBqIldpMTSly6VKLmXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680463999; 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=qlbQYRWJkgp+vHZ3v8uKnSgD4An1iPpl+rAOO5EtUGY=; b=GjtM1oXiDK+eyUb6dunjT+XaERHxR3rW9HRnPlNb1LUcQogF6VZGJgWGdEyCetllFSdBh9 hRes1VZ8XVadRKNQ+qcmoUDaEOUzEHyWHRHFJc7RpPzqqx3GhUys9yDf4jtiBi1rNdOKov S2sC6YbT2yq1Pd7zI+/1p0uYmMXq3hWu7Q0nNZA6GOXerqwcP4NxSF6TKHuzLwgjqvgG1E 4D7CwUKA0fZ8iCI1LE7fIHYPL+3+kCyqdqQBMzvoF4eSozkYVsscK3WgPZDdSWt3w9P9zk ISRqCtp5WuUKpIQoZMBhq9iBEn3WcLlXuByCEYRmMtI05w8vhlHHuUgSM+Unag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680463999; a=rsa-sha256; cv=none; b=Gcg69YnW4JNic0/eTGXkh0JX2ZGvgCO3L0lksDSyF7N7c39euZSSrS5WMizoZp46uD+zMu M2q2ipI78a1OHV5PwUxghNEcOSELZTtnvzZZquKeqVweu/PuCdsJfvkvUIqJKaU4YY2aZO ZKyfbUh+tRupbW5Rs6EKt+ThQEKgjxAMqVvSGfn07T8JdSFRIdZMQlS598dBSMCb0jHDcX 3EOHs+XjGMKmXKqGUZ5lcUoLTD5XL1Z5gu+Si+oZnWvySiVSLSTHMjFJvasFiI2EVYjJiw 4h2xGMa+hwm+HeGivjj+QCtxmXSufXzQFxjhH7L0w97QKmR4xqULSckX5VUkcg== 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 4PqPML637czVMt; Sun, 2 Apr 2023 19:33:18 +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 332JXIYK076719; Sun, 2 Apr 2023 19:33:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332JXIki076718; Sun, 2 Apr 2023 19:33:18 GMT (envelope-from git) Date: Sun, 2 Apr 2023 19:33:18 GMT Message-Id: <202304021933.332JXIki076718@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 1f7a6ca81141 - main - net-im/py-matrix-synapse: Update to 1.80.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: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f7a6ca811411c686de22ff25a898ad1f37059cd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f7a6ca811411c686de22ff25a898ad1f37059cd commit 1f7a6ca811411c686de22ff25a898ad1f37059cd Author: Ashish SHUKLA AuthorDate: 2023-04-02 19:30:15 +0000 Commit: Ashish SHUKLA CommitDate: 2023-04-02 19:32:47 +0000 net-im/py-matrix-synapse: Update to 1.80.0 - Relax bounds on frozendict Approved by: Sascha Biberhofer (maintainer) Co-authored-by: Sascha Biberhofer --- net-im/py-matrix-synapse/Makefile | 18 +++++------ net-im/py-matrix-synapse/distinfo | 36 ++++++++++++---------- .../py-matrix-synapse/files/patch-pyproject.toml | 15 +++++++-- net-im/py-matrix-synapse/files/patch-setup.py | 10 +++--- 4 files changed, 46 insertions(+), 33 deletions(-) diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index 41a2a3a562f8..139b012e5126 100644 --- a/net-im/py-matrix-synapse/Makefile +++ b/net-im/py-matrix-synapse/Makefile @@ -1,6 +1,5 @@ PORTNAME= matrix-synapse -DISTVERSION= 1.76.0 -PORTREVISION= 2 +DISTVERSION= 1.80.0 CATEGORIES= net-im python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -66,7 +65,7 @@ CARGO_TEST= no CARGO_INSTALL= no CARGO_CARGOTOML= ${WRKSRC}/rust/Cargo.toml CARGO_CRATES= aho-corasick-0.7.19 \ - anyhow-1.0.68 \ + anyhow-1.0.70 \ arc-swap-1.5.1 \ autocfg-1.1.0 \ bitflags-1.3.2 \ @@ -88,26 +87,27 @@ CARGO_CRATES= aho-corasick-0.7.19 \ once_cell-1.15.0 \ parking_lot-0.12.1 \ parking_lot_core-0.9.3 \ - proc-macro2-1.0.46 \ + proc-macro2-1.0.52 \ pyo3-0.17.3 \ pyo3-build-config-0.17.3 \ pyo3-ffi-0.17.3 \ - pyo3-log-0.7.0 \ + pyo3-log-0.8.1 \ pyo3-macros-0.17.3 \ pyo3-macros-backend-0.17.3 \ pythonize-0.17.0 \ - quote-1.0.21 \ + quote-1.0.26 \ redox_syscall-0.2.16 \ regex-1.7.1 \ regex-syntax-0.6.27 \ ryu-1.0.11 \ scopeguard-1.1.0 \ - serde-1.0.152 \ - serde_derive-1.0.152 \ - serde_json-1.0.91 \ + serde-1.0.157 \ + serde_derive-1.0.157 \ + serde_json-1.0.94 \ smallvec-1.10.0 \ subtle-2.4.1 \ syn-1.0.104 \ + syn-2.0.2 \ target-lexicon-0.12.4 \ typenum-1.15.0 \ unicode-ident-1.0.5 \ diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo index 922f6f169589..ef99c8c13060 100644 --- a/net-im/py-matrix-synapse/distinfo +++ b/net-im/py-matrix-synapse/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1675243495 -SHA256 (matrix_synapse-1.76.0.tar.gz) = 08d7a6233e3bd6f2c2611d6555bea7089140cfa3f5e5d010c0ec3e444bf1a6e0 -SIZE (matrix_synapse-1.76.0.tar.gz) = 3113396 +TIMESTAMP = 1680052681 +SHA256 (matrix_synapse-1.80.0.tar.gz) = 16c6df16dfa0d3061bfd9ebee8b6e6935756d35cee32f08ffd831db4624cf031 +SIZE (matrix_synapse-1.80.0.tar.gz) = 3167250 SHA256 (rust/crates/aho-corasick-0.7.19.crate) = b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e SIZE (rust/crates/aho-corasick-0.7.19.crate) = 113070 -SHA256 (rust/crates/anyhow-1.0.68.crate) = 2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61 -SIZE (rust/crates/anyhow-1.0.68.crate) = 43882 +SHA256 (rust/crates/anyhow-1.0.70.crate) = 7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4 +SIZE (rust/crates/anyhow-1.0.70.crate) = 43803 SHA256 (rust/crates/arc-swap-1.5.1.crate) = 983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164 SIZE (rust/crates/arc-swap-1.5.1.crate) = 66157 SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa @@ -47,24 +47,24 @@ SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff49129 SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967 SHA256 (rust/crates/parking_lot_core-0.9.3.crate) = 09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929 SIZE (rust/crates/parking_lot_core-0.9.3.crate) = 32256 -SHA256 (rust/crates/proc-macro2-1.0.46.crate) = 94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b -SIZE (rust/crates/proc-macro2-1.0.46.crate) = 41954 +SHA256 (rust/crates/proc-macro2-1.0.52.crate) = 1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224 +SIZE (rust/crates/proc-macro2-1.0.52.crate) = 42982 SHA256 (rust/crates/pyo3-0.17.3.crate) = 268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543 SIZE (rust/crates/pyo3-0.17.3.crate) = 408939 SHA256 (rust/crates/pyo3-build-config-0.17.3.crate) = 28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8 SIZE (rust/crates/pyo3-build-config-0.17.3.crate) = 29230 SHA256 (rust/crates/pyo3-ffi-0.17.3.crate) = 0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc SIZE (rust/crates/pyo3-ffi-0.17.3.crate) = 62854 -SHA256 (rust/crates/pyo3-log-0.7.0.crate) = e5695ccff5060c13ca1751cf8c857a12da9b0bf0378cb071c5e0326f7c7e4c1b -SIZE (rust/crates/pyo3-log-0.7.0.crate) = 13774 +SHA256 (rust/crates/pyo3-log-0.8.1.crate) = f9c8b57fe71fb5dcf38970ebedc2b1531cf1c14b1b9b4c560a182a57e115575c +SIZE (rust/crates/pyo3-log-0.8.1.crate) = 14082 SHA256 (rust/crates/pyo3-macros-0.17.3.crate) = 94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28 SIZE (rust/crates/pyo3-macros-0.17.3.crate) = 7257 SHA256 (rust/crates/pyo3-macros-backend-0.17.3.crate) = c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f SIZE (rust/crates/pyo3-macros-backend-0.17.3.crate) = 49992 SHA256 (rust/crates/pythonize-0.17.0.crate) = 0f7f0c136f5fbc01868185eef462800e49659eb23acca83b9e884367a006acb6 SIZE (rust/crates/pythonize-0.17.0.crate) = 10949 -SHA256 (rust/crates/quote-1.0.21.crate) = bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179 -SIZE (rust/crates/quote-1.0.21.crate) = 28030 +SHA256 (rust/crates/quote-1.0.26.crate) = 4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc +SIZE (rust/crates/quote-1.0.26.crate) = 28397 SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012 SHA256 (rust/crates/regex-1.7.1.crate) = 48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733 @@ -75,18 +75,20 @@ SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66e SIZE (rust/crates/ryu-1.0.11.crate) = 47007 SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470 -SHA256 (rust/crates/serde-1.0.152.crate) = bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb -SIZE (rust/crates/serde-1.0.152.crate) = 77091 -SHA256 (rust/crates/serde_derive-1.0.152.crate) = af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e -SIZE (rust/crates/serde_derive-1.0.152.crate) = 55586 -SHA256 (rust/crates/serde_json-1.0.91.crate) = 877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883 -SIZE (rust/crates/serde_json-1.0.91.crate) = 144654 +SHA256 (rust/crates/serde-1.0.157.crate) = 707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca +SIZE (rust/crates/serde-1.0.157.crate) = 77012 +SHA256 (rust/crates/serde_derive-1.0.157.crate) = 78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5 +SIZE (rust/crates/serde_derive-1.0.157.crate) = 54958 +SHA256 (rust/crates/serde_json-1.0.94.crate) = 1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea +SIZE (rust/crates/serde_json-1.0.94.crate) = 144406 SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0 SIZE (rust/crates/smallvec-1.10.0.crate) = 31564 SHA256 (rust/crates/subtle-2.4.1.crate) = 6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601 SIZE (rust/crates/subtle-2.4.1.crate) = 12630 SHA256 (rust/crates/syn-1.0.104.crate) = 4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce SIZE (rust/crates/syn-1.0.104.crate) = 236683 +SHA256 (rust/crates/syn-2.0.2.crate) = 59d3276aee1fa0c33612917969b5172b5be2db051232a6e4826f1a1a9191b045 +SIZE (rust/crates/syn-2.0.2.crate) = 240038 SHA256 (rust/crates/target-lexicon-0.12.4.crate) = c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1 SIZE (rust/crates/target-lexicon-0.12.4.crate) = 23020 SHA256 (rust/crates/typenum-1.15.0.crate) = dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987 diff --git a/net-im/py-matrix-synapse/files/patch-pyproject.toml b/net-im/py-matrix-synapse/files/patch-pyproject.toml index acbd690b99f2..ea97936dfb6f 100644 --- a/net-im/py-matrix-synapse/files/patch-pyproject.toml +++ b/net-im/py-matrix-synapse/files/patch-pyproject.toml @@ -1,6 +1,15 @@ ---- pyproject.toml.orig 2022-09-27 11:37:18 UTC +--- pyproject.toml.orig 2023-03-28 10:30:20 UTC +++ pyproject.toml -@@ -162,7 +162,7 @@ bleach = ">=1.4.3" +@@ -156,7 +156,7 @@ jsonschema = ">=3.0.0" + # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41 + # We cannot test our wheels against the 2.3.5 release in CI. Putting in an upper bound for this + # because frozendict has been more trouble than it's worth; we would like to move to immutabledict. +-frozendict = ">=1,!=2.1.2,<2.3.5" ++frozendict = ">=1" + # We require 2.1.0 or higher for type hints. Previous guard was >= 1.1.0 + unpaddedbase64 = ">=2.1.0" + # We require 1.5.0 to work around an issue when running against the C implementation of +@@ -199,7 +199,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. @@ -9,7 +18,7 @@ # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.3.0" -@@ -173,17 +173,6 @@ packaging = ">=16.1" +@@ -210,17 +210,6 @@ packaging = ">=16.1" importlib_metadata = { version = ">=1.4", python = "<3.8" } # This is the most recent version of Pydantic with available on common distros. pydantic = ">=1.7.4" diff --git a/net-im/py-matrix-synapse/files/patch-setup.py b/net-im/py-matrix-synapse/files/patch-setup.py index 9292c52a2214..36446364bf7e 100644 --- a/net-im/py-matrix-synapse/files/patch-setup.py +++ b/net-im/py-matrix-synapse/files/patch-setup.py @@ -1,19 +1,21 @@ --- setup.py.orig 1970-01-01 00:00:00 UTC +++ setup.py -@@ -149,7 +149,7 @@ install_requires = \ +@@ -154,8 +154,8 @@ install_requires = \ 'bcrypt>=3.1.7', 'bleach>=1.4.3', 'canonicaljson>=1.5.0,<2.0.0', - 'cryptography>=3.4.7', +- 'frozendict>=1,!=2.1.2,<2.3.5', + 'cryptography', - 'frozendict>=1,!=2.1.2', ++ 'frozendict>=1', 'ijson>=3.1.4', 'jsonschema>=3.0.0', -@@ -165,7 +165,6 @@ install_requires = \ + 'matrix-common>=1.3.0,<2.0.0', +@@ -170,7 +170,6 @@ install_requires = \ 'pydantic>=1.7.4', 'pymacaroons>=0.13.0', 'service-identity>=18.1.0', - 'setuptools_rust>=1.3', 'signedjson>=1.1.0,<2.0.0', - 'sortedcontainers>=1.4.4', + 'sortedcontainers>=1.5.2', 'treq>=15.1',