From 2b14e2bd3d8d6637000df1b8ae3ea9dd35a36632c9cd45b27370fa51fd37c44f Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Thu, 10 Feb 2022 11:34:54 +0000 Subject: [PATCH] Accepting request 950937 from home:darix:apps - With the previous change we would not need use_python anymore because we also can find now the packages that provide python3-X But i keep the conditional around for e.g. testing with python 3.10. - Replace requires_eq with requires_peq: (boo#1195316) The only difference between the 2 macros is that the new macro also considers provides so we can track package names over renames. - Update to 1.51.0 Synapse 1.51.0 deprecates webclient listeners and non-HTTP(S) web_client_locations. Support for these will be removed in Synapse 1.53.0, at which point Synapse will not be capable of directly serving a web client for Matrix. See the upgrade notes. - Features - Add track_puppeted_user_ips config flag to record client IP addresses against puppeted users, and include the puppeted users in monthly active user counts. (#11561, #11749, #11757) - Include whether the requesting user has participated in a thread when generating a summary for MSC3440. (#11577) - Return an M_FORBIDDEN error code instead of M_UNKNOWN when a spam checker module prevents a user from creating a room. (#11672) - Add a flag to the synapse_review_recent_signups script to ignore and filter appservice users. (#11675, #11770) - 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) OBS-URL: https://build.opensuse.org/request/show/950937 OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/matrix-synapse?expand=0&rev=206 --- _service | 4 +- matrix-synapse-1.50.2.obscpio | 3 - matrix-synapse-1.51.0.obscpio | 3 + matrix-synapse-test.spec | 2 +- matrix-synapse.changes | 134 ++++++++++++++++++++++++++++++++++ matrix-synapse.obsinfo | 6 +- matrix-synapse.spec | 102 +++++++++++++------------- 7 files changed, 195 insertions(+), 59 deletions(-) delete mode 100644 matrix-synapse-1.50.2.obscpio create mode 100644 matrix-synapse-1.51.0.obscpio diff --git a/_service b/_service index 4bf485a..9061d8a 100644 --- a/_service +++ b/_service @@ -4,11 +4,11 @@ @PARENT_TAG@ https://github.com/matrix-org/synapse.git git - v1.50.2 + v1.51.0 v(.*) \1 diff --git a/matrix-synapse-1.50.2.obscpio b/matrix-synapse-1.50.2.obscpio deleted file mode 100644 index 7c92633..0000000 --- a/matrix-synapse-1.50.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8df8ffedc0dc147b52e4f3d9f978a3afea9e0b5d0b970873104faf3c32547bf3 -size 32085005 diff --git a/matrix-synapse-1.51.0.obscpio b/matrix-synapse-1.51.0.obscpio new file mode 100644 index 0000000..8f8836a --- /dev/null +++ b/matrix-synapse-1.51.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6a564f5784388b1a6f53986cf7da82f614284b6461c1e59368fae5aee5bd191 +size 32129037 diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec index 3ecd56b..cf50d28 100644 --- a/matrix-synapse-test.spec +++ b/matrix-synapse-test.spec @@ -27,7 +27,7 @@ %define pkgname matrix-synapse Name: %{pkgname}-test -Version: 1.50.2 +Version: 1.51.0 Release: 0 Summary: Test package for %{pkgname} License: Apache-2.0 diff --git a/matrix-synapse.changes b/matrix-synapse.changes index b0f3f81..0d67a1b 100644 --- a/matrix-synapse.changes +++ b/matrix-synapse.changes @@ -1,3 +1,137 @@ +------------------------------------------------------------------- +Thu Feb 3 12:08:51 UTC 2022 - Marcus Rueckert + +- With the previous change we would not need use_python anymore + because we also can find now the packages that provide python3-X + + But i keep the conditional around for e.g. testing with python + 3.10. + +------------------------------------------------------------------- +Thu Feb 3 12:04:47 UTC 2022 - Marcus Rueckert + +- Replace requires_eq with requires_peq: (boo#1195316) + The only difference between the 2 macros is that the new macro + also considers provides so we can track package names over + renames. + +------------------------------------------------------------------- +Tue Jan 25 13:44:47 UTC 2022 - Marcus Rueckert + +- Update to 1.51.0 + + Synapse 1.51.0 deprecates webclient listeners and non-HTTP(S) + web_client_locations. Support for these will be removed in + Synapse 1.53.0, at which point Synapse will not be capable of + directly serving a web client for Matrix. See the upgrade notes. + + - Features + - Add track_puppeted_user_ips config flag to record client IP + addresses against puppeted users, and include the puppeted + users in monthly active user counts. (#11561, #11749, #11757) + - Include whether the requesting user has participated in a + thread when generating a summary for MSC3440. (#11577) + - Return an M_FORBIDDEN error code instead of M_UNKNOWN when a + spam checker module prevents a user from creating a room. + (#11672) + - Add a flag to the synapse_review_recent_signups script to + ignore and filter appservice users. (#11675, #11770) + - 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) + - Fix a long-standing issue which could cause Synapse to + incorrectly accept data in the unsigned field of events + - received over federation. (#11530) + - Fix a long-standing bug where Synapse wouldn't cache a + response indicating that a remote user has no devices. + (#11587) + - Fix an error that occurs whilst trying to get the federation + status of a destination server that was working normally. + This admin API was newly introduced in Synapse v1.49.0. + (#11593) + - Fix bundled aggregations not being included in the /sync + response, per MSC2675. (#11612, #11659, #11791) + - Fix the /_matrix/client/v1/room/{roomId}/hierarchy endpoint + returning incorrect fields which have been present since + Synapse 1.49.0. (#11667) + - Fix preview of some GIF URLs (like tenor.com). Contributed by + Philippe Daouadi. (#11669) + - Fix a bug where only the first 50 rooms from a space were + returned from the /hierarchy API. This has existed since the + introduction of the API in Synapse v1.41.0. (#11695) + - Fix a bug introduced in Synapse v1.18.0 where password reset + and address validation emails would not be sent if their + subject was configured to use the 'app' template variable. + Contributed by @br4nnigan. (#11710, #11745) + - Make the 'List Rooms' Admin API sort stable. Contributed by + Daniël Sonck. (#11737) + - Fix a long-standing bug where space hierarchy over federation + would only work correctly some of the time. (#11775) + - Fix a bug introduced in Synapse v1.46.0 that prevented + on_logged_out module callbacks from being correctly awaited + by Synapse. (#11786) + - Improved Documentation + - Warn against using a Let's Encrypt certificate for TLS/DTLS + TURN server client connections, and suggest using ZeroSSL + certificate instead. This works around client-side + connectivity errors caused by WebRTC libraries that reject + Let's Encrypt certificates. Contibuted by @AndrewFerr. + (#11686) + - Document the new SYNAPSE_TEST_PERSIST_SQLITE_DB environment + variable in the contributing guide. (#11715) + - Document that the minimum supported PostgreSQL version is now + 10. (#11725) + - Fix typo in demo docs: differnt. (#11735) + - Update room spec URL in config files. (#11739) + - Mention python3-venv and libpq-dev dependencies in the + contribution guide. (#11740) + - Update documentation for configuring login with Facebook. + (#11755) + - Update installation instructions to note that Python 3.6 is + no longer supported. (#11781) + - Deprecations and Removals + - Remove the unstable /send_relation endpoint. (#11682) + - Remove python_twisted_reactor_pending_calls Prometheus + metric. (#11724) + - Remove the password_hash field from the response dictionaries + of the Users Admin API. (#11576) + - Deprecate support for webclient listeners and non-HTTP(S) + web_client_location configuration. (#11774, #11783) + - Internal Changes + - Run pyupgrade --py37-plus --keep-percent-format on Synapse. + (#11685) + - Use buildkit's cache feature to speed up docker builds. + (#11691) + - Use auto_attribs and native type hints for attrs classes. + (#11692, #11768) + - Remove debug logging for #4422, which has been closed since + Synapse 0.99. (#11693) + - Remove fallback code for Python 2. (#11699) + - Add a test for an edge case in the /sync logic. (#11701) + - Add the option to write SQLite test dbs to disk when running + tests. (#11702) + - Improve Complement test output for Gitub Actions. (#11707) + - Fix docstring on add_account_data_for_user. (#11716) + - Complement environment variable name change and update + .gitignore. (#11718) + - Simplify calculation of Prometheus metrics for garbage + collection. (#11723) + - Improve accuracy of python_twisted_reactor_tick_time + Prometheus metric. (#11724, #11771) + - Minor efficiency improvements when inserting many values into + the database. (#11742) + - Invite PR authors to give themselves credit in the changelog. + (#11744) + - Add optional debugging to investigate issue 8631. (#11760) + - Remove log_function utility function and its uses. (#11761) + - Add a unit test that checks both client and webclient + resources will function when simultaneously enabled. (#11765) + - Allow overriding complement commit using COMPLEMENT_REF. + (#11766) + - Add some comments and type annotations for + _update_outliers_txn. (#11776) + ------------------------------------------------------------------- Mon Jan 24 14:41:42 UTC 2022 - Marcus Rueckert diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo index 553c931..bf98367 100644 --- a/matrix-synapse.obsinfo +++ b/matrix-synapse.obsinfo @@ -1,4 +1,4 @@ name: matrix-synapse -version: 1.50.2 -mtime: 1643031440 -commit: 36f37acf538ae7b2e9ca9927fd3c561f581d4ee0 +version: 1.51.0 +mtime: 1643110952 +commit: 343d4f13d8cb9f813097267216eaa0a74935b4ca diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 9002122..aea1a3a 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -16,6 +16,8 @@ # +%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") + # These come from matrix-synapse's CONDITIONAL_REQUIREMENTS. # missing deps %if 0%{?suse_version} >= 1550 @@ -37,18 +39,18 @@ # https://github.com/matrix-org/synapse/releases or synapse/CHANGES.md # * Commit+submit -%if 0%{?suse_version} >= 1550 -%define use_python python38 +#if 0%{?suse_version} >= 1550 +#define use_python python3 #define __python3 #{_bindir}/python3 -%else +#else %define use_python python3 -%endif +#endif %define modname synapse %define pkgname matrix-synapse %define eggname matrix_synapse Name: %{pkgname} -Version: 1.50.2 +Version: 1.51.0 Release: 0 Summary: Matrix protocol reference homeserver License: Apache-2.0 @@ -79,108 +81,108 @@ BuildRequires: sysuser-tools BuildRequires: unzip %{?systemd_ordering} %{sysusers_requires} -%requires_eq %{use_python}-base +%requires_peq %{use_python}-base # NOTE: Keep this is in the same order as synapse/python_dependencies.py. BuildRequires: %{use_python}-Jinja2 >= 2.9 -%requires_eq %{use_python}-Jinja2 +%requires_peq %{use_python}-Jinja2 BuildRequires: %{use_python}-Pillow >= 4.3.0 -%requires_eq %{use_python}-Pillow +%requires_peq %{use_python}-Pillow BuildRequires: %{use_python}-PyNaCl >= 1.2.1 -%requires_eq %{use_python}-PyNaCl +%requires_peq %{use_python}-PyNaCl BuildRequires: %{use_python}-PyYAML >= 3.11 -%requires_eq %{use_python}-PyYAML +%requires_peq %{use_python}-PyYAML BuildRequires: %{use_python}-Twisted >= 20.3.0 -%requires_eq %{use_python}-Twisted +%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) -%requires_eq %{use_python}-attrs +%requires_peq %{use_python}-attrs BuildRequires: %{use_python}-bcrypt >= 3.2.0 -%requires_eq %{use_python}-bcrypt +%requires_peq %{use_python}-bcrypt BuildRequires: %{use_python}-bleach >= 1.4.3 -%requires_eq %{use_python}-bleach +%requires_peq %{use_python}-bleach BuildRequires: %{use_python}-canonicaljson >= 1.4.0 -%requires_eq %{use_python}-canonicaljson +%requires_peq %{use_python}-canonicaljson BuildRequires: %{use_python}-cryptography >= 3.4.7 -%requires_eq %{use_python}-cryptography +%requires_peq %{use_python}-cryptography BuildRequires: %{use_python}-frozendict >= 2.1.3 -%requires_eq %{use_python}-frozendict +%requires_peq %{use_python}-frozendict BuildRequires: %{use_python}-idna >= 2.5 -%requires_eq %{use_python}-idna +%requires_peq %{use_python}-idna BuildRequires: %{use_python}-ijson >= 3.1 -%requires_eq %{use_python}-ijson +%requires_peq %{use_python}-ijson BuildRequires: %{use_python}-jsonschema >= 3.0.0 -%requires_eq %{use_python}-jsonschema +%requires_peq %{use_python}-jsonschema BuildRequires: %{use_python}-matrix_common >= 1.0.0 -%requires_eq %{use_python}-matrix_common +%requires_peq %{use_python}-matrix_common BuildRequires: %{use_python}-msgpack >= 0.5.2 -%requires_eq %{use_python}-msgpack +%requires_peq %{use_python}-msgpack BuildRequires: %{use_python}-netaddr >= 0.7.18 -%requires_eq %{use_python}-netaddr +%requires_peq %{use_python}-netaddr BuildRequires: %{use_python}-phonenumbers >= 8.2.0 -%requires_eq %{use_python}-phonenumbers +%requires_peq %{use_python}-phonenumbers BuildRequires: %{use_python}-prometheus_client >= 0.4.0 -%requires_eq %{use_python}-prometheus_client +%requires_peq %{use_python}-prometheus_client BuildRequires: %{use_python}-psutil >= 2.0.0 -%requires_eq %{use_python}-psutil +%requires_peq %{use_python}-psutil BuildRequires: %{use_python}-pyOpenSSL >= 16.0.0 -%requires_eq %{use_python}-pyOpenSSL +%requires_peq %{use_python}-pyOpenSSL BuildRequires: %{use_python}-pyasn1 >= 0.1.9 -%requires_eq %{use_python}-pyasn1 +%requires_peq %{use_python}-pyasn1 BuildRequires: %{use_python}-pyasn1-modules >= 0.0.7 -%requires_eq %{use_python}-pyasn1-modules +%requires_peq %{use_python}-pyasn1-modules BuildRequires: %{use_python}-pymacaroons >= 0.13.0 -%requires_eq %{use_python}-pymacaroons +%requires_peq %{use_python}-pymacaroons BuildRequires: %{use_python}-service_identity >= 18.1.0 -%requires_eq %{use_python}-service_identity +%requires_peq %{use_python}-service_identity BuildRequires: %{use_python}-signedjson >= 1.1.0 -%requires_eq %{use_python}-signedjson +%requires_peq %{use_python}-signedjson BuildRequires: %{use_python}-six >= 1.10 -%requires_eq %{use_python}-six +%requires_peq %{use_python}-six BuildRequires: %{use_python}-sortedcontainers >= 1.4.4 -%requires_eq %{use_python}-sortedcontainers +%requires_peq %{use_python}-sortedcontainers BuildRequires: %{use_python}-systemd >= 231 -%requires_eq %{use_python}-systemd +%requires_peq %{use_python}-systemd BuildRequires: %{use_python}-typing_extensions >= 3.7.4 -%requires_eq %{use_python}-typing_extensions +%requires_peq %{use_python}-typing_extensions BuildRequires: %{use_python}-treq >= 15.1 -%requires_eq %{use_python}-treq +%requires_peq %{use_python}-treq BuildRequires: %{use_python}-unpaddedbase64 >= 1.1.0 -%requires_eq %{use_python}-unpaddedbase64 +%requires_peq %{use_python}-unpaddedbase64 # Specify all CONDITIONAL_REQUIREMENTS (we Require them to avoid no-recommends # breaking very commonly-used bits of matrix-synapse such as postgresql). %if %{with synapse_ldap} BuildRequires: %{use_python}-matrix-synapse-ldap3 >= 0.1 -%requires_eq %{use_python}-matrix-synapse-ldap3 +%requires_peq %{use_python}-matrix-synapse-ldap3 %endif BuildRequires: %{use_python}-psycopg2 >= 2.8 -%requires_eq %{use_python}-psycopg2 +%requires_peq %{use_python}-psycopg2 BuildRequires: %{use_python}-pysaml2 >= 4.5.0 -%requires_eq %{use_python}-pysaml2 +%requires_peq %{use_python}-pysaml2 %if %{with synapse_oidc} BuildRequires: %{use_python}-Authlib >= 0.15.1 -%requires_eq %{use_python}-Authlib +%requires_peq %{use_python}-Authlib %endif BuildRequires: %{use_python}-lxml >= 3.5.0 -%requires_eq %{use_python}-lxml +%requires_peq %{use_python}-lxml %if %{with synapse_sentry} BuildRequires: %{use_python}-sentry-sdk >= 0.7.2 -%requires_eq %{use_python}-sentry-sdk +%requires_peq %{use_python}-sentry-sdk %endif BuildRequires: %{use_python}-PyJWT >= 1.6.4 -%requires_eq %{use_python}-PyJWT +%requires_peq %{use_python}-PyJWT %if %{with synapse_opentracing} BuildRequires: %{use_python}-jaeger-client >= 4.0.0 -%requires_eq %{use_python}-jaeger-client +%requires_peq %{use_python}-jaeger-client BuildRequires: %{use_python}-opentracing >= 2.2.0 -%requires_eq %{use_python}-opentracing +%requires_peq %{use_python}-opentracing %endif %if %{with synapse_redis} BuildRequires: %{use_python}-hiredis >= 1.0.1 -%requires_eq %{use_python}-hiredis +%requires_peq %{use_python}-hiredis BuildRequires: %{use_python}-txredisapi >= 1.4.7 -%requires_eq %{use_python}-txredisapi +%requires_peq %{use_python}-txredisapi %endif BuildRequires: %{use_python}-Pympler >= 0.8 -%requires_eq %{use_python}-Pympler +%requires_peq %{use_python}-Pympler BuildArch: noarch # We only provide/obsolete python2 to ensure that users upgrade. Obsoletes: python2-matrix-synapse < %{version}-%{release}