Received: by mail.netbsd.org (Postfix, from userid 605) id 79AFD84CF9; Sun, 12 Mar 2023 11:40:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A71C284CF9 for ; Sun, 12 Mar 2023 11:40:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id RltXW-lspj_C for ; Sun, 12 Mar 2023 11:40:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EA08584C2C for ; Sun, 12 Mar 2023 11:40:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E3180FA90; Sun, 12 Mar 2023 11:40:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1678621210288320" MIME-Version: 1.0 Date: Sun, 12 Mar 2023 11:40:10 +0000 From: "Jonathan Schleifer" Subject: CVS commit: pkgsrc/chat/matrix-synapse To: pkgsrc-changes@NetBSD.org Reply-To: js@netbsd.org X-Mailer: log_accum Message-Id: <20230312114010.E3180FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1678621210288320 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: js Date: Sun Mar 12 11:40:10 UTC 2023 Modified Files: pkgsrc/chat/matrix-synapse: Makefile distinfo pkgsrc/chat/matrix-synapse/patches: patch-pyproject.toml Log Message: chat/matrix-synapse: Remove pinning for frozendict To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 pkgsrc/chat/matrix-synapse/Makefile cvs rdiff -u -r1.54 -r1.55 pkgsrc/chat/matrix-synapse/distinfo cvs rdiff -u -r1.4 -r1.5 \ pkgsrc/chat/matrix-synapse/patches/patch-pyproject.toml Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1678621210288320 Content-Disposition: inline Content-Length: 3706 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/matrix-synapse/Makefile diff -u pkgsrc/chat/matrix-synapse/Makefile:1.73 pkgsrc/chat/matrix-synapse/Makefile:1.74 --- pkgsrc/chat/matrix-synapse/Makefile:1.73 Sun Mar 5 10:15:38 2023 +++ pkgsrc/chat/matrix-synapse/Makefile Sun Mar 12 11:40:10 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.73 2023/03/05 10:15:38 js Exp $ +# $NetBSD: Makefile,v 1.74 2023/03/12 11:40:10 js Exp $ DISTNAME= matrix-synapse-1.78.0 +PKGREVISION= 1 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_GITHUB:=matrix-org/} GITHUB_PROJECT= synapse Index: pkgsrc/chat/matrix-synapse/distinfo diff -u pkgsrc/chat/matrix-synapse/distinfo:1.54 pkgsrc/chat/matrix-synapse/distinfo:1.55 --- pkgsrc/chat/matrix-synapse/distinfo:1.54 Sun Mar 5 10:15:38 2023 +++ pkgsrc/chat/matrix-synapse/distinfo Sun Mar 12 11:40:10 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.54 2023/03/05 10:15:38 js Exp $ +$NetBSD: distinfo,v 1.55 2023/03/12 11:40:10 js Exp $ BLAKE2s (aho-corasick-0.7.19.crate) = b13c5789625903a58cfdb854bca6eb074329fde83ffb2581686f105d52d31996 SHA512 (aho-corasick-0.7.19.crate) = 0d63d29079650bde4e8a9f8529716b9d8c42db076a1d74715116240c2628173f1e86fb29c08a25ad07a0148e48789ab20de0c186a8b3dfb193cbfeb0d76ae78c @@ -165,5 +165,5 @@ Size (windows_x86_64_gnu-0.36.1.crate) = BLAKE2s (windows_x86_64_msvc-0.36.1.crate) = e48ba38c24d831da6c6db4bb434ee7df10185932b0ef6136ae605062f25b6d0d SHA512 (windows_x86_64_msvc-0.36.1.crate) = 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631 Size (windows_x86_64_msvc-0.36.1.crate) = 661999 bytes -SHA1 (patch-pyproject.toml) = 17b353454d7f414b1734e92151f757ee98c98983 +SHA1 (patch-pyproject.toml) = e68359fcba1838bb4ade8cd0ede23c9e3daf27d2 SHA1 (patch-synapse_handlers_room.py) = 1bb7740b5a8385f5d0ca9c1e8c38d41a8e594473 Index: pkgsrc/chat/matrix-synapse/patches/patch-pyproject.toml diff -u pkgsrc/chat/matrix-synapse/patches/patch-pyproject.toml:1.4 pkgsrc/chat/matrix-synapse/patches/patch-pyproject.toml:1.5 --- pkgsrc/chat/matrix-synapse/patches/patch-pyproject.toml:1.4 Fri Oct 28 19:19:36 2022 +++ pkgsrc/chat/matrix-synapse/patches/patch-pyproject.toml Sun Mar 12 11:40:10 2023 @@ -1,12 +1,25 @@ -$NetBSD: patch-pyproject.toml,v 1.4 2022/10/28 19:19:36 gdt Exp $ +$NetBSD: patch-pyproject.toml,v 1.5 2023/03/12 11:40:10 js Exp $ Patch out cryptography check: It doesn't need a version this high and it was added by upstream as an ugly hack to force a patched OpenSSL, in case it is linked statically. ---- pyproject.toml.orig 2022-09-27 11:34:31.000000000 +0000 +Patch out frozendict: It works perfectly fine with 2.3.5, just not on their CI. + +--- pyproject.toml.orig 2023-02-28 16:57:09.000000000 +0000 +++ pyproject.toml -@@ -162,7 +162,7 @@ bleach = ">=1.4.3" +@@ -154,9 +154,7 @@ python = "^3.7.1" + # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0 + 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,!=2.1.2" + # 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 +197,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. --_----------=_1678621210288320--