[arch-commits] Commit in matrix-synapse/trunk (3 files)

[Alexander Epaneshnikov]

    Date: Wednesday, February 23, 2022 @ 23:01:56
  Author: alex19ep
Revision: 1136332

upgpkg: matrix-synapse 1.53.0-1 upstream release

Modified:
  matrix-synapse/trunk/PKGBUILD
  matrix-synapse/trunk/synapse.install
Deleted:
  matrix-synapse/trunk/latest-frozendict.patch

-------------------------+
 PKGBUILD                |   15 ++++-----------
 latest-frozendict.patch |   13 -------------
 synapse.install         |   10 ++++++++++
 3 files changed, 14 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-23 22:42:28 UTC (rev 1136331)
+++ PKGBUILD	2022-02-23 23:01:56 UTC (rev 1136332)
@@ -3,7 +3,7 @@
 # Contributor: Ivan Shapovalov <intelfx at intelfx.name>
 
 pkgname=matrix-synapse
-pkgver=1.52.0
+pkgver=1.53.0
 pkgrel=1
 pkgdesc="Matrix reference homeserver"
 url="https://github.com/matrix-org/synapse"
@@ -37,9 +37,8 @@
         'synapse-worker at .service'
         'sysusers-synapse.conf'
         'tmpfiles-synapse.conf'
-        'override-hardened.conf'
-        'latest-frozendict.patch')
-sha256sums=('943cd2e3131c754bf0f7bd98d1614e65d56161fb4e2cc159bcd58853525bdef0'
+        'override-hardened.conf')
+sha256sums=('e9fb5c8d1178996e677f6ce8f44c11d9294da0a06297fffa34706879870f9bf4'
             'f67334856609997eac26939d77cfc520e78e98d3755543ab730d83a0f362a35e'
             '74af0bc2f57e5ced1a44f2438922d420cbb7defedae784cac02ef125f276a2ed'
             '408527271e1250beb20531f140b91201ed464e42f7eb3f47f02967a2ac23a661'
@@ -46,16 +45,10 @@
             'c9657c201ad89985c8c915bfa0ea7517a412071736b4d9545d8f6474fddc44e2'
             'aadfdd78fe73e6eb325ee4299b8db8b97bfa2f4e7df953aa8477f442598a7ec5'
             '65588c8c64dfb84cab831cd8d028a295d753cf7322dd63053e8488466047b45f'
-            'd8e6b2a43a8a7d8f09c643f32e789a7ffeeb2d20bb07ee88ddc6923e1ab3b0e6'
-            'f1307d1db27ef293ee2430ec734ac7380e6022ba1396770b343359179f9b294e')
+            'd8e6b2a43a8a7d8f09c643f32e789a7ffeeb2d20bb07ee88ddc6923e1ab3b0e6')
 backup=('etc/synapse/log_config.yaml')
 install=synapse.install
 
-prepare() {
-	cd synapse-$pkgver
-	patch -Np1 -i ../latest-frozendict.patch
-}
-
 build() {
 	cd synapse-$pkgver
 	python setup.py build

Deleted: latest-frozendict.patch
===================================================================
--- latest-frozendict.patch	2022-02-23 22:42:28 UTC (rev 1136331)
+++ latest-frozendict.patch	2022-02-23 23:01:56 UTC (rev 1136332)
@@ -1,13 +0,0 @@
-diff -ur --ignore-all-space synapse-1.49.2/synapse/python_dependencies.py synapse-1.49.2-new/synapse/python_dependencies.py
---- synapse-1.49.2/synapse/python_dependencies.py	2021-12-21 20:41:34.000000000 +0300
-+++ synapse-1.49.2-new/synapse/python_dependencies.py	2021-12-22 00:56:31.359112226 +0300
-@@ -50,8 +50,7 @@
- REQUIREMENTS = [
-     # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0
-     "jsonschema>=3.0.0",
--    # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41
--    "frozendict>=1,<2.1.2",
-+    "frozendict>=1",
-     "unpaddedbase64>=1.1.0",
-     "canonicaljson>=1.4.0",
-     # we use the type definitions added in signedjson 1.1.

Modified: synapse.install
===================================================================
--- synapse.install	2022-02-23 22:42:28 UTC (rev 1136331)
+++ synapse.install	2022-02-23 23:01:56 UTC (rev 1136332)
@@ -87,4 +87,14 @@
 		    and will become a configuration error in Synapse v1.53.0.
 		EOF
 	fi
+	if [[ "$(vercmp "$2" 1.53.0)" -lt 0 ]]; then
+		cat <<-EOF
+		==> Dropping support for webclient listeners and non-HTTP(S) web_client_location
+		    Per the deprecation notice in Synapse v1.51.0, listeners of type
+		    webclient are no longer supported and configuring them is a now
+		    a configuration error.
+		    Configuring a non-HTTP(S) web_client_location configuration is now
+		    a configuration error.
+		EOF
+	fi
 }