From f65f316bc32e3013830c7f814d8c781971dc2708 Mon Sep 17 00:00:00 2001 From: Will Lewis <1543626+wrjlewis@users.noreply.github.com> Date: Wed, 13 Dec 2023 14:47:34 +0000 Subject: [PATCH 1/7] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index e0fdce361..96057256d 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ Synapse |support| |development| |documentation| |license| |pypi| |python| ========================================================================= -Synapse is now actively maintained at `vector-im/synapse `_ +Synapse is now actively maintained at `element-hq/synapse `_ ================================================================================================= Synapse is an open-source `Matrix `_ homeserver developed From d58dd1d1ff283d14ada805c72aa0b704087ac9b4 Mon Sep 17 00:00:00 2001 From: Will Lewis <1543626+wrjlewis@users.noreply.github.com> Date: Wed, 13 Dec 2023 14:50:56 +0000 Subject: [PATCH 2/7] Update README.rst (cherry picked from commit be65a8ec0195955c15fdb179c9158b187638e39a) --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index 96057256d..e1fe2fdc1 100644 --- a/README.rst +++ b/README.rst @@ -14,6 +14,8 @@ additionally you have the choice of `other Matrix homeservers `_ blog post for more information. +========================================================================= + Briefly, Matrix is an open standard for communications on the internet, supporting federation, encryption and VoIP. Matrix.org has more to say about the `goals of the Matrix project `_, and the `formal specification From e9eba0870d6b97ccebf88d72d91fce36d73edba5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 13 Dec 2023 14:55:25 +0000 Subject: [PATCH 3/7] Revert changes to README --- README.rst | 17 ++++------------- synapse/__init__.py | 12 ------------ 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/README.rst b/README.rst index e1fe2fdc1..4a9042964 100644 --- a/README.rst +++ b/README.rst @@ -2,19 +2,10 @@ Synapse |support| |development| |documentation| |license| |pypi| |python| ========================================================================= -Synapse is now actively maintained at `element-hq/synapse `_ -================================================================================================= - -Synapse is an open-source `Matrix `_ homeserver developed -from 2019 through 2023 as part of the Matrix.org Foundation. The Matrix.org -Foundation is not able to resource maintenance of Synapse and it -`continues to be developed by Element `_; -additionally you have the choice of `other Matrix homeservers `_. - -See `The future of Synapse and Dendrite `_ -blog post for more information. - -========================================================================= +Synapse is an open-source `Matrix `_ homeserver written and +maintained by the Matrix.org Foundation. We began rapid development in 2014, +reaching v1.0.0 in 2019. Development on Synapse and the Matrix protocol itself continues +in earnest today. Briefly, Matrix is an open standard for communications on the internet, supporting federation, encryption and VoIP. Matrix.org has more to say about the `goals of the diff --git a/synapse/__init__.py b/synapse/__init__.py index e21ba6e18..4a9bbc4d5 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -29,18 +29,6 @@ from synapse.util.stringutils import strtobool # Allow truncated JPEG images to be thumbnailed. ImageFile.LOAD_TRUNCATED_IMAGES = True -# Update your remotes folks. -announcement = """ -Synapse is no longer being developed under the matrix-org organization. See the -README.rst for more details. - -Please update your git remote to pull from element-hq/synapse: - - git remote set-url origin git@github.com:element-hq/synapse.git -""" -print(announcement) -sys.exit(1) - # Check that we're not running on an unsupported Python version. # # Note that we use an (unneeded) variable here so that pyupgrade doesn't nuke the From 32d824160b20d2587deec10a55f1113108e828b3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 11 Jan 2024 16:25:16 +0000 Subject: [PATCH 4/7] Update license in Debian metadata (#16807) --- debian/changelog | 6 ++++++ debian/copyright | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index cb183146a..bca3ab92c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.99.0~rc1ubuntu1) UNRELEASED; urgency=medium + + * Fix copyright file with new licensing + + -- Synapse Packaging team Thu, 11 Jan 2024 13:47:29 +0000 + matrix-synapse-py3 (1.99.0~rc1) stable; urgency=medium * New Synapse release 1.99.0rc1. diff --git a/debian/copyright b/debian/copyright index 03e176876..9e407ce42 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,6 +6,10 @@ Files: * Copyright: 2014-2017, OpenMarket Ltd, 2017-2018 New Vector Ltd License: Apache-2.0 +Files: * +Copyright: 2023 New Vector Ltd +License: AGPL-3.0-or-later + Files: synapse/config/saml2.py Copyright: 2015, Ericsson License: Apache-2.0 From febef5595c03aab31819da394df21babc6b26e71 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 16 Jan 2024 12:06:22 +0000 Subject: [PATCH 5/7] 1.99.0 --- CHANGES.md | 14 ++++++++++++++ debian/changelog | 5 +++-- pyproject.toml | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d6f3d7cf3..fe17b81e1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,17 @@ +# Synapse 1.99.0 (2024-01-16) + +Synapse 1.99.0 is the first Synapse release under an AGPLv3.0 licence (with +CLA, for proprietary dual licensing). You can read more about this here: + + - https://matrix.org/blog/2023/11/06/future-of-synapse-dendrite/ + - https://element.io/blog/synapse-now-lives-at-github-com-element-hq-synapse/ + +To arrange an AGPL license exception, please contact +[licensing@element.io](mailto:licensing@element.io). + +No significant changes since 1.99.0rc1. + + # Synapse 1.99.0rc1 (2024-01-09) ### Features diff --git a/debian/changelog b/debian/changelog index bca3ab92c..8f1f7bb4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -matrix-synapse-py3 (1.99.0~rc1ubuntu1) UNRELEASED; urgency=medium +matrix-synapse-py3 (1.99.0) stable; urgency=medium * Fix copyright file with new licensing + * New Synapse release 1.99.0. - -- Synapse Packaging team Thu, 11 Jan 2024 13:47:29 +0000 + -- Synapse Packaging team Tue, 16 Jan 2024 11:58:34 +0000 matrix-synapse-py3 (1.99.0~rc1) stable; urgency=medium diff --git a/pyproject.toml b/pyproject.toml index 24791aa0a..6b5672416 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust" [tool.poetry] name = "matrix-synapse" -version = "1.99.0rc1" +version = "1.99.0" description = "Homeserver for the Matrix decentralised comms protocol" authors = ["Matrix.org Team and Contributors "] license = "AGPL-3.0-or-later" From 5a18f8f94a198f8d83f4fee946e8451caacf8b8e Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 16 Jan 2024 13:59:42 +0000 Subject: [PATCH 6/7] Fix link and remove email from changelog. --- CHANGES.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index fe17b81e1..90134d973 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,10 +4,7 @@ Synapse 1.99.0 is the first Synapse release under an AGPLv3.0 licence (with CLA, for proprietary dual licensing). You can read more about this here: - https://matrix.org/blog/2023/11/06/future-of-synapse-dendrite/ - - https://element.io/blog/synapse-now-lives-at-github-com-element-hq-synapse/ - -To arrange an AGPL license exception, please contact -[licensing@element.io](mailto:licensing@element.io). + - https://element.io/blog/element-to-adopt-agplv3/ No significant changes since 1.99.0rc1. From 7d57c2cb2bd81a191f019f5055019fe108dd5b49 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 16 Jan 2024 14:05:36 +0000 Subject: [PATCH 7/7] Fix text and add second link --- CHANGES.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 90134d973..010424e07 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,10 +1,11 @@ # Synapse 1.99.0 (2024-01-16) -Synapse 1.99.0 is the first Synapse release under an AGPLv3.0 licence (with -CLA, for proprietary dual licensing). You can read more about this here: +Synapse 1.99.0 is the first Synapse release under an AGPLv3.0 licence (with CLA to enable Element to sell AGPL +exceptions). You can read more about this here: - https://matrix.org/blog/2023/11/06/future-of-synapse-dendrite/ - https://element.io/blog/element-to-adopt-agplv3/ + - https://element.io/blog/synapse-now-lives-at-github-com-element-hq-synapse/ No significant changes since 1.99.0rc1.