From b17c06df2313aff61ea292c38e531221f76cd82a1cdb0045be2e6f8569c7bd50 Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Mon, 14 Feb 2022 16:37:07 +0000
Subject: [PATCH] Accepting request 953161 from home:darix:apps

- Update to 1.52.0

OBS-URL: https://build.opensuse.org/request/show/953161
OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/matrix-synapse?expand=0&rev=207
---
 _service                                      |  2 +-
 ...ump-cryptography-with-system-openssl.patch | 11 ++-
 matrix-synapse-1.4.1-paths.patch              |  2 +-
 matrix-synapse-1.51.0.obscpio                 |  3 -
 matrix-synapse-1.52.0.obscpio                 |  3 +
 matrix-synapse-test.spec                      |  2 +-
 matrix-synapse.changes                        | 83 +++++++++++++++++++
 matrix-synapse.obsinfo                        |  6 +-
 matrix-synapse.spec                           | 10 +--
 9 files changed, 107 insertions(+), 15 deletions(-)
 delete mode 100644 matrix-synapse-1.51.0.obscpio
 create mode 100644 matrix-synapse-1.52.0.obscpio

diff --git a/_service b/_service
index 9061d8a..bd82889 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="url">https://github.com/matrix-org/synapse.git</param>
     <param name="scm">git</param>
-    <param name="revision">v1.51.0</param>
+    <param name="revision">v1.52.0</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
     <!--
diff --git a/dont-bump-cryptography-with-system-openssl.patch b/dont-bump-cryptography-with-system-openssl.patch
index 97b9806..1f55e50 100644
--- a/dont-bump-cryptography-with-system-openssl.patch
+++ b/dont-bump-cryptography-with-system-openssl.patch
@@ -11,7 +11,16 @@ Index: synapse/synapse/python_dependencies.py
      "unpaddedbase64>=1.1.0",
      "canonicaljson>=1.4.0",
      # we use the type definitions added in signedjson 1.1.
-@@ -86,7 +86,8 @@ REQUIREMENTS = [
+@@ -77,7 +77,7 @@ REQUIREMENTS = [
+     "phonenumbers>=8.2.0",
+     # we use GaugeHistogramMetric, which was added in prom-client 0.4.0.
+     # 0.13.0 has an incorrect type annotation, see #11832.
+-    "prometheus_client>=0.4.0,<0.13.0",
++    "prometheus_client>=0.13.1",
+     # we use `order`, which arrived in attrs 19.2.0.
+     # Note: 21.1.0 broke `/sync`, see #9936
+     "attrs>=19.2.0,!=21.1.0",
+@@ -87,7 +87,8 @@ REQUIREMENTS = [
      "typing-extensions>=3.7.4",
      # We enforce that we have a `cryptography` version that bundles an `openssl`
      # with the latest security patches.
diff --git a/matrix-synapse-1.4.1-paths.patch b/matrix-synapse-1.4.1-paths.patch
index cac156d..34d66da 100644
--- a/matrix-synapse-1.4.1-paths.patch
+++ b/matrix-synapse-1.4.1-paths.patch
@@ -50,7 +50,7 @@ Index: synapse/synapse/config/server.py
 ===================================================================
 --- synapse.orig/synapse/config/server.py
 +++ synapse/synapse/config/server.py
-@@ -696,7 +696,7 @@ class ServerConfig(Config):
+@@ -717,7 +717,7 @@ class ServerConfig(Config):
              bind_port = 8448
              unsecure_port = 8008
  
diff --git a/matrix-synapse-1.51.0.obscpio b/matrix-synapse-1.51.0.obscpio
deleted file mode 100644
index 8f8836a..0000000
--- a/matrix-synapse-1.51.0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6a564f5784388b1a6f53986cf7da82f614284b6461c1e59368fae5aee5bd191
-size 32129037
diff --git a/matrix-synapse-1.52.0.obscpio b/matrix-synapse-1.52.0.obscpio
new file mode 100644
index 0000000..6170cd6
--- /dev/null
+++ b/matrix-synapse-1.52.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6bf81e506b16cf6f1bd1d311c123bb62324becf11f759b286a6444882b393478
+size 32205325
diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec
index cf50d28..aa07291 100644
--- a/matrix-synapse-test.spec
+++ b/matrix-synapse-test.spec
@@ -27,7 +27,7 @@
 
 %define         pkgname matrix-synapse
 Name:           %{pkgname}-test
-Version:        1.51.0
+Version:        1.52.0
 Release:        0
 Summary:        Test package for %{pkgname}
 License:        Apache-2.0
diff --git a/matrix-synapse.changes b/matrix-synapse.changes
index 0d67a1b..1210c1f 100644
--- a/matrix-synapse.changes
+++ b/matrix-synapse.changes
@@ -1,3 +1,86 @@
+-------------------------------------------------------------------
+Wed Feb  9 23:24:56 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 1.52.0
+
+  Note that Twisted 22.1.0 has recently been released, which fixes
+  a security issue within the Twisted library. We do not believe
+  Synapse is affected by this vulnerability, though we advise
+  server administrators who installed Synapse via pip to upgrade
+  Twisted with pip install --upgrade Twisted treq as a matter of
+  good practice. The Docker image matrixdotorg/synapse and the
+  Debian packages from packages.matrix.org are using the updated
+  library.
+
+  - Features
+    - Remove account data (including client config, push rules and
+      ignored users) upon user deactivation. (#11621, #11788,
+      #11789)
+    - Add an admin API to reset connection timeouts for remote
+      server. (#11639)
+    - Add an admin API to get a list of rooms that federate with a
+      given remote homeserver. (#11658)
+    - Add a config flag to inhibit M_USER_IN_USE during
+      registration. (#11743)
+    - Add a module callback to set username at registration.
+      (#11790)
+    - Allow configuring a maximum file size as well as a list of
+      allowed content types for avatars. (#11846)
+  - Bugfixes
+    - Include the bundled aggregations in the /sync response, per
+      MSC2675. (#11612)
+    - Fix a long-standing bug when previewing Reddit URLs which do
+      not contain an image. (#11767)
+    - Fix a long-standing bug that media streams could cause
+      long-lived connections when generating URL previews. (#11784)
+    - Include a prev_content field in state events sent to
+      Application Services. Contributed by @totallynotvaishnav.
+      (#11798)
+    - Fix a bug introduced in Synapse 0.33.3 causing requests to
+      sometimes log strings such as HTTPStatus.OK instead of
+      integer status codes. (#11827)
+  - Improved Documentation
+    - Update pypi installation docs to indicate that we now support
+      Python 3.10. (#11820)
+    - Add missing steps to the contribution submission process in
+      the documentation. Contributed by @sequentialread. (#11821)
+    - Remove not needed old table of contents in documentation.
+      (#11860)
+    - Consolidate the access_token information at the top of each
+      relevant page in the Admin API documentation. (#11861)
+  - Deprecations and Removals
+    - Drop support for Python 3.6, which is EOL. (#11683)
+    - Remove the experimental_msc1849_support_enabled flag as the
+      features are now stable. (#11843)
+  - Internal Changes
+    - Preparation for database schema simplifications: add
+      state_key and rejection_reason columns to events table.
+      (#11792)
+    - Add FrozenEvent.get_state_key and use it in a couple of
+      places. (#11793)
+    - Preparation for database schema simplifications: stop reading
+      from event_reference_hashes. (#11794)
+    - Drop unused table public_room_list_stream. (#11795)
+    - Preparation for reducing Postgres serialization errors: allow
+      setting transaction isolation level. Contributed by Nick @
+      Beeper. (#11799, #11847)
+    - Docker: skip the initial amd64-only build and go straight to
+      multiarch. (#11810)
+    - Run Complement on the Github Actions VM and not inside a
+      Docker container. (#11811)
+    - Log module names at startup. (#11813)
+    - Improve type safety of bundled aggregations code. (#11815)
+    - Correct a type annotation in the event validation logic.
+      (#11817, #11830)
+    - Minor updates and documentation for database schema delta
+      files. (#11823)
+    - Workaround a type annotation problem in prometheus_client
+      0.13.0. (#11834)
+    - Minor performance improvement in room state lookup. (#11836)
+    - Fix some indentation inconsistencies in the sample config.
+      (#11838)
+    - Add type hints to tests/rest/admin. (#11851)
+
 -------------------------------------------------------------------
 Thu Feb  3 12:08:51 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo
index bf98367..6c5fff5 100644
--- a/matrix-synapse.obsinfo
+++ b/matrix-synapse.obsinfo
@@ -1,4 +1,4 @@
 name: matrix-synapse
-version: 1.51.0
-mtime: 1643110952
-commit: 343d4f13d8cb9f813097267216eaa0a74935b4ca
+version: 1.52.0
+mtime: 1644320855
+commit: 5cdd4913100961f943f6432d9fbdaa20907142c2
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index aea1a3a..5d6d06e 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -40,7 +40,7 @@
 # * Commit+submit
 
 #if 0%{?suse_version} >= 1550
-#define use_python python3
+#define use_python python38
 #define __python3 #{_bindir}/python3
 #else
 %define use_python python3
@@ -50,7 +50,7 @@
 %define         pkgname matrix-synapse
 %define         eggname matrix_synapse
 Name:           %{pkgname}
-Version:        1.51.0
+Version:        1.52.0
 Release:        0
 Summary:        Matrix protocol reference homeserver
 License:        Apache-2.0
@@ -85,7 +85,7 @@ BuildRequires:  unzip
 # NOTE: Keep this is in the same order as synapse/python_dependencies.py.
 BuildRequires:  %{use_python}-Jinja2 >= 2.9
 %requires_peq   %{use_python}-Jinja2
-BuildRequires:  %{use_python}-Pillow >= 4.3.0
+BuildRequires:  %{use_python}-Pillow >= 5.4.0
 %requires_peq   %{use_python}-Pillow
 BuildRequires:  %{use_python}-PyNaCl >= 1.2.1
 %requires_peq   %{use_python}-PyNaCl
@@ -119,7 +119,7 @@ BuildRequires:  %{use_python}-netaddr >= 0.7.18
 %requires_peq   %{use_python}-netaddr
 BuildRequires:  %{use_python}-phonenumbers >= 8.2.0
 %requires_peq   %{use_python}-phonenumbers
-BuildRequires:  %{use_python}-prometheus_client >= 0.4.0
+BuildRequires:  %{use_python}-prometheus_client >= 0.13.1
 %requires_peq   %{use_python}-prometheus_client
 BuildRequires:  %{use_python}-psutil >= 2.0.0
 %requires_peq   %{use_python}-psutil
@@ -161,7 +161,7 @@ BuildRequires:  %{use_python}-pysaml2 >= 4.5.0
 BuildRequires:  %{use_python}-Authlib >= 0.15.1
 %requires_peq   %{use_python}-Authlib
 %endif
-BuildRequires:  %{use_python}-lxml >= 3.5.0
+BuildRequires:  %{use_python}-lxml >= 4.2.0
 %requires_peq   %{use_python}-lxml
 %if %{with synapse_sentry}
 BuildRequires:  %{use_python}-sentry-sdk >= 0.7.2