svn commit: r499315 - in head/net-im/py-matrix-synapse: . files
Steve Wills
swills at FreeBSD.org
Thu Apr 18 20:33:48 UTC 2019
Author: swills
Date: Thu Apr 18 20:33:46 2019
New Revision: 499315
URL: https://svnweb.freebsd.org/changeset/ports/499315
Log:
net-im/py-matrix-synapse: update to v0.99.3
PR: 236260
Submitted by: Sascha Biberhofer <ports at skyforge.at> (maintainer)
Reported by: Christian Schwarz <me at cschwarz.com>
Deleted:
head/net-im/py-matrix-synapse/files/homeserver.yaml.in
Modified:
head/net-im/py-matrix-synapse/Makefile (contents, props changed)
head/net-im/py-matrix-synapse/distinfo (contents, props changed)
head/net-im/py-matrix-synapse/files/patch-python_dependencies.py (contents, props changed)
head/net-im/py-matrix-synapse/files/pkg-message.in (contents, props changed)
Modified: head/net-im/py-matrix-synapse/Makefile
==============================================================================
--- head/net-im/py-matrix-synapse/Makefile Thu Apr 18 20:26:59 2019 (r499314)
+++ head/net-im/py-matrix-synapse/Makefile Thu Apr 18 20:33:46 2019 (r499315)
@@ -3,7 +3,7 @@
PORTNAME= matrix-synapse
DISTVERSIONPREFIX= v
-DISTVERSION= 0.34.1.1
+DISTVERSION= 0.99.3
CATEGORIES= net-im python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:
${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}twisted>=17.1.0:devel/py-twisted@${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} \
${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
@@ -33,21 +33,20 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:
${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}pymacaroons-pynacl>=0.9.3:security/py-pymacaroons-pynacl@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}msgpack>=0.4.2:devel/py-msgpack@${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}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>16.0.0:devel/py-attrs@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR}
-
-# Dependencies that aren't declared in python_dependencies.py which I have discovered
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.10.0:devel/py-simplejson@${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} \
${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}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=2.0:devel/py-mock@${PY_FLAVOR}
USES= python
USE_GITHUB= yes
@@ -65,33 +64,32 @@ DBDIR?= /var/db/${PORTNAME}
LOGDIR?= /var/log/${PORTNAME}
PIDDIR?= /var/run/${PORTNAME}
-SUB_FILES= pkg-message homeserver.yaml log.config
+SUB_FILES= pkg-message log.config
SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} DBDIR=${DBDIR} LOGDIR=${LOGDIR} PIDDIR=${PIDDIR} USERS=${USERS}
-PLIST_FILES+= "@sample %%ETCDIR%%/homeserver.yaml.sample"
-PLIST_FILES+= "@sample %%ETCDIR%%/log.config.sample"
+PLIST_FILES+= "@sample ${ETCDIR}/log.config.sample"
NO_ARCH= yes
-OPTIONS_DEFINE= EMAIL LDAP PGSQL SQLITE URL_PREVIEW
+OPTIONS_DEFINE= EMAIL LDAP PGSQL SQLITE URLPREVIEW
OPTIONS_DEFAULT= SQLITE
EMAIL_DESC= Email notifications for missed messages
-URL_PREVIEW_DESC= Add dependencies necessary for URL previews
-EMAIL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \
+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>0:databases/py-psycopg2@${PY_FLAVOR}
+PGSQL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>2.6:databases/py-psycopg2@${PY_FLAVOR}
SQLITE_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
post-patch:
@${REINPLACE_CMD} -e 's|msgpack-python|msgpack|' ${WRKSRC}/synapse/python_dependencies.py
do-test:
- cd ${WRKSRC} && PYTHONPATH="." trial tests
+ cd ${WRKSRC} && PYTHONPATH="." trial-${PYTHON_VER} tests
post-install:
${MKDIR} ${STAGEDIR}${ETCDIR}
- ${INSTALL_DATA} ${WRKDIR}/homeserver.yaml ${STAGEDIR}${ETCDIR}/homeserver.yaml.sample
${INSTALL_DATA} ${WRKDIR}/log.config ${STAGEDIR}${ETCDIR}/log.config.sample
.include <bsd.port.mk>
Modified: head/net-im/py-matrix-synapse/distinfo
==============================================================================
--- head/net-im/py-matrix-synapse/distinfo Thu Apr 18 20:26:59 2019 (r499314)
+++ head/net-im/py-matrix-synapse/distinfo Thu Apr 18 20:33:46 2019 (r499315)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547138548
-SHA256 (matrix-org-synapse-v0.34.1.1_GH0.tar.gz) = bfc1997c3a8dc48eb9eb02956df6a24ad8337e4eac0faa13cb581d3a694825f7
-SIZE (matrix-org-synapse-v0.34.1.1_GH0.tar.gz) = 1131071
+TIMESTAMP = 1555070432
+SHA256 (matrix-org-synapse-v0.99.3_GH0.tar.gz) = 60a2b4caaed3e23a8fe9b43406dbee695d60271650f332cf3df3fce675a68274
+SIZE (matrix-org-synapse-v0.99.3_GH0.tar.gz) = 1227964
Modified: head/net-im/py-matrix-synapse/files/patch-python_dependencies.py
==============================================================================
--- head/net-im/py-matrix-synapse/files/patch-python_dependencies.py Thu Apr 18 20:26:59 2019 (r499314)
+++ head/net-im/py-matrix-synapse/files/patch-python_dependencies.py Thu Apr 18 20:33:46 2019 (r499315)
@@ -1,11 +1,11 @@
---- synapse/python_dependencies.py.orig 2019-01-10 17:51:27.362204447 +0100
-+++ synapse/python_dependencies.py 2019-01-10 17:51:47.559224870 +0100
-@@ -58,7 +58,7 @@
+--- 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 @@
"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",
+
# we use attr.s(slots), which arrived in 16.0.0
- "attrs>=16.0.0",
- "netaddr>=0.7.18",
+ # Twisted 18.7.0 requires attrs>=17.4.0
Modified: head/net-im/py-matrix-synapse/files/pkg-message.in
==============================================================================
--- head/net-im/py-matrix-synapse/files/pkg-message.in Thu Apr 18 20:26:59 2019 (r499314)
+++ head/net-im/py-matrix-synapse/files/pkg-message.in Thu Apr 18 20:33:46 2019 (r499315)
@@ -1,22 +1,14 @@
Configuring Synapse:
-You may use the sample config located at %%ETCDIR%% to get started. It
-already is configured to find the configuration in that location and
-places the database in %%DBDIR%% and the logs in %%LOGDIR%%, but there
-are some crucial values you will need to populate with unique data:
-registration_shared_secret and macaroon_secret_key. Both of these
-by default are 50 character random strings. These are by default set to
-CHANGEME_50CHAR_RANDOM in the sample homeserver.yaml.
+The following command can be used to generate a sample configuration of synapse:
-If you wish to have Synapse handle this for you including generation of
-self-signed TLS certificates and dhparams you can use the following
-command:
-
%%PYTHON_CMD%% -B -m synapse.app.homeserver -c %%ETCDIR%%/homeserver.yaml --generate-config -H <SERVER_NAME> --report-stats no
Please note that you will still need to manually configure paths to log
directory, database, and media storage with this method.
-It is also important that you deploy a TLS certificate that your
-clients accept as valid or some functionality will fail to work
-correctly (eg, media file retrieval).
+NOTE: Starting with Synapse v1.0, valid TLS certificates will be required for
+server-to-server communication. Self-signed certificates often autogenerated
+with previous versions will no longer suffice. Please ensure that the
+certificate specified by the "tls_certificate_path" option in your
+homeserver.yaml points to a valid certificate.
More information about the svn-ports-all
mailing list