From 9a15ef04b4cc306bf68abfcd474eb4a1f726ccf2 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Sun, 10 Apr 2022 11:45:30 +0000
Subject: net-im/py-matrix-synapse: Update to 1.56.0

- Mention important changes related to the upgrade to UPDATING
- Update the dependency constraints

Co-authored-by:	Sascha Biberhofer <ports at skyforge dot at>
PR:		263193
Approved by:	Sascha Biberhofer <ports at skyforge dot at> (maintainer)

(cherry picked from commit 76ad2b55b71f9ba18a205d9ecdb248b78d626a0c)
---
 net-im/py-matrix-synapse/Makefile                       |  4 ++--
 net-im/py-matrix-synapse/distinfo                       |  6 +++---
 .../files/patch-synapse_python__dependencies.py         | 13 +++++++++++--
 net-im/py-matrix-synapse/files/pkg-message.in           | 17 +++++++++++++++++
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
index 12cf37a11a43..e8df48627d0e 100644
--- a/net-im/py-matrix-synapse/Makefile
+++ b/net-im/py-matrix-synapse/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	matrix-synapse
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.55.2
+DISTVERSION=	1.56.0
 CATEGORIES=	net-im python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -37,7 +37,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_F
 		${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.1.0:devel/py-Jinja2@${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:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ijson>=3.1.4:devel/py-ijson@${PY_FLAVOR} \
diff --git a/net-im/py-matrix-synapse/distinfo b/net-im/py-matrix-synapse/distinfo
index 4892f2cafbfa..8bc7e3151a6f 100644
--- a/net-im/py-matrix-synapse/distinfo
+++ b/net-im/py-matrix-synapse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648214024
-SHA256 (matrix-org-synapse-v1.55.2_GH0.tar.gz) = 8e06cb264d1631d2518f2f726c89d62c5ed7148b73fbb8190a9c120d3166e7c4
-SIZE (matrix-org-synapse-v1.55.2_GH0.tar.gz) = 7739760
+TIMESTAMP = 1649590803
+SHA256 (matrix-org-synapse-v1.56.0_GH0.tar.gz) = 7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373
+SIZE (matrix-org-synapse-v1.56.0_GH0.tar.gz) = 7750479
diff --git a/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py b/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py
index f6d0e485233d..7feafa7bbf66 100644
--- a/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py
+++ b/net-im/py-matrix-synapse/files/patch-synapse_python__dependencies.py
@@ -1,6 +1,15 @@
---- synapse/python_dependencies.py.orig	2022-03-24 17:18:43 UTC
+--- synapse/python_dependencies.py.orig	2022-04-12 08:11:46 UTC
 +++ synapse/python_dependencies.py
-@@ -80,7 +80,7 @@ REQUIREMENTS = [
+@@ -48,7 +48,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.
diff --git a/net-im/py-matrix-synapse/files/pkg-message.in b/net-im/py-matrix-synapse/files/pkg-message.in
index 5280b1c46a37..05811df03e67 100644
--- a/net-im/py-matrix-synapse/files/pkg-message.in
+++ b/net-im/py-matrix-synapse/files/pkg-message.in
@@ -56,4 +56,21 @@ If you're currently using synapse with sqlite and would like to switch to postgr
 please read the instructions at %%DOCSDIR%%/postgres.md
 EOM
 }
+{ type: upgrade
+  maximum_version: 1.55.2
+  message: <<EOM
+Synapse will now refuse to start up if open registration is enabled, in order to help
+mitigate abuse across the federation. If you would like to provide registration to
+anyone, consider adding email, recaptcha or token-based verification in order to
+prevent automated registration from bad actors. This check can be disabled by setting
+the enable_registration_without_verification option in your homeserver configuration
+file to true. More details are available in the upgrade notes[0].
+
+Synapse will additionally now refuse to start when using PostgreSQL with a non-C values
+for COLLATE and CTYPE, unless the config flag allow_unsafe_locale, found in the database
+section of the configuration file, is set to true. See the upgrade notes[1] for details.
+
+[0] https://matrix-org.github.io/synapse/v1.56/upgrade.html#open-registration-without-verification-is-now-disabled-by-default
+[1] https://matrix-org.github.io/synapse/v1.56/upgrade#change-in-behaviour-for-postgresql-databases-with-unsafe-locale
+EOM
 ]
-- 
cgit v1.2.3