diff --git a/_service b/_service index 556dd9c..4bf485a 100644 --- a/_service +++ b/_service @@ -4,11 +4,11 @@ @PARENT_TAG@ https://github.com/matrix-org/synapse.git git - v1.49.2 + v1.50.2 v(.*) \1 diff --git a/dont-bump-cryptography-with-system-openssl.patch b/dont-bump-cryptography-with-system-openssl.patch index aaf3bcb..97b9806 100644 --- a/dont-bump-cryptography-with-system-openssl.patch +++ b/dont-bump-cryptography-with-system-openssl.patch @@ -2,7 +2,16 @@ Index: synapse/synapse/python_dependencies.py =================================================================== --- synapse.orig/synapse/python_dependencies.py +++ synapse/synapse/python_dependencies.py -@@ -85,7 +85,8 @@ REQUIREMENTS = [ +@@ -51,7 +51,7 @@ REQUIREMENTS = [ + # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0 + "jsonschema>=3.0.0", + # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41 +- "frozendict>=1,<2.1.2", ++ "frozendict>=2.1.3", + "unpaddedbase64>=1.1.0", + "canonicaljson>=1.4.0", + # we use the type definitions added in signedjson 1.1. +@@ -86,7 +86,8 @@ REQUIREMENTS = [ "typing-extensions>=3.7.4", # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. @@ -10,5 +19,5 @@ Index: synapse/synapse/python_dependencies.py + # opensuse we do not bump here as we do not use the intree copy + "cryptography", "ijson>=3.1", + "matrix-common==1.0.0", ] - diff --git a/matrix-synapse-1.4.1-paths.patch b/matrix-synapse-1.4.1-paths.patch index 0beffa1..cac156d 100644 --- a/matrix-synapse-1.4.1-paths.patch +++ b/matrix-synapse-1.4.1-paths.patch @@ -15,7 +15,7 @@ Index: synapse/synapse/config/key.py =================================================================== --- synapse.orig/synapse/config/key.py +++ synapse/synapse/config/key.py -@@ -102,7 +102,7 @@ class KeyConfig(Config): +@@ -104,7 +104,7 @@ class KeyConfig(Config): signing_key_path = config.get("signing_key_path") if signing_key_path is None: signing_key_path = os.path.join( @@ -24,7 +24,7 @@ Index: synapse/synapse/config/key.py ) self.signing_key = self.read_signing_keys(signing_key_path, "signing_key") -@@ -169,7 +169,7 @@ class KeyConfig(Config): +@@ -171,7 +171,7 @@ class KeyConfig(Config): def generate_config_section( self, config_dir_path, server_name, generate_secrets=False, **kwargs ): @@ -63,7 +63,7 @@ Index: synapse/synapse/config/tls.py =================================================================== --- synapse.orig/synapse/config/tls.py +++ synapse/synapse/config/tls.py -@@ -151,7 +151,7 @@ class TlsConfig(Config): +@@ -152,7 +152,7 @@ class TlsConfig(Config): """If the TLS paths are not specified the default will be certs in the config directory""" diff --git a/matrix-synapse-1.49.2.obscpio b/matrix-synapse-1.49.2.obscpio deleted file mode 100644 index 0d99873..0000000 --- a/matrix-synapse-1.49.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74df94e6e16214271cd8fec2a6bc6b5eb86089caf91ed29cf70e73ac814d8c55 -size 31988237 diff --git a/matrix-synapse-1.50.2.obscpio b/matrix-synapse-1.50.2.obscpio new file mode 100644 index 0000000..7c92633 --- /dev/null +++ b/matrix-synapse-1.50.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8df8ffedc0dc147b52e4f3d9f978a3afea9e0b5d0b970873104faf3c32547bf3 +size 32085005 diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec index 45cc8e2..3ecd56b 100644 --- a/matrix-synapse-test.spec +++ b/matrix-synapse-test.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ %define pkgname matrix-synapse Name: %{pkgname}-test -Version: 1.49.2 +Version: 1.50.2 Release: 0 Summary: Test package for %{pkgname} License: Apache-2.0 diff --git a/matrix-synapse.changes b/matrix-synapse.changes index 7cc9143..b0f3f81 100644 --- a/matrix-synapse.changes +++ b/matrix-synapse.changes @@ -1,3 +1,188 @@ +------------------------------------------------------------------- +Mon Jan 24 14:41:42 UTC 2022 - Marcus Rueckert + +- Update to 1.50.2 + + Please note that we now only support Python 3.7+ and PostgreSQL + 10+ (if applicable), because Python 3.6 and PostgreSQL 9.6 have + reached end-of-life. + + - Bugfixes + - Fix a bug introduced in Synapse 1.40.0 that caused Synapse to + fail to process incoming federation traffic after handling a + large amount of events in a v1 room. (#11806) + +------------------------------------------------------------------- +Tue Jan 18 17:11:16 UTC 2022 - Marcus Rueckert + +- Update to 1.50.1 + + Please note that we now only support Python 3.7+ and PostgreSQL + 10+ (if applicable), because Python 3.6 and PostgreSQL 9.6 have + reached end-of-life. + + - Bugfixes: + - Fix a bug introduced in Synapse 1.50.0rc1 that could cause + Matrix clients to be unable to connect to Synapse instances + with the webclient resource enabled. (#11764) + +------------------------------------------------------------------- +Tue Jan 18 16:24:25 UTC 2022 - Marcus Rueckert + +- you shall not commit your python 3.10 test. Back to 3.8 + +------------------------------------------------------------------- +Tue Jan 18 11:57:01 UTC 2022 - Marcus Rueckert + +- bump minimum python in the BuildRequires to 3.8 + +------------------------------------------------------------------- +Tue Jan 18 11:53:13 UTC 2022 - Marcus Rueckert + +- Update to 1.50.0 + + Please note that we now only support Python 3.7+ and PostgreSQL + 10+ (if applicable), because Python 3.6 and PostgreSQL 9.6 have + reached end-of-life. + + - Features + - Allow guests to send state events per MSC3419. (#11378) + - Add experimental support for part of MSC3202: allowing + application services to masquerade as specific devices. + (#11538) + - Add admin API to get users' account data. (#11664) + - Include the room topic in the stripped state included with + invites and knocking. (#11666) + - Send and handle cross-signing messages using the stable + prefix. (#10520) + - Support unprefixed versions of fallback key property names. + (#11541) + - Bugfixes + - Fix a bug introduced in Synapse v1.0.0 whereby some device + list updates would not be sent to remote homeservers if there + were too many to send at once. (#11729) + - Fix a bug introduced in Synapse v1.50.0rc1 whereby outbound + federation could fail because too many EDUs were produced for + device updates. (#11730) + - Fix a long-standing bug where relations from other rooms + could be included in the bundled aggregations of an event. + (#11516) + - Fix a long-standing bug which could cause AssertionErrors to + be written to the log when Synapse was restarted after + purging events from the database. (#11536, #11642) + - Fix a bug introduced in Synapse 1.17.0 where a pusher created + for an email with capital letters would fail to be created. + (#11547) + - Fix a long-standing bug where responses included bundled + aggregations when they should not, per MSC2675. (#11592, + #11623) + - Fix a long-standing bug that some unknown endpoints would + return HTML error pages instead of JSON M_UNRECOGNIZED + errors. (#11602) + - Fix a bug introduced in Synapse 1.19.3 which could sometimes + cause AssertionErrors when backfilling rooms over federation. + (#11632) + - Improved Documentation + - Document that now the minimum supported PostgreSQL version is + 10. (#11725) + - Update Synapse install command for FreeBSD as the package is + now prefixed with py38. Contributed by @itchychips. (#11267) + - Document the usage of refresh tokens. (#11427) + - Add details for how to configure a TURN server when behind a + NAT. Contibuted by @AndrewFerr. (#11553) + - Add references for using Postgres to the Docker + documentation. (#11640) + - Fix the documentation link in newly-generated configuration + files. (#11678) + - Correct the documentation for nginx to use a case-sensitive + url pattern. Fixes an error introduced in v1.21.0. (#11680) + - Clarify SSO mapping provider documentation by writing def or + async def before the names of methods, as appropriate. + (#11681) + - Deprecations and Removals + - Replace mock package by its standard library version. + (#11588) + - Drop support for Python 3.6 and Ubuntu 18.04. (#11633) + - Internal Changes + - Fix a typechecker problem related to our (ab)use of + nacl.signing.SigningKeys. (#11714) + - Allow specific, experimental events to be created without + prev_events. Used by MSC2716. (#11243) + - A test helper (wait_for_background_updates) no longer depends + on classes defining a store property. (#11331) + - Add type hints to synapse.appservice. (#11360) + - Add missing type hints to synapse.config module. (#11480) + - Add test to ensure we share the same state_group across the + whole historical batch when using the MSC2716 /batch_send + endpoint. (#11487) + - Refactor tests.util.setup_test_homeserver and + tests.server.setup_test_homeserver. (#11503) + - Move glob_to_regex and re_word_boundary to + matrix-python-common. (#11505, #11687) + - Use HTTPStatus constants in place of literals in + tests.rest.client.test_auth. (#11520) + - Add a receipt types constant for m.read. (#11531) + - Clean up synapse.rest.admin. (#11535) + - Add missing errcode to parse_string and parse_boolean. + (#11542) + - Use HTTPStatus constants in place of literals in + synapse.http. (#11543) + - Add missing type hints to storage classes. (#11546, #11549, + #11551, #11555, #11575, #11589, #11594, #11652, #11653, + #11654, #11657) + - Fix an inaccurate and misleading comment in the /sync code. + (#11550) + - Add missing type hints to synapse.logging.context. (#11556) + - Stop populating unused database column + state_events.prev_state. (#11558) + - Minor efficiency improvements in event persistence. (#11560) + - Add some safety checks that storage functions are used + correctly. (#11564, #11580) + - Make get_device return None if the device doesn't exist + rather than raising an exception. (#11565) + - Split the HTML parsing code from the URL preview resource + code. (#11566) + - Remove redundant COALESCE()s around COUNT()s in database + queries. (#11570) + - Add missing type hints to synapse.http. (#11571) + - Add MSC2716 and MSC3030 to /versions -> unstable_features to + detect server support. (#11582) + - Add type hints to synapse/tests/rest/admin. (#11590) + - Drop end-of-life Python 3.6 and Postgres 9.6 from CI. + (#11595) + - Update black version and run it on all the files. (#11596) + - Add opentracing type stubs and fix associated mypy errors. + (#11603, #11622) + - Improve OpenTracing support for requests which use a + ResponseCache. (#11607) + - Improve OpenTracing support for incoming HTTP requests. + (#11618) + - A number of improvements to opentracing support. (#11619) + - Refactor the way that the outlier flag is set on events + received over federation. (#11634) + - Improve the error messages from get_create_event_for_room. + (#11638) + - Remove redundant get_current_events_token method. (#11643) + - Convert namedtuples to attrs. (#11665, #11574) + - Update the /capabilities response to include whether support + for MSC3440 is available. (#11690) + - Send the Accept header in HTTP requests made using + SimpleHttpClient.get_json. (#11677) + - Work around Mjolnir compatibility issue by adding an import + for glob_to_regex in synapse.util, where it moved from. + (#11696) + +------------------------------------------------------------------- +Fri Jan 7 22:44:45 UTC 2022 - Marcus Rueckert + +- use frozendict >= 2.1.3 as it should fix the issue people saw on + debian and that library version fixes other python modules for us + +------------------------------------------------------------------- +Tue Dec 28 03:45:30 UTC 2021 - Aleksa Sarai + +- Add explicit minimum versions for more dependencies. + ------------------------------------------------------------------- Tue Dec 21 18:39:09 UTC 2021 - Marcus Rueckert diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo index 3190e82..553c931 100644 --- a/matrix-synapse.obsinfo +++ b/matrix-synapse.obsinfo @@ -1,5 +1,4 @@ name: matrix-synapse -version: 1.49.2 -mtime: 1640108494 -commit: 6b6dcdc338a3fcfa1da6c3e2a38f62c268df1cbc - +version: 1.50.2 +mtime: 1643031440 +commit: 36f37acf538ae7b2e9ca9927fd3c561f581d4ee0 diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 83a2134..9002122 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,6 +39,7 @@ %if 0%{?suse_version} >= 1550 %define use_python python38 +#define __python3 #{_bindir}/python3 %else %define use_python python3 %endif @@ -47,7 +48,7 @@ %define pkgname matrix-synapse %define eggname matrix_synapse Name: %{pkgname} -Version: 1.49.2 +Version: 1.50.2 Release: 0 Summary: Matrix protocol reference homeserver License: Apache-2.0 @@ -68,7 +69,7 @@ Patch1: dont-bump-cryptography-with-system-openssl.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.5 +BuildRequires: %{use_python}-base >= 3.8 BuildRequires: %{use_python}-setuptools BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -79,7 +80,7 @@ BuildRequires: unzip %{?systemd_ordering} %{sysusers_requires} %requires_eq %{use_python}-base -# NOTE: Keep this is in the same order as synapse/python_dependencie.py. +# NOTE: Keep this is in the same order as synapse/python_dependencies.py. BuildRequires: %{use_python}-Jinja2 >= 2.9 %requires_eq %{use_python}-Jinja2 BuildRequires: %{use_python}-Pillow >= 4.3.0 @@ -98,9 +99,9 @@ BuildRequires: %{use_python}-bleach >= 1.4.3 %requires_eq %{use_python}-bleach BuildRequires: %{use_python}-canonicaljson >= 1.4.0 %requires_eq %{use_python}-canonicaljson -BuildRequires: %{use_python}-cryptography +BuildRequires: %{use_python}-cryptography >= 3.4.7 %requires_eq %{use_python}-cryptography -BuildRequires: (%{use_python}-frozendict >= 1 with %{use_python}-frozendict < 2.1.2) +BuildRequires: %{use_python}-frozendict >= 2.1.3 %requires_eq %{use_python}-frozendict BuildRequires: %{use_python}-idna >= 2.5 %requires_eq %{use_python}-idna @@ -108,6 +109,8 @@ BuildRequires: %{use_python}-ijson >= 3.1 %requires_eq %{use_python}-ijson BuildRequires: %{use_python}-jsonschema >= 3.0.0 %requires_eq %{use_python}-jsonschema +BuildRequires: %{use_python}-matrix_common >= 1.0.0 +%requires_eq %{use_python}-matrix_common BuildRequires: %{use_python}-msgpack >= 0.5.2 %requires_eq %{use_python}-msgpack BuildRequires: %{use_python}-netaddr >= 0.7.18 @@ -171,12 +174,12 @@ BuildRequires: %{use_python}-opentracing >= 2.2.0 %requires_eq %{use_python}-opentracing %endif %if %{with synapse_redis} -BuildRequires: %{use_python}-hiredis +BuildRequires: %{use_python}-hiredis >= 1.0.1 +%requires_eq %{use_python}-hiredis BuildRequires: %{use_python}-txredisapi >= 1.4.7 -Requires: %{use_python}-hiredis -Requires: %{use_python}-txredisapi +%requires_eq %{use_python}-txredisapi %endif -BuildRequires: %{use_python}-Pympler +BuildRequires: %{use_python}-Pympler >= 0.8 %requires_eq %{use_python}-Pympler BuildArch: noarch # We only provide/obsolete python2 to ensure that users upgrade.