From ecbcca4fd63fbcaba9aec1ae44bdc710db0e9891fee725c254ba7efcb82befdf Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Thu, 24 Mar 2022 23:33:06 +0000 Subject: [PATCH] Accepting request 964739 from home:darix:apps - Update to 1.55.2 OBS-URL: https://build.opensuse.org/request/show/964739 OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/matrix-synapse?expand=0&rev=211 --- _service | 4 +- ...ump-cryptography-with-system-openssl.patch | 4 +- matrix-synapse-1.4.1-paths.patch | 2 +- matrix-synapse-1.54.0.obscpio | 3 - matrix-synapse-1.55.2.obscpio | 3 + matrix-synapse-test.spec | 2 +- matrix-synapse.changes | 157 ++++++++++++++++++ matrix-synapse.obsinfo | 6 +- matrix-synapse.spec | 6 +- 9 files changed, 172 insertions(+), 15 deletions(-) delete mode 100644 matrix-synapse-1.54.0.obscpio create mode 100644 matrix-synapse-1.55.2.obscpio diff --git a/_service b/_service index 1ff88da..c9959a2 100644 --- a/_service +++ b/_service @@ -4,11 +4,11 @@ @PARENT_TAG@ https://github.com/matrix-org/synapse.git git - v1.54.0 + v1.55.2 v(.*) \1 diff --git a/dont-bump-cryptography-with-system-openssl.patch b/dont-bump-cryptography-with-system-openssl.patch index 3410ab1..c07d02e 100644 --- a/dont-bump-cryptography-with-system-openssl.patch +++ b/dont-bump-cryptography-with-system-openssl.patch @@ -11,8 +11,8 @@ Index: synapse/synapse/python_dependencies.py # 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", -@@ -79,7 +79,8 @@ REQUIREMENTS = [ - "typing-extensions>=3.7.4", +@@ -80,7 +80,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", diff --git a/matrix-synapse-1.4.1-paths.patch b/matrix-synapse-1.4.1-paths.patch index 8d3c3b8..6b84832 100644 --- a/matrix-synapse-1.4.1-paths.patch +++ b/matrix-synapse-1.4.1-paths.patch @@ -37,7 +37,7 @@ Index: synapse/synapse/config/logger.py =================================================================== --- synapse.orig/synapse/config/logger.py +++ synapse/synapse/config/logger.py -@@ -149,7 +149,7 @@ class LoggingConfig(Config): +@@ -154,7 +154,7 @@ class LoggingConfig(Config): self.no_redirect_stdio = config.get("no_redirect_stdio", False) def generate_config_section(self, config_dir_path, server_name, **kwargs) -> str: diff --git a/matrix-synapse-1.54.0.obscpio b/matrix-synapse-1.54.0.obscpio deleted file mode 100644 index 4aeee0c..0000000 --- a/matrix-synapse-1.54.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df71d3e206fc785fea11f8395f2af7cdbb2c08e0e58b43c4f35924959942542d -size 32438285 diff --git a/matrix-synapse-1.55.2.obscpio b/matrix-synapse-1.55.2.obscpio new file mode 100644 index 0000000..25f815c --- /dev/null +++ b/matrix-synapse-1.55.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69841ff55bf75db6f74914d81a698265d789aa7ce3494dd7db43761df1ffc214 +size 32537613 diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec index ffbdc25..e9ba084 100644 --- a/matrix-synapse-test.spec +++ b/matrix-synapse-test.spec @@ -27,7 +27,7 @@ %define pkgname matrix-synapse Name: %{pkgname}-test -Version: 1.54.0 +Version: 1.55.2 Release: 0 Summary: Test package for %{pkgname} License: Apache-2.0 diff --git a/matrix-synapse.changes b/matrix-synapse.changes index ff6e7a8..b1f4ca1 100644 --- a/matrix-synapse.changes +++ b/matrix-synapse.changes @@ -1,3 +1,160 @@ +------------------------------------------------------------------- +Thu Mar 24 23:29:03 UTC 2022 - Marcus Rueckert + +- Update to 1.55.2 + This patch version reverts the earlier fixes from Synapse 1.55.1, + which could cause problems in certain deployments, and instead + adds a cap to the version of Jinja to be installed. Again, this + is to fix an incompatibility with version 3.1.0 of the Jinja + library, and again, deployments of Synapse using the + matrixdotorg/synapse Docker image or Debian packages from + packages.matrix.org are not affected. + + - Internal Changes + - Pin Jinja to <3.1.0, as Synapse fails to start with Jinja + 3.1.0. (#12297) + - Revert changes from 1.55.1 as they caused problems with older + versions of Jinja (#12296) +- Changes from 1.55.1 + This is a patch release that fixes an incompatibility with + version 3.1.0 of the Jinja library, released on March 24th, 2022. + Deployments of Synapse using the matrixdotorg/synapse Docker + image or Debian packages from packages.matrix.org are not + affected. + + - Internal Changes + - Remove uses of the long-deprecated jinja2.Markup which would + prevent Synapse from starting with Jinja 3.1.0 or above + installed. (#12289) + +------------------------------------------------------------------- +Tue Mar 22 19:59:01 UTC 2022 - Marcus Rueckert + +- Update to 1.55.0 + This release removes a workaround introduced in Synapse 1.50.0 + for Mjolnir compatibility. This breaks compatibility with Mjolnir + 1.3.1 and earlier. (#11700); Mjolnir users should upgrade Mjolnir + before upgrading Synapse to this version. + + This release also moves the location of the synctl script; see + the upgrade notes for more details. + + - Features + - Add third-party rules callbacks check_can_shutdown_room and + check_can_deactivate_user. (#12028) + - Improve performance of logging in for large accounts. + (#12132) + - Add experimental env var SYNAPSE_ASYNC_IO_REACTOR that causes + Synapse to use the asyncio reactor for Twisted. (#12135) + - Support the stable identifiers from MSC3440: threads. + (#12151) + - Add a new Jinja2 template filter to extract the local part of + an email address. (#12212) + - Bugfixes + - Use the proper serialization format for bundled thread + aggregations. The bug has existed since Synapse v1.48.0. + (#12090) + - Fix a long-standing bug when redacting events with relations. + (#12113, #12121, #12130, #12189) + - Fix a bug introduced in Synapse 1.7.2 whereby background + updates are never run with the default background batch size. + (#12157) + - Fix a bug where non-standard information was returned from + the /hierarchy API. Introduced in Synapse v1.41.0. (#12175) + - Fix a bug introduced in Synapse 1.54.0 that broke background + updates on sqlite homeservers while search was disabled. + (#12215) + - Fix a long-standing bug when a filter argument with + event_fields which did not include the unsigned field could + result in a 500 error on /sync. (#12234) + - Improved Documentation + - Fix complexity checking config example in Resource + Constrained Devices docs page. (#11998) + - Improve documentation for demo scripts. (#12143) + - Updates to the Room DAG concepts development document. + (#12179) + - Document that the typing, to_device, account_data, receipts, + and presence stream writer can only be used on a single + worker. (#12196) + - Document that contributors can sign off privately by email. + (#12204) + - Deprecations and Removals + - Remove workaround introduced in Synapse 1.50.0 for Mjolnir + compatibility. Breaks compatibility with Mjolnir 1.3.1 and + earlier. (#11700) + - **synctl has been moved into into synapse._scripts and is + exposed as an entry point; see upgrade notes. (#12140) + - Remove backwards compatibilty with pagination tokens from the + /relations and /aggregations endpoints generated from Synapse + < v1.52.0. (#12138) + - The groups/communities feature in Synapse has been + deprecated. (#12200) + - Internal Changes + - Tweak copy for default Single Sign-On account details + template to better adhere to mobile app store guidelines. + (#12265, #12260) + - Simplify the ApplicationService class' set of public methods + related to interest checking. (#11915) + - Add config settings for background update parameters. + (#11980) + - Correct type hints for txredis. (#12042) + - Limit the size of aggregation_key on annotations. (#12101) + - Add type hints to tests files. (#12108, #12146, #12207, + #12208) + - Move scripts to Synapse package and expose as setuptools + entry points. (#12118) + - Add support for cancellation to ReadWriteLock. (#12120) + - Fix data validation to compare to lists, not sequences. + (#12128) + - Fix CI not attaching source distributions and wheels to the + GitHub releases. (#12131) + - Remove unused mocks from test_typing. (#12136) + - Give scripts-dev scripts suffixes for neater CI config. + (#12137) + - Move the snapcraft configuration file to contrib. (#12142) + - Enable MSC3030 Complement tests in CI. (#12144) + - Enable MSC2716 Complement tests in CI. (#12145) + - Add test for ObservableDeferred's cancellation behaviour. + (#12149) + - Use ParamSpec in type hints for synapse.logging.context. + (#12150) + - Prune unused jobs from tox config. (#12152) + - Move CI checks out of tox, to facilitate a move to using + poetry. (#12153) + - Avoid generating state groups for local out-of-band leaves. + (#12154) + - Avoid trying to calculate the state at outlier events. + (#12155, #12173, #12202) + - Fix some type annotations. (#12156) + - Add type hints for ObservableDeferred attributes. (#12159) + - Use a prebuilt Action for the tests-done CI job. (#12161) + - Reduce number of DB queries made during processing of /sync. + (#12163) + - Add delay_cancellation utility function, which behaves like + stop_cancellation but waits until the original Deferred + resolves before raising a CancelledError. (#12180) + - Retry HTTP replication failures, this should prevent 502's + when restarting stateful workers (main, event persisters, + stream writers). Contributed by Nick @ Beeper. (#12182) + - Add cancellation support to @cached and @cachedList + decorators. (#12183) + - Remove unused variables. (#12187) + - Add combined test for HTTP pusher and push rule. Contributed + by Nick @ Beeper. (#12188) + - Rename HomeServer.get_tcp_replication to + get_replication_command_handler. (#12192) + - Remove some dead code. (#12197) + - Fix a misleading comment in the function + check_event_for_spam. (#12203) + - Remove unnecessary pass statements. (#12206) + - Update the SSO username picker template to comply with SIWA + guidelines. (#12210) + - Improve code documentation for the typing stream over + replication. (#12211) +- refreshed patches: + dont-bump-cryptography-with-system-openssl.patch + matrix-synapse-1.4.1-paths.patch + ------------------------------------------------------------------- Tue Mar 8 18:44:40 UTC 2022 - Marcus Rueckert diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo index 0a9a196..1da6f56 100644 --- a/matrix-synapse.obsinfo +++ b/matrix-synapse.obsinfo @@ -1,4 +1,4 @@ name: matrix-synapse -version: 1.54.0 -mtime: 1646748079 -commit: b1989ced00cc0bc6214bfd1a393c7e8f8eda660c +version: 1.55.2 +mtime: 1648149535 +commit: 9925f9b8b0c5dd03fdb7ac78b49f75dfd51332f8 diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 4315cc2..b7e2be7 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -50,7 +50,7 @@ %define pkgname matrix-synapse %define eggname matrix_synapse Name: %{pkgname} -Version: 1.54.0 +Version: 1.55.2 Release: 0 Summary: Matrix protocol reference homeserver License: Apache-2.0 @@ -83,7 +83,7 @@ BuildRequires: unzip %{sysusers_requires} %requires_peq %{use_python}-base # NOTE: Keep this is in the same order as synapse/python_dependencies.py. -BuildRequires: %{use_python}-Jinja2 >= 2.9 +BuildRequires: (%{use_python}-Jinja2 >= 2.9 with %{use_python}-Jinja2 < 3.1) %requires_peq %{use_python}-Jinja2 BuildRequires: %{use_python}-Pillow >= 5.4.0 %requires_peq %{use_python}-Pillow @@ -141,7 +141,7 @@ BuildRequires: %{use_python}-sortedcontainers >= 1.4.4 %requires_peq %{use_python}-sortedcontainers BuildRequires: %{use_python}-systemd >= 231 %requires_peq %{use_python}-systemd -BuildRequires: %{use_python}-typing_extensions >= 3.7.4 +BuildRequires: %{use_python}-typing_extensions >= 3.10.0 %requires_peq %{use_python}-typing_extensions BuildRequires: %{use_python}-treq >= 15.1 %requires_peq %{use_python}-treq