diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index 7eb0f06b23d4..4d4eef254676 100644 --- a/net-im/py-matrix-synapse/Makefile +++ b/net-im/py-matrix-synapse/Makefile @@ -1,110 +1,110 @@ # Created by: Brendan Molloy PORTNAME= matrix-synapse -DISTVERSION= 1.61.1 +DISTVERSION= 1.62.0 CATEGORIES= net-im python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@skyforge.at 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} # 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} \ ${PYTHON_PKGNAMEPREFIX}frozendict>=1:devel/py-frozendict@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=2.1.0:devel/py-unpaddedbase64@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.4.0:devel/py-canonicaljson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}signedjson>=1.1.0:security/py-signedjson@${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}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.7:devel/py-pyasn1-modules@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.0:security/py-bcrypt@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysaml2>=4.5.0:security/py-pysaml2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymacaroons>=0.13.0:security/py-pymacaroons@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.2:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.4.0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.3:www/py-bleach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.10.0.1:devel/py-typing-extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ijson>=3.1.4:devel/py-ijson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=16.1:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}matrix-common>=1.1.0:devel/py-matrix-common@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matrix-common>=1.2.1: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}parameterized>=0.7.4: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_PYTHON= autoplist distutils USE_RC_SUBR= synapse NO_ARCH= yes SUB_FILES= pkg-message log.config SUB_LIST= PYTHON_CMD=${PYTHON_CMD} DBDIR=${DBDIR} LOGDIR=${LOGDIR} PIDDIR=${PIDDIR} USERS=${USERS} USERS= synapse GROUPS= synapse DBDIR?= /var/db/${PORTNAME} LOGDIR?= /var/log/${PORTNAME} PIDDIR?= /var/run/${PORTNAME} PLIST_FILES= "@sample ${ETCDIR}/log.config.sample" DOCS= README.rst UPGRADE.rst CHANGES.md docs/postgres.md PORTDOCS= ${DOCS:T} OPTIONS_DEFINE= DOCS JWT LDAP OIDC PGSQL REDIS SQLITE URLPREVIEW OPTIONS_DEFAULT= PGSQL SQLITE JWT_DESC= Add dependencies for JSON web tokens OIDC_DESC= Add dependencies for OpenID Connect based logins REDIS_DESC= Add support replication over Redis for synapse workers URLPREVIEW_DESC= Add dependencies necessary for URL previews -JWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.6.4:www/py-pyjwt@${PY_FLAVOR} +JWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authlib>=0.14.0:security/py-authlib@${PY_FLAVOR} LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3@${PY_FLAVOR} OIDC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authlib>=0.14.0:security/py-authlib@${PY_FLAVOR} PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>2.8:databases/py-psycopg2@${PY_FLAVOR} REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}txredisapi>=1.4.7:databases/py-txredisapi@${PY_FLAVOR} 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 post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} do-test: cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests .include diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo index 562f51c4e70a..3f43603edeb9 100644 --- a/net-im/py-matrix-synapse/distinfo +++ b/net-im/py-matrix-synapse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656433422 -SHA256 (matrix-synapse-1.61.1.tar.gz) = 201ed822a996209331655156205e878205608e4092a24dd860cca457bda9e2eb -SIZE (matrix-synapse-1.61.1.tar.gz) = 2868292 +TIMESTAMP = 1657036187 +SHA256 (matrix-synapse-1.62.0.tar.gz) = d786873b5dc509412ade9c0b503beb2356aeea2f16ca485ce5de42ded2e91378 +SIZE (matrix-synapse-1.62.0.tar.gz) = 2827065 diff --git a/net-im/py-matrix-synapse/files/patch-setup.py b/net-im/py-matrix-synapse/files/patch-setup.py index 13c102222d1b..a9f7cf8e5473 100644 --- a/net-im/py-matrix-synapse/files/patch-setup.py +++ b/net-im/py-matrix-synapse/files/patch-setup.py @@ -1,11 +1,11 @@ ---- setup.py.orig 2022-06-28 16:27:08 UTC +--- setup.py.orig 2022-07-05 15:51:27 UTC +++ setup.py -@@ -147,7 +147,7 @@ install_requires = \ +@@ -149,7 +149,7 @@ install_requires = \ 'bcrypt>=3.1.0', 'bleach>=1.4.3', - 'canonicaljson>=1.4.0', + 'canonicaljson>=1.4.0,<2.0.0', - 'cryptography>=3.4.7', + 'cryptography', 'frozendict>=1,!=2.1.2', 'ijson>=3.1.4', 'jsonschema>=3.0.0',