MFH: r507532
net-im/py-matrix-synapse: Update to 1.2.1 * Remove the EMAIL option and convert the dependencies of it as general runtime requirements. While I'm here: * Remove superfluous occurrences of "+=" from PLIST_SUB, SUB_LIST and the *_RUN_DEPENDS option helpers because there are no previous definitions of those variables. * Remove workaround for devel/py-msgpack from the post-patch target that is no longer required. * Do some cleanup and place variables to their intended locations. Changelog: * Note: The support for Python 2.7 was dropped with the 1.1.0 release! https://github.com/matrix-org/synapse/releases/tag/v1.2.1 PR: 239013 Submitted by: Sascha Biberhofer <ports@skyforge.at> (maintainer) Security: 38d2df4d-b143-11e9-87e7-901b0e934d69 Approved by: ports-secteam (miwi)
This commit is contained in:
Kai Knoblich
parent
eefe041323
commit
affa22d610
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/branches/2019Q3/; revision=507559
11
UPDATING
11
UPDATING
@ -6,6 +6,17 @@ You should get into the habit of checking this file for changes each time
|
||||
you update your ports collection, before attempting any port upgrades.
|
||||
|
||||
|
||||
20190728:
|
||||
AFFECTS: users of net-im/py-matrix-synapse
|
||||
AUTHOR: kai@FreeBSD.org
|
||||
|
||||
The support for Python 2.7 has been dropped with the 1.1.0 release of
|
||||
net/py-matrix-synapse.
|
||||
|
||||
Users that still use the Python 2.7 version of net-im/py-matrix-synapse
|
||||
should switch to a newer Python version, e.g. 3.6, which is the default
|
||||
Python version since April 2019.
|
||||
|
||||
20190701:
|
||||
AFFECTS: users of databases/mysql56-(server|client)
|
||||
AUTHOR: ale@FreeBSD.org
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME= matrix-synapse
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 0.99.5.2
|
||||
DISTVERSION= 1.2.1
|
||||
CATEGORIES= net-im python
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
||||
@ -20,7 +20,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_F
|
||||
${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.1.3:devel/py-canonicaljson@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}pynacl>=1.2.1:security/py-pynacl@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${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.7.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} \
|
||||
@ -32,15 +33,17 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_F
|
||||
${PYTHON_PKGNAMEPREFIX}pillow>=4.3.0:graphics/py-pillow@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}psutil>=2.0.0:sysutils/py-psutil@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}pysaml2>=4.5.2:security/py-pysaml2@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>=0.13.0:security/py-pymacaroons-pynacl@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.0:devel/py-msgpack@${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}six>=1.10:devel/py-six@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.2.0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}attrs>17.4.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} \
|
||||
${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
|
||||
|
||||
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_FLAVOR} \
|
||||
@ -48,7 +51,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_F
|
||||
${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}mock>=2.0:devel/py-mock@${PY_FLAVOR}
|
||||
|
||||
USES= python
|
||||
USES= python:3.5+
|
||||
USE_GITHUB= yes
|
||||
USE_PYTHON= autoplist distutils
|
||||
|
||||
@ -65,27 +68,22 @@ 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}
|
||||
SUB_LIST= PYTHON_CMD=${PYTHON_CMD} DBDIR=${DBDIR} LOGDIR=${LOGDIR} PIDDIR=${PIDDIR} USERS=${USERS}
|
||||
|
||||
PLIST_FILES+= "@sample ${ETCDIR}/log.config.sample"
|
||||
PLIST_FILES= "@sample ${ETCDIR}/log.config.sample"
|
||||
PORTDOCS=README.rst UPGRADE.rst CHANGES.md
|
||||
|
||||
NO_ARCH= yes
|
||||
|
||||
OPTIONS_DEFINE= EMAIL LDAP PGSQL SQLITE URLPREVIEW DOCS
|
||||
OPTIONS_DEFINE= LDAP PGSQL SQLITE URLPREVIEW DOCS
|
||||
OPTIONS_DEFAULT= SQLITE DOCS
|
||||
EMAIL_DESC= Email notifications for missed messages
|
||||
|
||||
URLPREVIEW_DESC= Add dependencies necessary for URL previews
|
||||
URLPREVIEW_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}lxml>=3.5.0:devel/py-lxml@${PY_FLAVOR}
|
||||
EMAIL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach@${PY_FLAVOR}
|
||||
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}
|
||||
|
||||
|
||||
PORTDOCS=README.rst UPGRADE.rst CHANGES.md
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|msgpack-python|msgpack|' ${WRKSRC}/synapse/python_dependencies.py
|
||||
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}
|
||||
|
||||
do-test:
|
||||
cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1559912139
|
||||
SHA256 (matrix-org-synapse-v0.99.5.2_GH0.tar.gz) = 0b820a1fbf81a4db2cd04f806f9a463dfcd8c0cd799701a4104e652431a6920b
|
||||
SIZE (matrix-org-synapse-v0.99.5.2_GH0.tar.gz) = 1277988
|
||||
TIMESTAMP = 1564141803
|
||||
SHA256 (matrix-org-synapse-v1.2.1_GH0.tar.gz) = 172f1b9930af5ebf4b56a85bbb24f5a19fdabaa863c846133ebb1b8496458302
|
||||
SIZE (matrix-org-synapse-v1.2.1_GH0.tar.gz) = 1371041
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- synapse/python_dependencies.py.orig 2019-02-14 17:20:02.000000000 +0000
|
||||
+++ synapse/python_dependencies.py 2019-02-28 20:31:10.838648000 +0000
|
||||
@@ -62,7 +62,7 @@
|
||||
--- synapse/python_dependencies.py.orig 2019-07-25 21:31:46.581498307 +0200
|
||||
+++ synapse/python_dependencies.py 2019-07-25 21:31:57.254468848 +0200
|
||||
@@ -65,7 +65,7 @@
|
||||
"msgpack>=0.5.2",
|
||||
"phonenumbers>=8.2.0",
|
||||
"six>=1.10",
|
||||
# prometheus_client 0.4.0 changed the format of counter metrics
|
||||
# (cf https://github.com/matrix-org/synapse/issues/4001)
|
||||
- "prometheus_client>=0.0.18,<0.4.0",
|
||||
- "prometheus_client>=0.0.18,<0.8.0",
|
||||
+ "prometheus_client>=0.0.18",
|
||||
|
||||
# we use attr.s(slots), which arrived in 16.0.0
|
||||
# Twisted 18.7.0 requires attrs>=17.4.0
|
||||
"attrs>=17.4.0",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user