Index: branches/2020Q4/net-im/py-matrix-synapse/Makefile =================================================================== --- branches/2020Q4/net-im/py-matrix-synapse/Makefile (revision 552600) +++ branches/2020Q4/net-im/py-matrix-synapse/Makefile (revision 552601) @@ -1,106 +1,106 @@ # Created by: Brendan Molloy # $FreeBSD$ PORTNAME= matrix-synapse DISTVERSIONPREFIX= v -DISTVERSION= 1.19.3 +DISTVERSION= 1.21.2 CATEGORIES= net-im python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@skyforge.at COMMENT= Matrix protocol reference homeserver LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE # Keep the RUN_DEPENDS layout similar to the master/synapse/python_dependencies.py file RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}frozendict>=1:devel/py-frozendict@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.2.0:devel/py-canonicaljson@${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}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}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.2: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.2.0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.4.0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}attrs>19.1.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplejson>=3.10.0:devel/py-simplejson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.3:www/py-bleach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${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>=2.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} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.7.0:www/py-pyjwt@${PY_FLAVOR} USES= python:3.6+ USE_GITHUB= yes USE_PYTHON= autoplist distutils GH_ACCOUNT= matrix-org GH_PROJECT= synapse USE_RC_SUBR= synapse USERS= synapse GROUPS= synapse DBDIR?= /var/db/${PORTNAME} LOGDIR?= /var/log/${PORTNAME} PIDDIR?= /var/run/${PORTNAME} SUB_FILES= pkg-message log.config SUB_LIST= PYTHON_CMD=${PYTHON_CMD} DBDIR=${DBDIR} LOGDIR=${LOGDIR} PIDDIR=${PIDDIR} USERS=${USERS} PLIST_FILES= "@sample ${ETCDIR}/log.config.sample" DOCS=README.rst UPGRADE.rst CHANGES.md docs/postgres.md PORTDOCS=${DOCS:T} NO_ARCH= yes OPTIONS_DEFINE= LDAP PGSQL SQLITE URLPREVIEW OIDC REDIS DOCS OPTIONS_DEFAULT= SQLITE PGSQL DOCS URLPREVIEW_DESC= Add dependencies necessary for URL previews OIDC_DESC= Add dependencies for OpenID Connect based logins REDIS_DESC= Add support replication over Redis for synapse workers LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3@${PY_FLAVOR} PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>2.7:databases/py-psycopg2@${PY_FLAVOR} SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} URLPREVIEW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.5.0:devel/py-lxml@${PY_FLAVOR} OIDC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authlib>=0.14.0:security/py-authlib@${PY_FLAVOR} REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}txredisapi>=0:databases/py-txredisapi@${PY_FLAVOR} do-test: cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests 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} .include Index: branches/2020Q4/net-im/py-matrix-synapse/distinfo =================================================================== --- branches/2020Q4/net-im/py-matrix-synapse/distinfo (revision 552600) +++ branches/2020Q4/net-im/py-matrix-synapse/distinfo (revision 552601) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600536738 -SHA256 (matrix-org-synapse-v1.19.3_GH0.tar.gz) = 50573233efc56c2222e6de35ad7d2eeafe16af0c1dde0dc216c16d4737d47015 -SIZE (matrix-org-synapse-v1.19.3_GH0.tar.gz) = 6778524 +TIMESTAMP = 1602777544 +SHA256 (matrix-org-synapse-v1.21.2_GH0.tar.gz) = ec7073befcda697428c4d634c7a8637ea7d1b01639b3a943d72821ba8110a0bf +SIZE (matrix-org-synapse-v1.21.2_GH0.tar.gz) = 6930190 Index: branches/2020Q4/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py =================================================================== --- branches/2020Q4/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py (revision 552600) +++ branches/2020Q4/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py (revision 552601) @@ -1,11 +1,11 @@ ---- synapse/python_dependencies.py.orig 2020-07-15 20:12:36 UTC +--- synapse/python_dependencies.py.orig 2020-10-15 15:59:57 UTC +++ synapse/python_dependencies.py -@@ -66,7 +66,7 @@ REQUIREMENTS = [ - "pymacaroons>=0.13.0", - "msgpack>=0.5.2", - "phonenumbers>=8.2.0", -- "prometheus_client>=0.0.18,<0.9.0", -+ "prometheus_client>=0.0.18", - # we use attr.validators.deep_iterable, which arrived in 19.1.0 - "attrs>=19.1.0", - "netaddr>=0.7.18", +@@ -72,7 +72,7 @@ REQUIREMENTS = [ + # prom-client has a history of breaking backwards compatibility between + # minor versions (https://github.com/prometheus/client_python/issues/317), + # so we also pin the minor version. +- "prometheus_client>=0.4.0,<0.9.0", ++ "prometheus_client>=0.4.0", + # we use attr.validators.deep_iterable, which arrived in 19.1.0 (Note: + # Fedora 31 only has 19.1, so if we want to upgrade we should wait until 33 + # is out in November.) Index: branches/2020Q4 =================================================================== --- branches/2020Q4 (revision 552600) +++ branches/2020Q4 (revision 552601) Property changes on: branches/2020Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r552582