diff --git a/14221.patch b/14221.patch deleted file mode 100644 index 0bb5975..0000000 --- a/14221.patch +++ /dev/null @@ -1,63 +0,0 @@ -From ce2c268f22ab30ef589a8370b691703dad44819f Mon Sep 17 00:00:00 2001 -From: David Robertson -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 -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 diff --git a/_service b/_service index e27c2b5..c40dee1 100644 --- a/_service +++ b/_service @@ -4,17 +4,23 @@ @PARENT_TAG@ https://github.com/matrix-org/synapse.git git - v1.69.0 + v1.71.0 v(.*) \1 synapse + + + + synapse diff --git a/matrix-synapse-1.4.1-paths.patch b/matrix-synapse-1.4.1-paths.patch index c01c328..4b994ac 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 -@@ -739,7 +739,7 @@ class ServerConfig(Config): +@@ -742,7 +742,7 @@ class ServerConfig(Config): bind_port = 8448 unsecure_port = 8008 diff --git a/matrix-synapse-1.69.0.obscpio b/matrix-synapse-1.69.0.obscpio deleted file mode 100644 index 28b1e8e..0000000 --- a/matrix-synapse-1.69.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2fc60e42ecdb46a79c486cfabf32d406cdc855355a54596d756171d151347a42 -size 33776653 diff --git a/matrix-synapse-1.71.0.obscpio b/matrix-synapse-1.71.0.obscpio new file mode 100644 index 0000000..205cc2c --- /dev/null +++ b/matrix-synapse-1.71.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8daf83f8b9dcd128663702e361fa201dbaa1823d9fb6935a3caa0efab64c610b +size 34036237 diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec index d4e1cc6..d4bc381 100644 --- a/matrix-synapse-test.spec +++ b/matrix-synapse-test.spec @@ -27,7 +27,7 @@ %define pkgname matrix-synapse Name: %{pkgname}-test -Version: 1.69.0 +Version: 1.71.0 Release: 0 Summary: Test package for %{pkgname} License: Apache-2.0 diff --git a/matrix-synapse.changes b/matrix-synapse.changes index 6fd6d64..d98f238 100644 --- a/matrix-synapse.changes +++ b/matrix-synapse.changes @@ -1,3 +1,273 @@ +------------------------------------------------------------------- +Tue Nov 8 13:05:47 UTC 2022 - Marcus Rueckert + +- Update to 1.71.0 + Please note that, as announced in the release notes for Synapse + 1.69.0, legacy Prometheus metric names are now disabled by + default. They will be removed altogether in Synapse 1.73.0. If + not already done, server administrators should update their + dashboards and alerting rules to avoid using the deprecated + metric names. See the upgrade notes for more details. + + Note: in line with our deprecation policy for platform + dependencies, this will be the last release to support PostgreSQL + 10, which reaches upstream end-of-life on November 10th, 2022. + Future releases of Synapse will require PostgreSQL 11+. + - Features + - Support back-channel logouts from OpenID Connect providers. + (#11414) + - Allow use of Postgres and SQLlite full-text search operators in + search queries. (#11635, #14310, #14311) + - Implement MSC3664, Pushrules for relations. Contributed by + Nico. (#11804) + - Improve aesthetics of HTML templates. Note that these changes + do not retroactively apply to templates which have been + customised by server admins. (#13652) + - Enable write-ahead logging for SQLite installations. + Contributed by @asymmetric. (#13897) + - Show erasure status when listing users in the Admin API. + (#14205) + - Provide a specific error code when a /sync request provides a + filter which doesn't represent a JSON object. (#14262) + - Bugfixes + - Fix a long-standing bug where the update_synapse_database + script could not be run with multiple databases. Contributed by + @thefinn93 @ Beeper. (#13422) + - Fix a bug which prevented setting an avatar on homeservers + which have an explicit port in their server_name and have + max_avatar_size and/or allowed_avatar_mimetypes configuration. + Contributed by @ashfame. (#13927) + - Check appservice user interest against the local users instead + of all users in the room to align with MSC3905. (#13958) + - Fix a long-standing bug where Synapse would accidentally + include extra information in the response to PUT + /_matrix/federation/v2/invite/{roomId}/{eventId}. (#14064) + - Fix a bug introduced in Synapse 1.64.0 where presence updates + could be missing from /sync responses. (#14243) + - Fix a bug introduced in Synapse 1.60.0 which caused an error to + be logged when Synapse received a SIGHUP signal if debug + logging was enabled. (#14258) + - Prevent history insertion (MSC2716) during an partial join + (MSC3706). (#14291) + - Fix a bug introduced in Synapse 1.34.0 where device names would + be returned via a federation user key query request when + allow_device_name_lookup_over_federation was set to false. + (#14304) + - Fix a bug introduced in Synapse 0.34.0 where logs could include + error spam when background processes are measured as taking a + negative amount of time. (#14323) + - Fix a bug introduced in Synapse 1.70.0 where clients were + unable to PUT new dehydrated devices. (#14336) + - Improved Documentation + - Document the changes to monthly active user metrics due to + deprecation of legacy Prometheus metric names. (#14358, #14360) + - Explain how to disable the use of trusted_key_servers. (#13999) + - Add workers settings to configuration manual. (#14086) + - Correct the name of the config option + encryption_enabled_by_default_for_room_type. (#14110) + - Update docstrings of SynapseError and FederationError to + bettter describe what they are used for and the effects of + using them are. (#14191) + - Deprecations and Removals + - Disable legacy Prometheus metric names by default. They can + still be re-enabled for now, but they will be removed + altogether in Synapse 1.73.0. (#14353) + - Internal Changes + - Run unit tests against Python 3.11. (#13812) + - Remove unused @lru_cache decorator. (#13595) + - Save login tokens in database and prevent login token reuse. + (#13844) + - Refactor OIDC tests to better mimic an actual OIDC provider. + (#13910) + - Fix type annotation causing import time error in the Complement + forking launcher. (#14084) + - Refactor MSC3030 /timestamp_to_event endpoint to loop over + federation destinations with standard pattern and error + handling. (#14096) + - Add initial power level event to batch of bulk persisted events + when creating a new room. (#14228) + - Refactor /key/ endpoints to use RestServlet classes. (#14229) + - Switch to using the matrix-org/backend-meta version of + triage-incoming for new issues in CI. (#14230) + - Build wheels on macos 11, not 10.15. (#14249) + - Add debugging to help diagnose lost device list updates. + (#14268) + - Add Rust cache to CI for trial runs. (#14287) + - Improve type hinting of RawHeaders. (#14303) + - Use Poetry 1.2.0 in the Twisted Trunk CI job. (#14305) +- follow poetry version bumps: + Jinja2 3.1.2 + Pillow 9.2.0 + prometheus-client 0.15.0 + psycopg2 2.9.5 + pysaml2 7.2.1 + sentry-sdk 1.10.1 + Authlib 0.15.1 + +------------------------------------------------------------------- +Fri Oct 28 14:48:00 UTC 2022 - Marcus Rueckert + +- Update to 1.70.1 + - Bugfixes + - Fix a bug introduced in Synapse 1.70.0rc1 where the access + tokens sent to application services as headers were + malformed. Application services which were obtaining access + tokens from query parameters were not affected. (#14301) + - Fix room creation being rate limited too aggressively since + Synapse v1.69.0. (#14314) + +------------------------------------------------------------------- +Wed Oct 26 11:56:57 UTC 2022 - Marcus Rueckert + +- Update to 1.70.0 + - Features + - Support for MSC3856: threads list API. (#13394, #14171, + #14175) + - Support for thread-specific notifications & receipts (MSC3771 + and MSC3773). (#13776, #13824, #13877, #13878, #14050, + #14140, #14159, #14163, #14174, #14222) + - Stop fetching missing prev_events after we already know their + signature is invalid. (#13816) + - Send application service access tokens as a header (and query + parameter). Implements MSC2832. (#13996) + - Ignore server ACL changes when generating pushes. Implements + MSC3786. (#13997) + - Experimental support for redirecting to an implementation of + a MSC3886 HTTP rendezvous service. (#14018) + - The /relations endpoint can now be used on workers. (#14028) + - Advertise support for Matrix 1.3 and 1.4 on + /_matrix/client/versions. (#14032, #14184) + - Improve validation of request bodies for the Device + Management and MSC2697 Device Dehyrdation client-server API + endpoints. (#14054) + - Experimental support for MSC3874. (#14148) + - Improve the validation of the following PUT endpoints: + /directory/room/{roomAlias}, /directory/list/room/{roomId} + and /directory/list/appservice/{networkId}/{roomId}. (#14179) + - Build and publish binary wheels for aarch64 platforms. + (#14212) + - Bugfixes + - Fix a bug introduced in Synapse 1.70.0rc1 where the + information returned from the /threads API could be stale + when threaded events are redacted. (#14248) + - Fix a bug introduced in Synapse 1.70.0rc1 leading to broken + outbound federation when using Python 3.7. (#14280) + - Fix a bug introduced in Synapse 1.70.0rc1 where edits to + non-message events were aggregated by the homeserver. + (#14283) + - Prevent device names from appearing in device list updates + when allow_device_name_lookup_over_federation is false. + (#10015) + - Fix a long-standing bug where redactions were not being sent + over federation if we did not have the original event. + (#13813) + - Fix a long-standing bug where edits of non-m.room.message + events would not be correctly bundled or have their new + content applied. (#14034) + - Fix a bug introduced in Synapse 1.53.0 when querying + /publicRooms with both a room_type filter and a + third_party_instance_id. (#14053) + - Fix a bug introduced in Synapse 1.35.0 where errors parsing a + /send_join or /state response would produce excessive, + low-quality Sentry events. (#14065) + - Fix a long-standing bug where Synapse would error on the + optional 'invite_room_state' field not being provided to PUT + /_matrix/federation/v2/invite/{roomId}/{eventId}. (#14083) + - Fix a bug where invalid oEmbed fields would cause the entire + response to be discarded. Introduced in Synapse 1.18.0. + (#14089) + - Fix a bug introduced in Synapse 1.37.0 in which an incorrect + key name was used for sending and receiving room metadata + when knocking on a room. (#14102) + - Fix a bug introduced in v1.69.0rc1 where the joined hosts for + a given event were not being properly cached. (#14125) + - Fix a bug introduced in Synapse 1.30.0 where purging and + rejoining a room without restarting in-between would result + in a broken room. (#14161, #14164) + - Fix MSC3030 /timestamp_to_event endpoint returning + potentially inaccurate closest events with outliers present. + (#14215) + - Updates to the Docker image + - Update the version of frozendict in Docker images and Debian + packages from 2.3.3 to 2.3.4, which may fix memory leak + problems. (#13955) + - Use the minimal Rust profile when building Synapse. (#14141) + - Prevent a class of database sharding errors when using + Dockerfile-workers to spawn multiple instances of the same + worker. Contributed by Jason Little. (#14165) + - Set LD_PRELOAD to use jemalloc memory allocator in + Dockerfile-workers. (#14182) + - Fix pre-startup logging being lost when using the + Dockerfile-workers image. (#14195) + - Improved Documentation + - Add sample worker files for pusher and federation_sender. + (#14077) + - Improve the listener example on the metrics documentation. + (#14078) + - Expand Google OpenID Connect example config to map email + attribute. Contributed by @ptman. (#14081) + - The changelog entry ending in a full stop or exclamation mark + is not optional. (#14087) + - Fix links to jemalloc documentation, which were broken in + #13491. (#14093) + - Remove not needed replication listener in docker compose + example. (#14107) + - Fix name of alias_creation_rules option in the config manual + documentation. (#14124) + - Clarify comment on event contexts. (#14145) + - Fix dead link to the Admin Registration API. (#14189) + - Deprecations and Removals + - Remove the experimental implementation of MSC3772. (#14094) + - Remove the unstable identifier for MSC3715. (#14106, #14146) + - Internal Changes + - Build ABI3 wheels for CPython. (#14253) + - For the aarch64 architecture, only build wheels for CPython + manylinux. (#14259) + - Optimise queries used to get a users rooms during sync. + Contributed by Nick @ Beeper (@Fizzadar). (#13991) + - Update authlib from 0.15.5 to 1.1.0. (#14006) + - Make parse_server_name consistent in handling invalid server + names. (#14007) + - Don't repeatedly wake up the same users for batched events. + (#14033) + - Complement test image: capture logs from nginx. (#14063) + - Don't create noisy Sentry events when a requester drops + connection to the metrics server mid-request. (#14072) + - Run the integration test suites with the asyncio reactor + enabled in CI. (#14092) + - Add debug logs to figure out why an event was filtered out of + the client response. (#14095) + - Indicate what endpoint came back with a JSON response we were + unable to parse. (#14097) + - Break up calls to fetch rooms for many users. Contributed by + Nick @ Beeper (@Fizzadar). (#14109) + - Faster joins: prioritise the server we joined by when + restarting a partial join resync. (#14126) + - Cache Rust build cache when building docker images. (#14130) + - Enable dependabot for Rust dependencies. (#14132) + - Bump typing-extensions from 4.1.1 to 4.4.0. (#14134) + - Use the minimal Rust profile when building Synapse. (#14141) + - Remove unused configuration code. (#14142) + - Prepare for the gotestfmt repository move. (#14144) + - Invalidate rooms for user caches on replicated event, fix + sync cache race in synapse workers. Contributed by Nick @ + Beeper (@Fizzadar). (#14155) + - Enable url previews when testing with complement. (#14198) + - When authenticating batched events, check for auth events in + batch as well as DB. (#14214) + - Update CI config to avoid GitHub Actions deprecation + warnings. (#14216, #14224) + - Update dependency requirements to allow building with + poetry-core 1.3.2. (#14217) + - Rename the cache_memory extra to cache-memory, 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. (#14221) + - Specify dev-dependencies using lower bounds, to reduce the + likelihood of a dependabot merge conflict. The lockfile + continues to pin to specific versions. (#14227) +- Drop https://patch-diff.githubusercontent.com/raw/matrix-org/synapse/pull/14221.patch + ------------------------------------------------------------------- Thu Oct 20 10:44:17 UTC 2022 - Marcus Rueckert diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo index 37d3585..4f1d59d 100644 --- a/matrix-synapse.obsinfo +++ b/matrix-synapse.obsinfo @@ -1,4 +1,4 @@ name: matrix-synapse -version: 1.69.0 -mtime: 1666002675 -commit: 6b097a3e17ec52b2486a91c8dcf8f8cb53f740f3 +version: 1.71.0 +mtime: 1667905176 +commit: f0dec49f01a7071296bce74557fbd6996ccf5759 diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 03da999..3bac75f 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -20,8 +20,8 @@ # NOTE: Keep this is in the same order as pyproject.toml. %if %{with use_poetry_for_dependencies} -%global Jinja2_version 3.0.3 -%global Pillow_version 9.0.1 +%global Jinja2_version 3.1.2 +%global Pillow_version 9.2.0 %global PyYAML_version 6.0 %global Twisted_version 22.4.0 %global attrs_version 21.4.0 @@ -39,7 +39,7 @@ %global msgpack_version 1.0.3 %global netaddr_version 0.8.0 %global phonenumbers_version 8.12.44 -%global prometheus_client_version 0.14.0 +%global prometheus_client_version 0.15.0 %global psutil_version 2.0.0 %global pyOpenSSL_version 22.0.0 %global pyasn1_version 0.4.8 @@ -55,11 +55,11 @@ %global unpaddedbase64_version 2.1.0 %global matrix_synapse_ldap3_version 0.2.1 %global packaging_version 21.3 -%global psycopg2_version 2.9.3 -%global pysaml2_version 7.1.2 +%global psycopg2_version 2.9.5 +%global pysaml2_version 7.2.1 %global Authlib_version 0.15.5 %global lxml_version 4.8.0 -%global sentry_sdk_version 1.5.11 +%global sentry_sdk_version 1.10.1 %global PyJWT_version 2.4.0 %global jaeger_client_version 4.8.0 %global opentracing_version 2.4.0 @@ -106,7 +106,7 @@ %global packaging_version 16.1 %global psycopg2_version 2.8 %global pysaml2_version 4.5.0 -%global Authlib_version 0.14.0 +%global Authlib_version 0.15.1 %global lxml_version 4.8.0 %global sentry_sdk_version 1.5.11 %global PyJWT_version 1.6.4 @@ -153,7 +153,7 @@ %define pkgname matrix-synapse %define eggname matrix_synapse Name: %{pkgname} -Version: 1.69.0 +Version: 1.71.0 Release: 0 Summary: Matrix protocol reference homeserver License: Apache-2.0 @@ -173,7 +173,6 @@ Source51: matrix-synapse-generate-config.sh Source99: series Patch: matrix-synapse-1.4.1-paths.patch Patch1: bump-dependencies.patch -Patch2: 14221.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 diff --git a/vendor.tar.xz b/vendor.tar.xz index fcb9f2a..5a839fe 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e56bbffe91d34ac7ad65dc1e760f8f41ae8de5aa0f791f29e7a46b2727318573 -size 6992060 +oid sha256:88c040f062ddddeebde88c692809458bf52bde7493470eba6c52b913f10cda14 +size 7040164