From nobody Wed Jun 29 04:29:46 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 41F4E8614B9; Wed, 29 Jun 2022 04:29:47 +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 4LXpQf5yzTz3MVN; Wed, 29 Jun 2022 04:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656476987; 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=bl4IJvn/JdGK98ONt8DOidN56sX+PN+8CTBUse2vn+A=; b=I1U9qtOrZdUODkyaHlwAhX+XMZpb+kRy9EeNTAAIbFtuTbPUdA/owplH8zAj9qMVh0QjGA XD9ncMEkfZvmUX3dwAICOWUivvtH8Bge9UUyq3u99s7HjeSR71fAe5pxK80sZOJ9+d20Qx hY0J5D+9P4zEc4bQtEDqQcClfl764PkbP9nxfEkj4oK/cIxzSxYl6w5wdOu7fYr2fXL+Vj iIFaZJPt4atKma6O66XmnbsWD87+yuQybj8434vGQa0tIKXRtslN1UsHYq119nnu0e0GKm Bx+TD5onob+pWAph0XdX2s5Ug+YIi2dd5bpbCYw7jYMCnnMl03JBPhHj+KkRDg== 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 7C6862936; Wed, 29 Jun 2022 04:29:46 +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 25T4TkGm091252; Wed, 29 Jun 2022 04:29:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25T4TkDj091251; Wed, 29 Jun 2022 04:29:46 GMT (envelope-from git) Date: Wed, 29 Jun 2022 04:29:46 GMT Message-Id: <202206290429.25T4TkDj091251@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: 46b9a76d82a0 - 2022Q2 - net-im/py-matrix-synapse: Update to 1.61.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: 46b9a76d82a03461de14551e9cdd89ce784ce409 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656476987; 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=bl4IJvn/JdGK98ONt8DOidN56sX+PN+8CTBUse2vn+A=; b=SfGzWiqdaXHakab81Z9+dxK1+27c5k2RKwaRHYfcYUshZKdbgIAGB7vn5V0TwfVzCELKEj yot9eFkVf/5pOUqA+G0MqRm1Bq9g4dAj2dCtP02bgpp9coEb4PsoWXFPHE2i5jJuqbHx6u yqEUfYDEIyFrElM+sSAR9IOMWZi9pAX5psZWMRt4AtrAx2lMCzyF1d+yYkHPMU4rrwqkzr TxwnHNIypsxZWPd1k12vCOuinXx+PuyBDI8DdDU2+VMQwq/7RcShkqXzjC/89BH1kDg0QS etTvehLM8xI8qrcWJscD+jdG/lZkFUNNWDUfAxPUotEj3YE689nJLg37WgIR0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656476987; a=rsa-sha256; cv=none; b=M/j8CN1wLJxgMyV4OHUpUAFl7hRGjltBeFSfuBBmUQx3qBoGOPVwRRnqcuBk+PXVuRfRRj 0lNalCJZYMmWHPatqOGngeuLeWmbSkQxReIMTQNJ2HMWJ16QyCXfBxm1Y4wHaSQxaMLAu2 GVc1EjcJXEUKaTzqtY30AP1XTU0kTyevEClfehSue9nUuX70olpvYk+Cgm2XkzsGGikr5/ NDFeRPBS4MTEXjSZyqf4yi3rnNE9ZgCbnvhbBtAgYa6yrNShKyfAZBcPlvdRfgQXbOSYrZ +AKuK7pSiCVDCYNCeAjwJpHngLHysqlrfvsx2UQiXMHhqYNGtUVsJjpJXEO2IA== 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=46b9a76d82a03461de14551e9cdd89ce784ce409 commit 46b9a76d82a03461de14551e9cdd89ce784ce409 Author: Sascha Biberhofer AuthorDate: 2022-06-28 19:31:14 +0000 Commit: Ashish SHUKLA CommitDate: 2022-06-29 04:14:56 +0000 net-im/py-matrix-synapse: Update to 1.61.1 This minor update contains a security fix for GHSA-22p3-qrh9-cx32 / CVE-2022-31052. While we're at it, switch to pypi as package source. This not only follows general python port guidelines but also eliminates the need for poetry2setup, hopefully fixing #264178[0]. Changes: https://github.com/matrix-org/synapse/releases/tag/v1.61.1 Signed-off-by: Sascha Biberhofer PR: 264178 MFH: 2022Q2 Security: 07c0d782-f758-11ec-acaa-901b0e9408dc Security: CVE-2022-31052 (cherry picked from commit c4501a503083e9de1d8cfd936cfb244642884434) --- net-im/py-matrix-synapse/Makefile | 13 +++---------- net-im/py-matrix-synapse/distinfo | 6 +++--- net-im/py-matrix-synapse/files/patch-pyproject.toml | 6 +++--- net-im/py-matrix-synapse/files/patch-setup.py | 11 +++++++++++ 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index 23022e00f29b..7eb0f06b23d4 100644 --- a/net-im/py-matrix-synapse/Makefile +++ b/net-im/py-matrix-synapse/Makefile @@ -1,9 +1,9 @@ # Created by: Brendan Molloy PORTNAME= matrix-synapse -DISTVERSIONPREFIX= v -DISTVERSION= 1.61.0 +DISTVERSION= 1.61.1 CATEGORIES= net-im python +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@skyforge.at @@ -12,8 +12,7 @@ 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} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${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} \ @@ -55,9 +54,6 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_F ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} USES= python:3.7+ -USE_GITHUB= yes -GH_ACCOUNT= matrix-org -GH_PROJECT= synapse USE_PYTHON= autoplist distutils USE_RC_SUBR= synapse @@ -100,9 +96,6 @@ 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 501c3b5da815..562f51c4e70a 100644 --- a/net-im/py-matrix-synapse/distinfo +++ b/net-im/py-matrix-synapse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655316825 -SHA256 (matrix-org-synapse-v1.61.0_GH0.tar.gz) = 3602b4a01688edae8365973877220a0511cb3970ff4e32eec759ca070066a684 -SIZE (matrix-org-synapse-v1.61.0_GH0.tar.gz) = 7879924 +TIMESTAMP = 1656433422 +SHA256 (matrix-synapse-1.61.1.tar.gz) = 201ed822a996209331655156205e878205608e4092a24dd860cca457bda9e2eb +SIZE (matrix-synapse-1.61.1.tar.gz) = 2868292 diff --git a/net-im/py-matrix-synapse/files/patch-pyproject.toml b/net-im/py-matrix-synapse/files/patch-pyproject.toml index 903aba718c30..2d5031502396 100644 --- a/net-im/py-matrix-synapse/files/patch-pyproject.toml +++ b/net-im/py-matrix-synapse/files/patch-pyproject.toml @@ -1,7 +1,7 @@ ---- pyproject.toml.orig 2022-05-07 18:29:37 UTC +--- pyproject.toml.orig 2022-06-28 16:27:14 UTC +++ pyproject.toml -@@ -146,7 +146,7 @@ bleach = ">=1.4.3" - typing-extensions = ">=3.10.0" +@@ -147,7 +147,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. -cryptography = ">=3.4.7" diff --git a/net-im/py-matrix-synapse/files/patch-setup.py b/net-im/py-matrix-synapse/files/patch-setup.py new file mode 100644 index 000000000000..13c102222d1b --- /dev/null +++ b/net-im/py-matrix-synapse/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2022-06-28 16:27:08 UTC ++++ setup.py +@@ -147,7 +147,7 @@ install_requires = \ + 'bcrypt>=3.1.0', + 'bleach>=1.4.3', + 'canonicaljson>=1.4.0', +- 'cryptography>=3.4.7', ++ 'cryptography', + 'frozendict>=1,!=2.1.2', + 'ijson>=3.1.4', + 'jsonschema>=3.0.0',