Attachment 231284 Details for Bug 261430 – MFH patches

[patch] MFH patches

py-matrix-synapse.patch (text/plain), 9.55 KB, created by Ashish SHUKLA on 2022-01-24 19:05:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish SHUKLA

Created: 2022-01-24 19:05:05 UTC

Size: 9.55 KB

patch

obsolete

>From 66e492b245758530f5763ca01400f75818ef1422 Mon Sep 17 00:00:00 2001
>From: Sascha Biberhofer <ports@skyforge.at>
>Date: Tue, 18 Jan 2022 17:37:18 +0000
>Subject: [PATCH 1/4] 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.
>-- 
>2.33.1
>
>
>From addb6e1dbe0d45c9a70a244a0e708f57a76d4eca Mon Sep 17 00:00:00 2001
>From: Sascha Biberhofer <ports@skyforge.at>
>Date: Thu, 20 Jan 2022 07:49:53 +0000
>Subject: [PATCH 2/4] devel/py-matrix-common: New port: Common utilities for
> Synapse, et. al.
>
>PR:		261337
>(cherry picked from commit 26df673e02f21c0243c50147fb099db5197aea4a)
>---
> devel/Makefile                        |  1 +
> devel/py-matrix-common/Makefile       | 31 +++++++++++++++++++++++++++
> devel/py-matrix-common/distinfo       |  3 +++
> devel/py-matrix-common/files/setup.py |  3 +++
> devel/py-matrix-common/pkg-descr      |  3 +++
> 5 files changed, 41 insertions(+)
> create mode 100644 devel/py-matrix-common/Makefile
> create mode 100644 devel/py-matrix-common/distinfo
> create mode 100644 devel/py-matrix-common/files/setup.py
> create mode 100644 devel/py-matrix-common/pkg-descr
>
>diff --git a/devel/Makefile b/devel/Makefile
>index d95acafacef5..d5ac4d4b1745 100644
>--- a/devel/Makefile
>+++ b/devel/Makefile
>@@ -4766,6 +4766,7 @@
>     SUBDIR += py-marshmallow
>     SUBDIR += py-marshmallow-enum
>     SUBDIR += py-matrix-angular-sdk
>+    SUBDIR += py-matrix-common
>     SUBDIR += py-maturin
>     SUBDIR += py-mccabe
>     SUBDIR += py-mdv
>diff --git a/devel/py-matrix-common/Makefile b/devel/py-matrix-common/Makefile
>new file mode 100644
>index 000000000000..19f1037eea11
>--- /dev/null
>+++ b/devel/py-matrix-common/Makefile
>@@ -0,0 +1,31 @@
>+PORTNAME=	matrix-common
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	1.0.0
>+CATEGORIES=	devel python
>+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>+
>+MAINTAINER=	ports@skyforge.at
>+COMMENT=	Common utilities for Synapse, Sydent and Sygnal
>+
>+LICENSE=	APACHE20
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>19.2.0:devel/py-attrs@${PY_FLAVOR}
>+
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=18.9.0:devel/py-twisted@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR}
>+
>+USES=		python:3.6+
>+USE_PYTHON=	autoplist concurrent distutils
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	matrix-org
>+GH_PROJECT=	matrix-python-common
>+NO_ARCH=	yes
>+
>+post-extract:
>+	@${CP} ${FILESDIR}/setup.py ${WRKSRC}/
>+
>+do-test:
>+	cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests
>+
>+.include <bsd.port.mk>
>diff --git a/devel/py-matrix-common/distinfo b/devel/py-matrix-common/distinfo
>new file mode 100644
>index 000000000000..062201292092
>--- /dev/null
>+++ b/devel/py-matrix-common/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1642580067
>+SHA256 (matrix-org-matrix-python-common-v1.0.0_GH0.tar.gz) = d610357a78caf5141814f055e8b3facabf4dd4863db8594030d58c81b2b2b7fd
>+SIZE (matrix-org-matrix-python-common-v1.0.0_GH0.tar.gz) = 8535
>diff --git a/devel/py-matrix-common/files/setup.py b/devel/py-matrix-common/files/setup.py
>new file mode 100644
>index 000000000000..606849326a40
>--- /dev/null
>+++ b/devel/py-matrix-common/files/setup.py
>@@ -0,0 +1,3 @@
>+from setuptools import setup
>+
>+setup()
>diff --git a/devel/py-matrix-common/pkg-descr b/devel/py-matrix-common/pkg-descr
>new file mode 100644
>index 000000000000..2b128f5779c2
>--- /dev/null
>+++ b/devel/py-matrix-common/pkg-descr
>@@ -0,0 +1,3 @@
>+Common utilities for Synapse, Sydent and Sygnal.
>+
>+WWW: https://www.matrix.org
>-- 
>2.33.1
>
>
>From 226c6bd855004435b150965a159c31209050dbc4 Mon Sep 17 00:00:00 2001
>From: Sascha Biberhofer <ports@skyforge.at>
>Date: Thu, 20 Jan 2022 13:40:20 +0000
>Subject: [PATCH 3/4] net-im/py-matrix-synapse: Update to 1.150.1
>
>- Updated USES to python:3.7+ since upstream has removed python 3.6
>  from the supported python versions
>- Removed the test dependency on py-mock in sync with upstream
>  requirements
>- Added a new dependency on devel/py-matrix-common, a new port that
>  provides code shared by most matrix.org projects, inlcuding synapse
>
>PR:		260502
>(cherry picked from commit c54c79c82dce9c97dc4bab972e15a6d4dd3b744a)
>---
> net-im/py-matrix-synapse/Makefile | 7 +++----
> net-im/py-matrix-synapse/distinfo | 6 +++---
> 2 files changed, 6 insertions(+), 7 deletions(-)
>
>diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
>index f16b9ac29219..96581db08724 100644
>--- a/net-im/py-matrix-synapse/Makefile
>+++ b/net-im/py-matrix-synapse/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	matrix-synapse
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.49.2
>-PORTREVISION=	2
>+DISTVERSION=	1.50.1
> CATEGORIES=	net-im python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -43,16 +42,16 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_F
> 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}ijson>=3.1:devel/py-ijson@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pyjwt1>=1.7.0:www/py-pyjwt1@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}matrix-common>=1.0.0:devel/py-matrix-common@${PY_FLAVOR} \
> 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
> 
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}mock>=4.0.0:devel/py-mock@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}parameterized>=0.7.0:devel/py-parameterized@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}authlib>=0.14.0:security/py-authlib@${PY_FLAVOR}
> 
>-USES=		python:3.6+
>+USES=		python:3.7+
> USE_GITHUB=	yes
> GH_ACCOUNT=	matrix-org
> GH_PROJECT=	synapse
>diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo
>index 296c3a13e3c7..8f98f7927e58 100644
>--- a/net-im/py-matrix-synapse/distinfo
>+++ b/net-im/py-matrix-synapse/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1640158042
>-SHA256 (matrix-org-synapse-v1.49.2_GH0.tar.gz) = f5b0017e9d77db94fac853fbefbcb4538d879cb80f404b02003930c76f5cafab
>-SIZE (matrix-org-synapse-v1.49.2_GH0.tar.gz) = 7637609
>+TIMESTAMP = 1642580433
>+SHA256 (matrix-org-synapse-v1.50.1_GH0.tar.gz) = cc35b442a4356cf85b2bc4d140d2de0d3b92bcc9176adc1526a46798b3569c86
>+SIZE (matrix-org-synapse-v1.50.1_GH0.tar.gz) = 7654238
>-- 
>2.33.1
>
>
>From d66cb287207271a3e9d7391ec453b5cfcc43e1c9 Mon Sep 17 00:00:00 2001
>From: Ashish SHUKLA <ashish@FreeBSD.org>
>Date: Mon, 24 Jan 2022 15:36:14 +0000
>Subject: [PATCH 4/4] net-im/py-matrix-synapse: Update to 1.50.2
>
>PR:		261430
>Approved by:	Sascha Biberhofer <ports at skyforge dot at> (maintainer)
>MFH:		2022Q1
>
>(cherry picked from commit 0d1d216c839f0f2159ac9b27edfa5d0eb78dad23)
>---
> net-im/py-matrix-synapse/Makefile | 2 +-
> net-im/py-matrix-synapse/distinfo | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
>index 96581db08724..724acc3aa96d 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.50.1
>+DISTVERSION=	1.50.2
> CATEGORIES=	net-im python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo
>index 8f98f7927e58..beb18ea46f56 100644
>--- a/net-im/py-matrix-synapse/distinfo
>+++ b/net-im/py-matrix-synapse/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1642580433
>-SHA256 (matrix-org-synapse-v1.50.1_GH0.tar.gz) = cc35b442a4356cf85b2bc4d140d2de0d3b92bcc9176adc1526a46798b3569c86
>-SIZE (matrix-org-synapse-v1.50.1_GH0.tar.gz) = 7654238
>+TIMESTAMP = 1643038555
>+SHA256 (matrix-org-synapse-v1.50.2_GH0.tar.gz) = 0e8f52d8a14c5994addda13332c67c6cb8604d090be0dc8f459645f6d1fb48cb
>+SIZE (matrix-org-synapse-v1.50.2_GH0.tar.gz) = 7654063
>-- 
>2.33.1
>

Flags:

ashish: maintainer-approval? (ports)

Actions: View | Diff

Attachments on bug 261430: 231274 | 231284