Attachment #233401 for bug #263430





PORTNAME=	matrix-synapse
DISTVERSIONPREFIX=	v
DISTVERSION=	1.57.1
CATEGORIES=	net-im python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


		${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} \

		${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}idna>=2.5:dns/py-idna@${PY_FLAVOR}

USES=		python:3.7+
USE_GITHUB=	yes

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 <bsd.port.pre.mk>

# 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

do-test:
	cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)b/net-im/py-matrix-synapse/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1649590803	1	TIMESTAMP = 1650652816
2	SHA256 (matrix-org-synapse-v1.56.0_GH0.tar.gz) = 7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373	2	SHA256 (matrix-org-synapse-v1.57.1_GH0.tar.gz) = 07926e1601bd2973ea16baabd41268939ceeb90f6a8c98b31a3610de61dc5ad1
3	SIZE (matrix-org-synapse-v1.56.0_GH0.tar.gz) = 7750479	3	SIZE (matrix-org-synapse-v1.57.1_GH0.tar.gz) = 7834623




--- synapse/python_dependencies.py.orig	2022-04-20 00:17:17 UTC
+++ synapse/python_dependencies.py
@@ -82,7 +82,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 = [
     "typing-extensions>=3.10.0",
     # We enforce that we have a `cryptography` version that bundles an `openssl`
     # with the latest security patches.
- 

Return to bug 263430

Lines 2-8 Link Here

(-)b/net-im/py-matrix-synapse/Makefile (-4 / +11 lines)
2		2
3	PORTNAME= matrix-synapse	3	PORTNAME= matrix-synapse
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 1.56.0	5	DISTVERSION= 1.57.1
6	CATEGORIES= net-im python	6	CATEGORIES= net-im python
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
8		8
Lines 19-25 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_F Link Here
19	${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.4.0:devel/py-canonicaljson@${PY_FLAVOR} \	19	${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.4.0:devel/py-canonicaljson@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}signedjson>=1.1.0:security/py-signedjson@${PY_FLAVOR} \	20	${PYTHON_PKGNAMEPREFIX}signedjson>=1.1.0:security/py-signedjson@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}pynacl>=1.2.1:security/py-pynacl@${PY_FLAVOR} \	21	${PYTHON_PKGNAMEPREFIX}pynacl>=1.2.1:security/py-pynacl@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}service_identity>=18.1.0:security/py-service_identity@${PY_FLAVOR} \	22	${PYTHON_PKGNAMEPREFIX}service_identity>=18.1.0:security/py-service_identity@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}twisted>=18.9.0:devel/py-twisted@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}twisted>=18.9.0:devel/py-twisted@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}treq>=15.1:www/py-treq@${PY_FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}treq>=15.1:www/py-treq@${PY_FLAVOR} \
Lines 50-56 TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_F Link Here
50	${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR} \	49	${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR} \
51	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \	50	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
52	${PYTHON_PKGNAMEPREFIX}parameterized>=0.7.0:devel/py-parameterized@${PY_FLAVOR} \	51	${PYTHON_PKGNAMEPREFIX}parameterized>=0.7.0:devel/py-parameterized@${PY_FLAVOR} \
53	${PYTHON_PKGNAMEPREFIX}authlib>=0.14.0:security/py-authlib@${PY_FLAVOR}	52	${PYTHON_PKGNAMEPREFIX}authlib>=0.14.0:security/py-authlib@${PY_FLAVOR} \
		53	${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR}
54		54
55	USES= python:3.7+	55	USES= python:3.7+
56	USE_GITHUB= yes	56	USE_GITHUB= yes
Lines 89-94 REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_F Link Here
89	SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}	89	SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
90	URLPREVIEW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.2.0:devel/py-lxml@${PY_FLAVOR}	90	URLPREVIEW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.2.0:devel/py-lxml@${PY_FLAVOR}
91		91
		92	.include <bsd.port.pre.mk>
		93
		94	# Dependency required by Python < 3.8
		95	.if (${PYTHON_REL} < 30800)
		96	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=1.4:devel/py-importlib-metadata@${PY_FLAVOR}
		97	.endif
		98
92	post-install:	99	post-install:
93	${MKDIR} ${STAGEDIR}${ETCDIR}	100	${MKDIR} ${STAGEDIR}${ETCDIR}
94	${INSTALL_DATA} ${WRKDIR}/log.config ${STAGEDIR}${ETCDIR}/log.config.sample	101	${INSTALL_DATA} ${WRKDIR}/log.config ${STAGEDIR}${ETCDIR}/log.config.sample
Lines 100-103 post-install-DOCS-on: Link Here
100	do-test:	107	do-test:
101	cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests	108	cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests
102		109
103	.include <bsd.port.mk>	110	.include <bsd.port.post.mk>

Lines 1-15 Link Here

(-)b/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py (-12 / +2 lines)
1	--- synapse/python_dependencies.py.orig 2022-04-12 08:11:46 UTC	1	--- synapse/python_dependencies.py.orig 2022-04-20 00:17:17 UTC
2	+++ synapse/python_dependencies.py	2	+++ synapse/python_dependencies.py
3	@@ -48,7 +48,7 @@ REQUIREMENTS = [	3	@@ -82,7 +82,7 @@ REQUIREMENTS = [
4	"unpaddedbase64>=1.1.0",
5	"canonicaljson>=1.4.0",
6	# we use the type definitions added in signedjson 1.1.
7	- "signedjson>=1.1.0,<=1.1.1",
8	+ "signedjson>=1.1.0",
9	"pynacl>=1.2.1",
10	"idna>=2.5",
11	# validating SSL certs for IP addresses requires service_identity 18.1.
12	@@ -83,7 +83,7 @@ REQUIREMENTS = [
13	"typing-extensions>=3.10.0",	4	"typing-extensions>=3.10.0",
14	# We enforce that we have a `cryptography` version that bundles an `openssl`	5	# We enforce that we have a `cryptography` version that bundles an `openssl`
15	# with the latest security patches.	6	# with the latest security patches.
16	-