Accepting request 1029777 from home:darix:apps

- All the shebang line fixing should skip the vendor directory so
  that we do not break the checksum checks in cargo.

- Added https://patch-diff.githubusercontent.com/raw/matrix-org/synapse/pull/14221.patch 
  Same fix for the cache_memory as for url_preview

- Update to 1.69.0

OBS-URL: https://build.opensuse.org/request/show/1029777
OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/matrix-synapse?expand=0&rev=247

13952.patch

@@ -1,130 +0,0 @@
-From ceff48c7bfc5ff9b738c539d02b4590e4ec26d24 Mon Sep 17 00:00:00 2001
-From: David Robertson <davidr@element.io>
-Date: Thu, 29 Sep 2022 19:26:15 +0100
-Subject: [PATCH 1/3] Don't require `setuptools_rust` at runtime
-
----
- synapse/util/check_dependencies.py    | 13 ++++++++++++-
- tests/util/test_check_dependencies.py | 20 ++++++++++++++++++--
- 2 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py
-index 66f1da75028..0fb1a8fb72a 100644
---- a/synapse/util/check_dependencies.py
-+++ b/synapse/util/check_dependencies.py
-@@ -66,6 +66,17 @@ def _is_dev_dependency(req: Requirement) -> bool:
-     )
- 
- 
-+def _should_ignore_runtime_requirement(req: Requirement) -> bool:
-+    # This is a build-time dependency. Irritatingly, `poetry build` ignores the
-+    # requirements listed in the [build-system] section of pyproject.toml, so in order
-+    # to support `poetry install --no-dev` we have to mark it as a runtime dependency.
-+    # Workaround this by ignoring it here. (It might be slightly cleaner to put
-+    # `setuptools_rust` in a `build` extra or similar, but . But for now I'
-+    if req.name == "setuptools_rust":
-+        return True
-+    return False
-+
-+
- class Dependency(NamedTuple):
-     requirement: Requirement
-     must_be_installed: bool
-@@ -77,7 +88,7 @@ def _generic_dependencies() -> Iterable[Dependency]:
-     assert requirements is not None
-     for raw_requirement in requirements:
-         req = Requirement(raw_requirement)
--        if _is_dev_dependency(req):
-+        if _is_dev_dependency(req) or _should_ignore_runtime_requirement(req):
-             continue
- 
-         # https://packaging.pypa.io/en/latest/markers.html#usage notes that
-diff --git a/tests/util/test_check_dependencies.py b/tests/util/test_check_dependencies.py
-index 5d1aa025d12..6913de24b9c 100644
---- a/tests/util/test_check_dependencies.py
-+++ b/tests/util/test_check_dependencies.py
-@@ -40,7 +40,10 @@ class TestDependencyChecker(TestCase):
-     def mock_installed_package(
-         self, distribution: Optional[DummyDistribution]
-     ) -> Generator[None, None, None]:
--        """Pretend that looking up any distribution yields the given `distribution`."""
-+        """Pretend that looking up any package yields the given `distribution`.
-+
-+        If `distribution = None`, we pretend that the package is not installed.
-+        """
- 
-         def mock_distribution(name: str):
-             if distribution is None:
-@@ -81,7 +84,7 @@ def test_version_reported_as_none(self) -> None:
-                 self.assertRaises(DependencyException, check_requirements)
- 
-     def test_checks_ignore_dev_dependencies(self) -> None:
--        """Bot generic and per-extra checks should ignore dev dependencies."""
-+        """Both generic and per-extra checks should ignore dev dependencies."""
-         with patch(
-             "synapse.util.check_dependencies.metadata.requires",
-             return_value=["dummypkg >= 1; extra == 'mypy'"],
-@@ -142,3 +145,16 @@ def test_release_candidates_satisfy_dependency(self) -> None:
-             with self.mock_installed_package(new_release_candidate):
-                 # should not raise
-                 check_requirements()
-+
-+    def test_setuptools_rust_ignored(self) -> None:
-+        """Test a workaround for a `poetry build` problem. Reproduces #13926."""
-+        with patch(
-+            "synapse.util.check_dependencies.metadata.requires",
-+            return_value=["setuptools_rust >= 1.3"],
-+        ):
-+            with self.mock_installed_package(None):
-+                # should not raise, even if setuptools_rust is not installed
-+                check_requirements()
-+            with self.mock_installed_package(old):
-+                # We also ignore old versions of setuptools_rust
-+                check_requirements()
-
-From b7dab6f99ac46ce35f90f8cd25eab56a8ebd67ec Mon Sep 17 00:00:00 2001
-From: David Robertson <davidr@element.io>
-Date: Thu, 29 Sep 2022 19:32:02 +0100
-Subject: [PATCH 2/3] Changelog
-
----
- changelog.d/13952.bugfix | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 changelog.d/13952.bugfix
-
-diff --git a/changelog.d/13952.bugfix b/changelog.d/13952.bugfix
-new file mode 100644
-index 00000000000..a6af20f0518
---- /dev/null
-+++ b/changelog.d/13952.bugfix
-@@ -0,0 +1 @@
-+Fix a bug introduced in v1.68.0 where Synapse would require `setuptools_rust` at runtime, even though the package is only required at build time.
-
-From 76abcb27b7f21e0978f1ad7019b816fe9731a816 Mon Sep 17 00:00:00 2001
-From: David Robertson <davidr@element.io>
-Date: Thu, 29 Sep 2022 19:43:04 +0100
-Subject: [PATCH 3/3] Finish your sentence, boy; poetry issue reference
-
----
- synapse/util/check_dependencies.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py
-index 0fb1a8fb72a..3b1e2057002 100644
---- a/synapse/util/check_dependencies.py
-+++ b/synapse/util/check_dependencies.py
-@@ -70,8 +70,12 @@ def _should_ignore_runtime_requirement(req: Requirement) -> bool:
-     # This is a build-time dependency. Irritatingly, `poetry build` ignores the
-     # requirements listed in the [build-system] section of pyproject.toml, so in order
-     # to support `poetry install --no-dev` we have to mark it as a runtime dependency.
--    # Workaround this by ignoring it here. (It might be slightly cleaner to put
--    # `setuptools_rust` in a `build` extra or similar, but . But for now I'
-+    # See discussion on https://github.com/python-poetry/poetry/issues/6154 (it sounds
-+    # like the poetry authors don't consider this a bug?)
-+    #
-+    # In any case, workaround this by ignoring setuptools_rust here. (It might be
-+    # slightly cleaner to put `setuptools_rust` in a `build` extra or similar, but for
-+    # now let's do something quick and dirty.
-     if req.name == "setuptools_rust":
-         return True
-     return False

14085-extra-check.patch

@@ -1,48 +0,0 @@
-From 42031876e16af041367c3066023994d4c970df57 Mon Sep 17 00:00:00 2001
-From: David Robertson <davidr@element.io>
-Date: Thu, 6 Oct 2022 15:46:11 +0100
-Subject: PR #14085 Unpin build-system requirements, but impose an upper-bound
-
-Fixes #14079, properly. Reverts #14080.
-
-A summary of the problem:
-
-Synapse defines an extra called url_preview with an underscore.
-Synapse looks up its own packaging metadata at runtime to check if the dependencies needed for url_preview are installed.
-Poetry-core 1.3.0 now normalises extra names when writing metadata, per PEP 685.
-This means the extra will be written to metadata as url-preview with a hyphen.
-So the lookup in point 2 will fail if Synapse was built/installed by poetry-core 1.3.0.
-
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -219,7 +219,7 @@ oidc = ["authlib"]
- # `systemd.journal.JournalHandler`, as is documented in
- # `contrib/systemd/log_config.yaml`.
- systemd = ["systemd-python"]
--url_preview = ["lxml"]
-+url-preview = ["lxml"]
- sentry = ["sentry-sdk"]
- opentracing = ["jaeger-client", "opentracing"]
- jwt = ["authlib"]
-@@ -250,7 +250,7 @@ all = [
-     "pysaml2",
-     # oidc and jwt
-     "authlib",
--    # url_preview
-+    # url-preview
-     "lxml",
-     # sentry
-     "sentry-sdk",
-diff --git a/synapse/config/repository.py b/synapse/config/repository.py
-index 1033496bb43..e4759711ed9 100644
---- a/synapse/config/repository.py
-+++ b/synapse/config/repository.py
-@@ -205,7 +205,7 @@ def read_config(self, config: JsonDict, **kwargs: Any) -> None:
-         )
-         self.url_preview_enabled = config.get("url_preview_enabled", False)
-         if self.url_preview_enabled:
--            check_requirements("url_preview")
-+            check_requirements("url-preview")
- 
-             proxy_env = getproxies_environment()
-             if "url_preview_ip_range_blacklist" not in config:

14221.patch

@@ -0,0 +1,63 @@
+From ce2c268f22ab30ef589a8370b691703dad44819f Mon Sep 17 00:00:00 2001
+From: David Robertson <davidr@element.io>
+Date: Tue, 18 Oct 2022 12:08:50 +0100
+Subject: [PATCH 1/2] Fix `track_memory_usage` on poetry-core 1.3.x
+ installations
+
+The same kind of problem as discussed in #14085:
+
+1. we defined an extra with an underscore
+2. we look it up at runtime with an underscore
+3. but poetry-core 1.3.x. installs it with a dash, causing (2) to fail.
+
+Fix by using a dash everywhere.
+---
+ pyproject.toml          | 4 ++--
+ synapse/config/cache.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 78ff799e8ec..aa1b816b264 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -227,7 +227,7 @@ jwt = ["authlib"]
+ # (if it is not installed, we fall back to slow code.)
+ redis = ["txredisapi", "hiredis"]
+ # Required to use experimental `caches.track_memory_usage` config option.
+-cache_memory = ["pympler"]
++cache-memory = ["pympler"]
+ test = ["parameterized", "idna"]
+
+ # The duplication here is awful. I hate hate hate hate hate it. However, for now I want
+@@ -258,7 +258,7 @@ all = [
+     "jaeger-client", "opentracing",
+     # redis
+     "txredisapi", "hiredis",
+-    # cache_memory
++    # cache-memory
+     "pympler",
+     # omitted:
+     #   - test: it's useful to have this separate from dev deps in the olddeps job
+diff --git a/synapse/config/cache.py b/synapse/config/cache.py
+index 2db8cfb0052..eb4194a5a91 100644
+--- a/synapse/config/cache.py
++++ b/synapse/config/cache.py
+@@ -159,7 +159,7 @@ def read_config(self, config: JsonDict, **kwargs: Any) -> None:
+
+         self.track_memory_usage = cache_config.get("track_memory_usage", False)
+         if self.track_memory_usage:
+-            check_requirements("cache_memory")
++            check_requirements("cache-memory")
+
+         expire_caches = cache_config.get("expire_caches", True)
+         cache_entry_ttl = cache_config.get("cache_entry_ttl", "30m")
+
+From 011ec6c4f2f0a4323a4fcb2949c0e2875b4dad3c Mon Sep 17 00:00:00 2001
+From: David Robertson <davidr@element.io>
+Date: Tue, 18 Oct 2022 12:58:54 +0100
+Subject: [PATCH 2/2] Changelog
+
+---
+ changelog.d/14221.misc | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 changelog.d/14221.misc

_service

@@ -4,11 +4,11 @@
     <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.68.0</param>
+    <param name="revision">v1.69.0</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
     <!--
-    <param name="revision">v1.68.0rc1</param>
+    <param name="revision">v1.70.0rc1</param>
     <param name="versionrewrite-pattern">v([\.\d]+)(rc.*)</param>
     <param name="versionrewrite-replacement">\1~\2</param>
     -->

bump-dependencies.patch

@@ -2,7 +2,7 @@ Index: synapse/pyproject.toml
 ===================================================================
 --- synapse.orig/pyproject.toml
 +++ synapse/pyproject.toml
-@@ -131,7 +131,7 @@ pymacaroons = ">=0.13.0"
+@@ -146,7 +146,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.

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
-@@ -729,7 +729,7 @@ class ServerConfig(Config):
+@@ -739,7 +739,7 @@ class ServerConfig(Config):
              bind_port = 8448
              unsecure_port = 8008
  

matrix-synapse-1.68.0.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74896f03bd0c9042354ca1c4381ef7409a2b825afc83a760ebaf937027cc548b
-size 33437709

matrix-synapse-1.69.0.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fc60e42ecdb46a79c486cfabf32d406cdc855355a54596d756171d151347a42
+size 33776653

matrix-synapse-test.spec

@@ -27,7 +27,7 @@
 
 %define         pkgname matrix-synapse
 Name:           %{pkgname}-test
-Version:        1.68.0
+Version:        1.69.0
 Release:        0
 Summary:        Test package for %{pkgname}
 License:        Apache-2.0

matrix-synapse.changes

@@ -1,9 +1,226 @@
+-------------------------------------------------------------------
+Tue Oct 18 14:52:09 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- All the shebang line fixing should skip the vendor directory so
+  that we do not break the checksum checks in cargo.
+
+-------------------------------------------------------------------
+Tue Oct 18 12:44:57 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Added https://patch-diff.githubusercontent.com/raw/matrix-org/synapse/pull/14221.patch 
+  Same fix for the cache_memory as for url_preview
+
 -------------------------------------------------------------------
 Tue Oct 18 10:45:30 UTC 2022 - pgajdos@suse.com
 
 - python-six is not required
   https://trello.com/c/MO53MocR/143-remove-python3-six
 
+-------------------------------------------------------------------
+Mon Oct 17 19:49:55 UTC 2022 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 1.69.0
+  Please note that legacy Prometheus metric names are now
+  deprecated and will be removed in Synapse 1.73.0. Server
+  administrators should update their dashboards and alerting rules
+  to avoid using the deprecated metric names. See the upgrade notes
+  for more details.
+
+  - Features
+    - Allow application services to set the origin_server_ts of a
+      state event by providing the query parameter ts in PUT
+      /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey},
+      per MSC3316. Contributed by @lukasdenk. (#11866)
+    - Allow server admins to require a manual approval process
+      before new accounts can be used (using MSC3866). (#13556)
+    - Exponentially backoff from backfilling the same event over
+      and over. (#13635, #13936)
+    - Add cache invalidation across workers to module API. (#13667,
+      #13947)
+    - Experimental implementation of MSC3882 to allow an existing
+      device/session to generate a login token for use on a new
+      device/session. (#13722, #13868)
+    - Experimental support for thread-specific receipts (MSC3771).
+      (#13782, #13893, #13932, #13937, #13939)
+    - Add experimental support for MSC3881: Remotely toggle push
+      notifications for another client. (#13799, #13831, #13860)
+    - Keep track when an event pulled over federation fails its
+      signature check so we can intelligently back-off in the
+      future. (#13815)
+    - Improve validation for the unspecced, internal-only
+      _matrix/client/unstable/add_threepid/msisdn/submit_token
+      endpoint. (#13832)
+    - Faster remote room joins: record when we first partial-join
+      to a room. (#13892)
+    - Support a dir parameter on the /relations endpoint per
+      MSC3715. (#13920)
+    - Ask mail servers receiving emails from Synapse to not send
+      automatic replies (e.g. out-of-office responses). (#13957)
+  - Bugfixes
+    - Fix poor performance of the event_push_backfill_thread_id
+      background update, which was introduced in Synapse 1.68.0rc1.
+      (#14172, #14181)
+    - Fix an issue with Docker images causing the Rust dependencies
+      to not be pinned correctly. Introduced in v1.68.0 (#14129)
+    - Fix a bug introduced in Synapse 1.69.0rc1 which would cause
+      registration replication requests to fail if the worker
+      sending the request is not running Synapse 1.69. (#14135)
+    - Fix error in background update when rotating existing
+      notifications. Introduced in v1.69.0rc2. (#14138)
+    - Send push notifications for invites received over federation.
+      (#13719, #14014)
+    - Fix a long-standing bug where typing events would be accepted
+      from remote servers not present in a room. Also fix a bug
+      where incoming typing events would cause other incoming
+      events to get stuck during a fast join. (#13830)
+    - Fix a bug introduced in Synapse v1.53.0 where the
+      experimental implementation of MSC3715 would give incorrect
+      results when paginating forward. (#13840)
+    - Fix access token leak to logs from proxy agent. (#13855)
+    - Fix have_seen_event cache not being invalidated after we
+      persist an event which causes inefficiency effects like extra
+      /state federation calls. (#13863)
+    - Faster room joins: Fix a bug introduced in 1.66.0 where an
+      error would be logged when syncing after joining a room.
+      (#13872)
+    - Fix a bug introduced in 1.66.0 where some required fields in
+      the pushrules sent to clients were not present anymore.
+      Contributed by Nico. (#13904)
+    - Fix packaging to include Cargo.lock in sdist. (#13909)
+    - Fix a long-standing bug where device updates could cause
+      delays sending out to-device messages over federation.
+      (#13922)
+    - Fix a bug introduced in v1.68.0 where Synapse would require
+      setuptools_rust at runtime, even though the package is only
+      required at build time. (#13952)
+    - Fix a long-standing bug where POST
+      /_matrix/client/v3/keys/query requests could result in
+      excessively large SQL queries. (#13956)
+    - Fix a performance regression in the get_users_in_room
+      database query. Introduced in v1.67.0. (#13972)
+    - Fix a bug introduced in v1.68.0 bug where Rust extension
+      wasn't built in release mode when using poetry install.
+      (#14009)
+    - Do not return an unspecified original_event field when using
+      the stable /relations endpoint. Introduced in Synapse
+      v1.57.0. (#14025)
+    - Correctly handle a race with device lists when a remote user
+      leaves during a partial join. (#13885)
+    - Correctly handle sending local device list updates to remote
+      servers during a partial join. (#13934)
+  - Improved Documentation
+    - Add worker_main_http_uri for the worker generator bash
+      script. (#13772)
+    - Update URL for the NixOS module for Synapse. (#13818)
+    - Fix a mistake in sso_mapping_providers.md:
+      map_user_attributes is expected to return display_name, not
+      displayname. (#13836)
+    - Fix a cross-link from the registration admin API to the
+      registration_shared_secret configuration documentation.
+      (#13870)
+    - Update the man page for the hash_password script to correct
+      the default number of bcrypt rounds performed. (#13911,
+      #13930)
+    - Emphasize the right reasons when to use (room_id, event_id)
+      in a database schema. (#13915)
+    - Add instruction to contributing guide for running unit tests
+      in parallel. Contributed by @ashfame. (#13928)
+    - Clarify that the auto_join_rooms config option can also be
+      used with Space aliases. (#13931)
+    - Add some cross references to worker documentation. (#13974)
+    - Linkify urls in config documentation. (#14003)
+  - Updates to the Docker image
+    - Fix docker build OOMing in CI for arm64 builds. (#14173)
+  - Deprecations and Removals
+    - Remove the complete_sso_login method from the Module API
+      which was deprecated in Synapse 1.13.0. (#13843)
+    - Announce that legacy metric names are deprecated, will be
+      turned off by default in Synapse v1.71.0 and removed
+      altogether in Synapse v1.73.0. See the upgrade notes for more
+      information. (#14024)
+    - Deprecate the generate_short_term_login_token method in favor
+      of an async create_login_token method in the Module API.
+      (#13842)
+  - Internal Changes
+    - Rename the url_preview extra to url-preview, for
+      compatability with poetry-core 1.3.0 and PEP 685. From-source
+      installations using this extra will need to install using the
+      new name. (#14085)
+    - Ensure Synapse v1.69 works with upcoming database changes in
+      v1.70. (#14045)
+    - Fix a bug introduced in Synapse v1.68.0 where messages could
+      not be sent in rooms with non-integer notifications power
+      level. (#14073)
+    - Temporarily pin build-system requirements to workaround an
+      incompatibility with poetry-core 1.3.0. This will be reverted
+      before the v1.69.0 release proper, see #14079. (#14080)
+    - Speed up creation of DM rooms. (#13487, #13800)
+    - Port push rules to using Rust. (#13768, #13838, #13889)
+    - Optimise get rooms for user calls. Contributed by Nick @
+      Beeper (@Fizzadar). (#13787)
+    - Update the script which makes full schema dumps. (#13792)
+    - Use shared methods for cache invalidation when persisting
+      events, remove duplicate codepaths. Contributed by Nick @
+      Beeper (@Fizzadar). (#13796)
+    - Improve the synapse.api.auth.Auth mock used in unit tests.
+      (#13809)
+    - Faster Remote Room Joins: tell remote homeservers that we are
+      unable to authorise them if they query a room which has
+      partial state on our server. (#13823)
+    - Carry IdP Session IDs through user-mapping sessions. (#13839)
+    - Fix the release script not publishing binary wheels. (#13850)
+    - Raise issue if complement fails with latest deps. (#13859)
+    - Correct the comments in the complement dockerfile. (#13867)
+    - Create a new snapshot of the database schema. (#13873)
+    - Faster room joins: Send device list updates to most servers
+      in rooms with partial state. (#13874, #14013)
+    - Add comments to the Prometheus recording rules to make it
+      clear which set of rules you need for Grafana or Prometheus
+      Console. (#13876)
+    - Only pull relevant backfill points from the database based on
+      the current depth and limit (instead of all) every time we
+      want to /backfill. (#13879)
+    - Faster room joins: Avoid waiting for full state when
+      processing /keys/changes requests. (#13888)
+    - Improve backfill robustness by trying more servers when we
+      get a 4xx error back. (#13890)
+    - Fix mypy errors with canonicaljson 1.6.3. (#13905)
+    - Faster remote room joins: correctly handle remote device list
+      updates during a partial join. (#13913)
+    - Complement image: propagate SIGTERM to all workers. (#13914)
+    - Update an innaccurate comment in Synapse's upsert database
+      helper. (#13924)
+    - Update mypy (0.950 -> 0.981) and mypy-zope (0.3.7 -> 0.3.11).
+      (#13925, #13993)
+    - Use dedicated get_local_users_in_room(room_id) function to
+      find local users when calculating users to copy over during a
+      room upgrade. (#13960)
+    - Refactor language in user directory _track_user_joined_room
+      code to make it more clear that we use both local and remote
+      users. (#13966)
+    - Revert catch-all exceptions being recorded as event pull
+      attempt failures (only handle what we know about). (#13969)
+    - Speed up calculating push actions in large rooms. (#13973,
+      #13992)
+    - Enable update notifications from Github's dependabot.
+      (#13976)
+    - Prototype a workflow to automatically add changelogs to
+      dependabot PRs. (#13998, #14011, #14017, #14021, #14027)
+    - Fix type annotations to be compatible with new annotations in
+      development versions of twisted. (#14012)
+    - Clear out stale entries in event_push_actions_staging table.
+      (#14020)
+    - Bump versions of GitHub actions. (#13978, #13979, #13980,
+      #13982, #14015, #14019, #14022, #14023)
+- modified bump-dependencies.patch:
+  to undo the upper bound for poetry-core again as we already have
+  a newer version in TW
+- drop patches which are included in the update:
+  - 14085-extra-check.patch
+  - 13952.patch
+- refreshed patches:
+  - matrix-synapse-1.4.1-paths.patch
+
 -------------------------------------------------------------------
 Sat Oct 15 10:02:06 UTC 2022 - Ben Greiner <code@bnavigator.de>
 

matrix-synapse.obsinfo

@@ -1,4 +1,4 @@
 name: matrix-synapse
-version: 1.68.0
+version: 1.69.0
-mtime: 1664278471
+mtime: 1666002675
-commit: 3853011d01ad3f5034f53a9dfb7a06e36cf70ae9
+commit: 6b097a3e17ec52b2486a91c8dcf8f8cb53f740f3

matrix-synapse.spec

@@ -76,7 +76,7 @@
 %global attrs_version                 21.1.1
 %global bcrypt_version                3.1.7
 %global bleach_version                1.4.3
-%global canonicaljson_version         1.5.0
+%global canonicaljson_version         1.6.3
 %global canonicaljson_max_version     2
 %global cryptography_version          3.4.7
 %global frozendict_version            2.1.3
@@ -153,7 +153,7 @@
 %define         pkgname matrix-synapse
 %define         eggname matrix_synapse
 Name:           %{pkgname}
-Version:        1.68.0
+Version:        1.69.0
 Release:        0
 Summary:        Matrix protocol reference homeserver
 License:        Apache-2.0
@@ -173,9 +173,7 @@ Source51:       matrix-synapse-generate-config.sh
 Source99:       series
 Patch:          matrix-synapse-1.4.1-paths.patch
 Patch1:         bump-dependencies.patch
-Patch2:         https://patch-diff.githubusercontent.com/raw/matrix-org/synapse/pull/13952.patch
+Patch2:         https://patch-diff.githubusercontent.com/raw/matrix-org/synapse/pull/14221.patch
-# PATCH-FIX-UPSTREAM 14085-extra-check.patch https://github.com/matrix-org/synapse/pull/14085
-Patch3:         14085-extra-check.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
@@ -194,7 +192,7 @@ BuildRequires:  unzip
 %{?systemd_ordering}
 %{sysusers_requires}
 %requires_peq   %{use_python}-base
-BuildRequires:  %{use_python}-setuptools-rust >= 1.3
+BuildRequires:  (%{use_python}-setuptools-rust >= 1.3 with %{use_python}-setuptools-rust < 1.5.3)
 # NOTE: Keep this is in the same order as pyproject.toml.
 # some version locks based on poetry.lock
 BuildRequires:  %{use_python}-Jinja2 >= %{Jinja2_version}
@@ -310,12 +308,12 @@ Matrix. Matrix is a system for federated Instant Messaging and VoIP.
 install -m 0644 -D %{SOURCE2} .cargo/config
 
 # Remove all un-needed #!-lines.
-find synapse/ -type f -exec sed -i '1{/^#!/d}' {} \;
+find synapse/ -type f -not -path './vendor/**' -exec sed -i '1{/^#!/d}' {} \;
 # Replace all #!/usr/bin/env lines to use #!/usr/bin/$1 directly.
-find ./ -type f -exec \
+find ./ -type f -not -path './vendor/**' -exec \
 	sed -i '1s|^#!/usr/bin/env |#!/usr/bin/|' {} \;
 # Force the usage of the default python3 sys executable
-find ./ -type f \
+find ./ -type f -not -path './vendor/**' \
 	-exec sed -i '1s|^#!/usr/bin/python.*$|#!%{__python3}|' {} \;
 
 # Update the python flavour in the service file.

series

@@ -1,4 +1,2 @@
 matrix-synapse-1.4.1-paths.patch
 bump-dependencies.patch
-13952.patch
-14085-extra-check.patch

vendor.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a08f39c2b21835c939efae0c46d5e891ebc9e5f0f58d175d953b3dfbe6be4be5
+oid sha256:e56bbffe91d34ac7ad65dc1e760f8f41ae8de5aa0f791f29e7a46b2727318573
-size 6175020
+size 6992060