From d65a9be722a6fa0e931f6eb2db15969fd97299c52bf4f1437cd2a28a36bdfd72 Mon Sep 17 00:00:00 2001
From: Oliver Kurz <okurz@suse.com>
Date: Tue, 3 May 2022 14:42:43 +0000
Subject: [PATCH] Accepting request 974666 from home:darix:apps

- Update to 1.58.0

OBS-URL: https://build.opensuse.org/request/show/974666
OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/matrix-synapse?expand=0&rev=217
---
 _service                                      |   2 +-
 bump-dependencies.patch                       |  13 ++
 ...ump-cryptography-with-system-openssl.patch |  23 ----
 matrix-synapse-1.4.1-paths.patch              |   2 +-
 matrix-synapse-1.57.1.obscpio                 |   3 -
 matrix-synapse-1.58.0.obscpio                 |   3 +
 matrix-synapse-test.spec                      |   2 +-
 matrix-synapse.changes                        | 118 ++++++++++++++++++
 matrix-synapse.obsinfo                        |   6 +-
 matrix-synapse.spec                           |  19 +--
 series                                        |   2 +-
 11 files changed, 153 insertions(+), 40 deletions(-)
 create mode 100644 bump-dependencies.patch
 delete mode 100644 dont-bump-cryptography-with-system-openssl.patch
 delete mode 100644 matrix-synapse-1.57.1.obscpio
 create mode 100644 matrix-synapse-1.58.0.obscpio

diff --git a/_service b/_service
index f5d2888..ec45d2d 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.57.1</param>
+    <param name="revision">v1.58.0</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
     <!--
diff --git a/bump-dependencies.patch b/bump-dependencies.patch
new file mode 100644
index 0000000..6325541
--- /dev/null
+++ b/bump-dependencies.patch
@@ -0,0 +1,13 @@
+Index: synapse/pyproject.toml
+===================================================================
+--- synapse.orig/pyproject.toml
++++ synapse/pyproject.toml
+@@ -132,7 +132,7 @@ pymacaroons = ">=0.13.0"
+ msgpack = ">=0.5.2"
+ phonenumbers = ">=8.2.0"
+ # we use GaugeHistogramMetric, which was added in prom-client 0.4.0.
+-prometheus-client = ">=0.4.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"
diff --git a/dont-bump-cryptography-with-system-openssl.patch b/dont-bump-cryptography-with-system-openssl.patch
deleted file mode 100644
index a3a4a21..0000000
--- a/dont-bump-cryptography-with-system-openssl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: synapse/synapse/python_dependencies.py
-===================================================================
---- synapse.orig/synapse/python_dependencies.py
-+++ synapse/synapse/python_dependencies.py
-@@ -68,7 +68,7 @@ REQUIREMENTS = [
-     "msgpack>=0.5.2",
-     "phonenumbers>=8.2.0",
-     # we use GaugeHistogramMetric, which was added in prom-client 0.4.0.
--    "prometheus_client>=0.4.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",
-@@ -82,7 +82,8 @@ REQUIREMENTS = [
-     "typing-extensions>=3.10.0",
-     # We enforce that we have a `cryptography` version that bundles an `openssl`
-     # with the latest security patches.
--    "cryptography>=3.4.7",
-+    # opensuse we do not bump here as we do not use the intree copy
-+    "cryptography",
-     # ijson 3.1.4 fixes a bug with "." in property names
-     "ijson>=3.1.4",
-     "matrix-common~=1.1.0",
diff --git a/matrix-synapse-1.4.1-paths.patch b/matrix-synapse-1.4.1-paths.patch
index d562cac..1481950 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
-@@ -715,7 +715,7 @@ class ServerConfig(Config):
+@@ -707,7 +707,7 @@ class ServerConfig(Config):
              bind_port = 8448
              unsecure_port = 8008
  
diff --git a/matrix-synapse-1.57.1.obscpio b/matrix-synapse-1.57.1.obscpio
deleted file mode 100644
index d537514..0000000
--- a/matrix-synapse-1.57.1.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fbcd018048e9e4dc06a077bc46ad2503b232e63f652ab1dc823ab6dc516392ac
-size 32897549
diff --git a/matrix-synapse-1.58.0.obscpio b/matrix-synapse-1.58.0.obscpio
new file mode 100644
index 0000000..959dea9
--- /dev/null
+++ b/matrix-synapse-1.58.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ef60811b379a18bb48b3b5d2a36bd9cb3fb772983cd84e28ed09bb9f5eba345
+size 33074701
diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec
index e5ac7d5..fd99235 100644
--- a/matrix-synapse-test.spec
+++ b/matrix-synapse-test.spec
@@ -27,7 +27,7 @@
 
 %define         pkgname matrix-synapse
 Name:           %{pkgname}-test
-Version:        1.57.1
+Version:        1.58.0
 Release:        0
 Summary:        Test package for %{pkgname}
 License:        Apache-2.0
diff --git a/matrix-synapse.changes b/matrix-synapse.changes
index 8a382cc..db70396 100644
--- a/matrix-synapse.changes
+++ b/matrix-synapse.changes
@@ -1,3 +1,121 @@
+-------------------------------------------------------------------
+Tue May  3 11:14:28 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 1.58.0
+  As of this release, the groups/communities feature in Synapse is
+  now disabled by default. See #11584 for details. As mentioned in
+  the upgrade notes, this feature will be removed in Synapse 1.61.
+
+  - Features
+    - Implement MSC3383 for including the destination in
+      server-to-server authentication headers. Contributed by @Bubu
+      and @jcgruenhage for Famedly. (#11398)
+    - Docker images and Debian packages from matrix.org now contain
+      a locked set of Python dependencies, greatly improving build
+      reproducibility. (Board, #11537)
+    - Enable processing of device list updates asynchronously.
+      (#12365, #12465)
+    - Implement MSC2815 to allow room moderators to view redacted
+      event content. Contributed by @tulir @ Beeper. (#12427)
+    - Build Debian packages for Ubuntu 22.04 "Jammy Jellyfish".
+      (#12543)
+  - Bugfixes
+    - Fix a bug introduced in Synapse 1.58.0rc1 where the main
+      process could consume excessive amounts of CPU and memory
+      while handling sentry logging failures. (#12554)
+    - Fix a bug introduced in Synapse 1.58.0rc1 where opentracing
+      contexts were not correctly sent to whitelisted remote
+      servers with device lists updates. (#12555)
+    - Prevent a sync request from removing a user's busy presence
+      status. (#12213)
+    - Fix bug with incremental sync missing events when
+      rejoining/backfilling. Contributed by Nick @ Beeper. (#12319)
+    - Fix a long-standing bug which incorrectly caused GET
+      /_matrix/client/v3/rooms/{roomId}/event/{eventId} to return
+      edited events rather than the original. (#12476)
+    - Fix a bug introduced in Synapse 1.27.0 where the admin API
+      for deleting forward extremities would always return a count
+      of 1, no matter how many extremities were deleted. (#12496)
+    - Fix a long-standing bug where the image thumbnails embedded
+      into email notifications were broken. (#12510)
+    - Fix a bug in the implementation of MSC3202 where Synapse
+      would use the field name device_unused_fallback_keys, rather
+      than device_unused_fallback_key_types. (#12520)
+    - Fix a bug introduced in Synapse 0.99.3 which could cause
+      Synapse to consume large amounts of RAM when back-paginating
+      in a large room. (#12522)
+  - Improved Documentation
+    - Fix rendering of the documentation site when using the
+      'print' feature. (#12340)
+    - Add a manual documenting config file options. (#12368,
+      #12527)
+    - Update documentation to reflect that both the
+      run_background_tasks_on option and the options for moving
+      stream writers off of the main process are no longer
+      experimental. (#12451)
+    - Update worker documentation and replace old federation_reader
+      with generic_worker. (#12457)
+    - Strongly recommend Poetry for development. (#12475)
+    - Add some example configurations for workers and update
+      architectural diagram. (#12492)
+    - Fix a broken link in README.rst. (#12495)
+    - Add HAProxy delegation example with CORS headers to docs.
+      (#12501)
+    - Remove extraneous comma in User Admin API's device deletion
+      section so that the example JSON is actually valid and works.
+      Contributed by @olmari. (#12533)
+  - Deprecations and Removals
+    - The groups/communities feature in Synapse is now disabled by
+      default. (#12344)
+    - Remove unstable identifiers from MSC3440. (#12382)
+  - Internal Changes
+    - Reduce unnecessary work when handling remote device list
+      updates. (#12557)
+    - Preparation for faster-room-join work: start a background
+      process to resynchronise the room state after a room join.
+      (#12394)
+    - Preparation for faster-room-join work: Implement a tracking
+      mechanism to allow functions to wait for full room state to
+      arrive. (#12399)
+    - Remove an unstable identifier from MSC3083. (#12395)
+    - Run CI in the locked Poetry environment, and remove
+      corresponding tox jobs. (#12425, #12434, #12438, #12441,
+      #12449, #12478, #12514, #12472)
+    - Change Mutual Rooms' unstable_features flag to
+      uk.half-shot.msc2666.mutual_rooms which matches the current
+      iteration of MSC2666. (#12445)
+    - Fix typo in the release script help string. (#12450)
+    - Fix a minor typo in the Debian changelogs generated by the
+      release script. (#12497)
+    - Reintroduce the list of targets to the linter script, to
+      avoid linting unwanted local-only directories during
+      development. (#12455)
+    - Limit length of device_id to less than 512 characters.
+      (#12454)
+    - Dockerfile-workers: reduce the amount we install in the
+      image. (#12464)
+    - Dockerfile-workers: give the master its own log config.
+      (#12466)
+    - complement-synapse-workers: factor out separate entry point
+      script. (#12467)
+    - Back out experimental implementation of MSC2314. (#12474)
+    - Fix grammatical error in federation error response when the
+      room version of a room is unknown. (#12483)
+    - Remove unnecessary configuration overrides in tests. (#12511)
+    - Refactor the relations code for clarity. (#12519)
+    - Add type hints so docker and stubs directories pass mypy
+      --disallow-untyped-defs. (#12528)
+    - Update delay_cancellation to accept any awaitable, rather
+      than just Deferreds. (#12468)
+    - Handle cancellation in
+      EventsWorkerStore._get_events_from_cache_or_db. (#12529)
+- port to pyproject, wheel and poetry based builds
+- refreshed patch matrix-synapse-1.4.1-paths.patch
+- moved dont-bump-cryptography-with-system-openssl.patch
+  to bump-dependencies.patch to reflect better that the patch is
+  not cryptography specific and update the patch to patch the
+  pyproject.toml.
+
 -------------------------------------------------------------------
 Thu Apr 21 10:19:32 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo
index 5c969e4..873bf4d 100644
--- a/matrix-synapse.obsinfo
+++ b/matrix-synapse.obsinfo
@@ -1,4 +1,4 @@
 name: matrix-synapse
-version: 1.57.1
-mtime: 1650466085
-commit: f8f06fc773e6d1dd9674be77d3e6a3665830a33a
+version: 1.58.0
+mtime: 1651571660
+commit: 7e6598bcf6cf63b4d04c27b9696ed8429b6ddff6
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index a039fed..8457f83 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -17,6 +17,7 @@
 
 
 %define requires_peq() %(echo '%*' | LC_ALL=C xargs -r rpm -q --whatprovides --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
+%define pythons python3
 
 # These come from matrix-synapse's CONDITIONAL_REQUIREMENTS.
 # missing deps
@@ -50,7 +51,7 @@
 %define         pkgname matrix-synapse
 %define         eggname matrix_synapse
 Name:           %{pkgname}
-Version:        1.57.1
+Version:        1.58.0
 Release:        0
 Summary:        Matrix protocol reference homeserver
 License:        Apache-2.0
@@ -67,12 +68,15 @@ Source51:       matrix-synapse-generate-config.sh
 # to clean up your working copy afterwards: git reset --hard ; rm -rv .pc patches
 Source99:       series
 Patch:          matrix-synapse-1.4.1-paths.patch
-Patch1:         dont-bump-cryptography-with-system-openssl.patch
+Patch1:         bump-dependencies.patch
 # https://github.com/matrix-org/synapse/pull/10719
 # disable by marking as source until we get a decision upstream
 Source100:      10719-Fix-instert-of-duplicate-key-into-event_json.patch
 BuildRequires:  %{use_python}-base >= 3.8
+BuildRequires:  %{use_python}-pip
+BuildRequires:  %{use_python}-poetry
 BuildRequires:  %{use_python}-setuptools
+BuildRequires:  %{use_python}-wheel
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  systemd-rpm-macros
@@ -93,7 +97,7 @@ BuildRequires:  %{use_python}-PyYAML >= 3.11
 %requires_peq   %{use_python}-PyYAML
 BuildRequires:  %{use_python}-Twisted >= 20.3.0
 %requires_peq   %{use_python}-Twisted
-BuildRequires:  ((%{use_python}-attrs >= 19.2.0 with %{use_python}-attrs < 21.1.0) or %{use_python}-attrs > 21.1.0)
+BuildRequires:  %{use_python}-attrs > 21.1.0
 %requires_peq   %{use_python}-attrs
 BuildRequires:  %{use_python}-bcrypt >= 3.2.0
 %requires_peq   %{use_python}-bcrypt
@@ -212,17 +216,19 @@ find ./ -type f \
 sed -i 's|@PYTHON_FLAVOR@|%{__python3}|g' %{S:50}
 
 %build
-%python3_build
+%pyproject_wheel
 %sysusers_generate_pre %{SOURCE47} %{name}
 
 %install
 cp %{S:48} README.SUSE
 # We install scripts into /usr/lib to avoid silly conflicts with other pkgs.
 install -d -m 0755 %{buildroot}%{_libexecdir}/%{pkgname}
-%python3_install "--install-scripts=%{_libexecdir}/%{pkgname}/"
+%pyproject_install
 
+install -d -m 0755 %{buildroot}%{_bindir} %{buildroot}%{_libexecdir}/%{pkgname}/
+# move scripts to the old place.
+mv %{buildroot}%{_bindir}/* %{buildroot}%{_libexecdir}/%{pkgname}/
 # While we provide a systemd service, link synctl so it's simpler to use.
-install -d -m 0755 %{buildroot}%{_bindir}
 ln -s %{_libexecdir}/%{pkgname}/synctl %{buildroot}%{_bindir}/synctl
 
 # Install default matrix-synapse configuration.
@@ -274,7 +280,6 @@ install -d -m 0750 %{buildroot}%{_localstatedir}/log/%{pkgname}
 %dir %attr(0750,%{modname},%{modname}) %{_localstatedir}/lib/%{pkgname}
 %dir %attr(0750,%{modname},%{modname}) %{_localstatedir}/log/%{pkgname}
 %{python3_sitelib}/%{modname}
-%{python3_sitelib}/synmark
 %{python3_sitelib}/%{eggname}-*-info
 # Python helper scripts.
 %{_bindir}/synctl
diff --git a/series b/series
index 01c541c..ea78dfb 100644
--- a/series
+++ b/series
@@ -1,2 +1,2 @@
 matrix-synapse-1.4.1-paths.patch
-dont-bump-cryptography-with-system-openssl.patch
+bump-dependencies.patch