From nobody Tue Jan 25 16:37:14 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 596AD19872BB; Tue, 25 Jan 2022 16:37: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 4JjsvZ25jWz4Yy8; Tue, 25 Jan 2022 16:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643128634; 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=Scy8rvYPBhdEeuRy0TmPWp9Xgc23ba3cnPG/B1rs5tk=; b=VB5Fs5RVBZJuiWRcGD3NfwAd6wNlkjdMJbE+FHCZhK8y5dwgNpCp4CCGH1lY7PAr5iBae0 IkTFOXC9mniBhODua4usKXjwBkzeHBgH9vdLp3KR99ejtXA5PpBQPUUEkZjU4RqsTBChTH qxM/G1XWfqPsu2xLrX5Y2yRCMnmxvLyTKuaYJue46xNTsZjO8PCwgUptow6/lcXM8tIPv/ zrPJIRezxrIpoaou/k90UNMSZ6B6+sMWOL9lW5B20fTJcrR35DbEVryyMRjo3SAvkLRyii 3jk2ps/I6T8TlttCfdPch3ZFDJZWqHzTTHf1Q5uqqMui6Lv7RCoSGxhUKCdxVw== 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 283015492; Tue, 25 Jan 2022 16:37:14 +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 20PGbEkO048261; Tue, 25 Jan 2022 16:37:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20PGbEYO048260; Tue, 25 Jan 2022 16:37:14 GMT (envelope-from git) Date: Tue, 25 Jan 2022 16:37:14 GMT Message-Id: <202201251637.20PGbEYO048260@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: 629197586cda - 2022Q1 - net-im/py-matrix-synapse: Unbreak the port 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 629197586cda1f5f9b5ae670605a93b03767a962 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643128634; 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=Scy8rvYPBhdEeuRy0TmPWp9Xgc23ba3cnPG/B1rs5tk=; b=u09ifN1WQ0Hio6jqG5D4FhBCwn1D/Ft7C2JaMvEd4XlzAlVQnhRAs7DhxMz/fYtJuHmmJz 8NNCne4IQk2s/DdCvNUZ0yulQ3v230vvmh+/hRea/gp+q0qR/VZhoecaSCBTObS7saihIQ M4lXaEs7u+n3CBcAZvCpUM6hNWrvQpQBUgVNGZxuj4jJccdM622MZ6bU2OG49Fo3iTnqJg oz+IpUV0fdp3CWygiLpTYhSFvff5FBa+NyPYcziIxBJyJXY6N7vXg+hrYFcG57cG9qTy8g L3smWU3CV9IXARayyHU3TJVrA/TPii6ex309IwlerhTrKDIGcb/X3bS5NMsmGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643128634; a=rsa-sha256; cv=none; b=OPwiHM1WvtHVH4xGi+9qvcdTlpZYvAylyOMWAdRXQDGoxcqnuAyJuzXCjjVxgVfnOYOXZ/ xfL4Jye6Hcm+r3qjaHHy9YrWokjG0ToIpm/7IrYjcYcAa8KvXXJZZ78gaKxyXoNYTKBvuz Fuv25jISXwokDbBqUgb90BI1owN2uOBvsqqOIClb2rKY7qIfvsOXFmLNVREY34r/6ZpT5O fCnp6pj1TZehM+jo4415reEuJ0bUl/nDHUVtk4lesKVMC5r+8INCSc9BKl5V0u4c/O/+dJ jnFcc+7h3uNNFteOQpUM3oAngZ2vubqFnd3x0LhSN5uZUwFT7UqdzEVWdsq85w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=629197586cda1f5f9b5ae670605a93b03767a962 commit 629197586cda1f5f9b5ae670605a93b03767a962 Author: Sascha Biberhofer AuthorDate: 2022-01-18 17:37:18 +0000 Commit: Ashish SHUKLA CommitDate: 2022-01-25 16:35:37 +0000 net-im/py-matrix-synapse: Unbreak the port - Remove the dependency constraint added by upstream for problem on Debian GNU/Linux, which does not occur on FreeBSD This commit resolves a merge conflict due to skipping 0290f284f. PR: 261232 (cherry picked from commit e51b5b86095bdb962b05f3c1e504fb33a91d5c96) --- net-im/py-matrix-synapse/Makefile | 1 + .../files/patch-synapse_python__dependencies.py | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index e28b239c4b16..f16b9ac29219 100644 --- a/net-im/py-matrix-synapse/Makefile +++ b/net-im/py-matrix-synapse/Makefile @@ -3,6 +3,7 @@ PORTNAME= matrix-synapse DISTVERSIONPREFIX= v DISTVERSION= 1.49.2 +PORTREVISION= 2 CATEGORIES= net-im python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} 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 index 4b3041fc7432..808f68974615 100644 --- a/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py +++ b/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py @@ -1,6 +1,15 @@ ---- synapse/python_dependencies.py.orig 2021-12-17 15:03:44 UTC +--- synapse/python_dependencies.py.orig 2022-01-15 14:42:17 UTC +++ synapse/python_dependencies.py -@@ -85,7 +85,7 @@ REQUIREMENTS = [ +@@ -51,7 +51,7 @@ REQUIREMENTS = [ + # 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 +- "frozendict>=1,<2.1.2", ++ "frozendict>=1", + "unpaddedbase64>=1.1.0", + "canonicaljson>=1.4.0", + # we use the type definitions added in signedjson 1.1. +@@ -86,7 +86,7 @@ REQUIREMENTS = [ "typing-extensions>=3.7.4", # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches.