From nobody Wed Jun 29 04:29:40 2022 X-Original-To: dev-commits-ports-all@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 35C328612D1; Wed, 29 Jun 2022 04:29:41 +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 4LXpQY07sPz3MdK; Wed, 29 Jun 2022 04:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656476981; 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=AZCcFJeVXy4vbjB/lBq5BSmGLW8jxsnqPg3OfMZ3d18=; b=tv0JyKGR09wMHjZbAvk7ryiaJ59CYFwLr3WCVV+SHFjqpJIPbCuuV2Vrb6eKHHHmbOgToT VBnBK6eX7f+1+ih4uzxjiVAubUsrk0nEtoF2mncCF5mgQTMe+ZnZfC8rkkZ1YpXmjCoROB zJ7DneTk17Tv7LuxCO8z6JMRUgOCFePy8UDmCRlvmyMi205LQI2Jd2F9nOANNXrUfae7tQ bSxYppBPOSwBYkAYSrChcP8lEQSberYgwFFOJwzwOtXSRSssM0R3EtwCiKxDkxyJAgCojV HG+QzqTfC1K8th/vjFnrImYBRoMoUAKAaZI2FF4VAtrXMorf7IYXtzAdpi16sg== 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 D028A2AD1; Wed, 29 Jun 2022 04:29:40 +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 25T4Tet4091125; Wed, 29 Jun 2022 04:29:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25T4TeRF091124; Wed, 29 Jun 2022 04:29:40 GMT (envelope-from git) Date: Wed, 29 Jun 2022 04:29:40 GMT Message-Id: <202206290429.25T4TeRF091124@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: 1a2fd6e26193 - 2022Q2 - net-im/py-matrix-synapse: Update to 1.57.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 1a2fd6e261937fd489ecbdf5100f10eca4d33bd9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656476981; 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=AZCcFJeVXy4vbjB/lBq5BSmGLW8jxsnqPg3OfMZ3d18=; b=swKSaMfw3sotU58BojzrPCuDmCtGrbrTygMJMg+0NZ74UTTBuRjAxiC+rpEwVnokea33// HTqlzH3vMu85vHd7GFFDOTMnFviT67fT1qU/t8H7BKdWD6XxgEGD6zc5jeW9dYEltBBNUd SMBIQ+3KnykaHDbfQxdKN1FiBq5yFsL63MtpcTxzJhZgL6zFFo7sDJ+fcPEjUntiekXdtS bLwKd2H9Td9JWKV0M0pBsMxKVbjStMzrlN9Aqduoit5q4AuvBZriEBhVogVEpduGneLkZY T7Nj+709ve/kyZcW0HATb65mNxFUj71Jc2SQ9YXG24ffzuiSSI1i3CTRR9xlAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656476981; a=rsa-sha256; cv=none; b=PFzEu27mK8V13rFTWf05E4q6+Px2suedHeZWSuGab3peZW09soolV9j+bHs4HilQ2/e13T WVyRyELeDUudk7EGl8B+jvh3KLadM6nvg+G+eQWGlNS4hT/4pMY4b5r8lWNRgP2Z8UozBf hSAAoNPR0IIHv344DgD32mZ3LOlgx308yqPqJ525kHUq+iVEt3fuY9VwDNSCZQwtSRgQ9y hGVh9oDymzOMk/PwjQEYu8xgt5tk19ruA6JU/ROMSMFtQWyfHzb7WCFFaB5dYQ4X6d8mkT DIg1UDNDU/ysrL7AOtZfGje0Ce7YaL+Af7TGsQ7GQlkgiV7sfYF9gQbdHY73XQ== 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=1a2fd6e261937fd489ecbdf5100f10eca4d33bd9 commit 1a2fd6e261937fd489ecbdf5100f10eca4d33bd9 Author: Ashish SHUKLA AuthorDate: 2022-04-20 00:25:26 +0000 Commit: Ashish SHUKLA CommitDate: 2022-06-29 04:12:57 +0000 net-im/py-matrix-synapse: Update to 1.57.1 - Move py-idna dependency to TEST_DEPENDS - Add a dependency for Python < 3.8 PR: 263430 Approved by: Sascha Biberhofer (maintainer) (cherry picked from commit 45f1b936769d8038de890dda01ce7986a94bbbe6) --- net-im/py-matrix-synapse/Makefile | 15 +++++++++++---- net-im/py-matrix-synapse/distinfo | 6 +++--- .../files/patch-synapse_python__dependencies.py | 13 ++----------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index e8df48627d0e..47fbe7aba7a2 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.56.0 +DISTVERSION= 1.57.1 CATEGORIES= net-im python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,7 +19,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_F ${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} \ - ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}service_identity>=18.1.0:security/py-service_identity@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=18.9.0:devel/py-twisted@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}treq>=15.1:www/py-treq@${PY_FLAVOR} \ @@ -50,7 +49,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_F ${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parameterized>=0.7.0:devel/py-parameterized@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}authlib>=0.14.0:security/py-authlib@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}authlib>=0.14.0:security/py-authlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} USES= python:3.7+ USE_GITHUB= yes @@ -89,6 +89,13 @@ REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_F SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} URLPREVIEW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.2.0:devel/py-lxml@${PY_FLAVOR} +.include + +# Dependency required by Python < 3.8 +.if (${PYTHON_REL} < 30800) +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.4:devel/py-importlib-metadata@${PY_FLAVOR} +.endif + post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/log.config ${STAGEDIR}${ETCDIR}/log.config.sample @@ -100,4 +107,4 @@ post-install-DOCS-on: do-test: cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests -.include +.include diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo index 8bc7e3151a6f..d0ba9224cbf1 100644 --- a/net-im/py-matrix-synapse/distinfo +++ b/net-im/py-matrix-synapse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649590803 -SHA256 (matrix-org-synapse-v1.56.0_GH0.tar.gz) = 7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373 -SIZE (matrix-org-synapse-v1.56.0_GH0.tar.gz) = 7750479 +TIMESTAMP = 1650652816 +SHA256 (matrix-org-synapse-v1.57.1_GH0.tar.gz) = 07926e1601bd2973ea16baabd41268939ceeb90f6a8c98b31a3610de61dc5ad1 +SIZE (matrix-org-synapse-v1.57.1_GH0.tar.gz) = 7834623 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 7feafa7bbf66..2cace56065f0 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,15 +1,6 @@ ---- synapse/python_dependencies.py.orig 2022-04-12 08:11:46 UTC +--- synapse/python_dependencies.py.orig 2022-04-20 00:17:17 UTC +++ synapse/python_dependencies.py -@@ -48,7 +48,7 @@ REQUIREMENTS = [ - "unpaddedbase64>=1.1.0", - "canonicaljson>=1.4.0", - # we use the type definitions added in signedjson 1.1. -- "signedjson>=1.1.0,<=1.1.1", -+ "signedjson>=1.1.0", - "pynacl>=1.2.1", - "idna>=2.5", - # validating SSL certs for IP addresses requires service_identity 18.1. -@@ -83,7 +83,7 @@ REQUIREMENTS = [ +@@ -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.