From 8f61bdb470f89f17ad74df6ccf16fbcea7159480 Mon Sep 17 00:00:00 2001 From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Date: Fri, 26 Sep 2025 12:43:07 +0100 Subject: [PATCH] Note optional Element Commecial License in SPDX specifiers (#18973) --- README.rst | 2 ++ changelog.d/18973.misc | 1 + debian/changelog | 8 ++++++++ debian/copyright | 2 +- docker/Dockerfile | 2 +- pyproject.toml | 2 +- 6 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 changelog.d/18973.misc diff --git a/README.rst b/README.rst index 92854f631c..d10b662d1a 100644 --- a/README.rst +++ b/README.rst @@ -265,6 +265,8 @@ This software is dual-licensed by New Vector Ltd (Element). It can be used eithe Unless required by applicable law or agreed to in writing, software distributed under the Licenses is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licenses for the specific language governing permissions and limitations under the Licenses. +Please contact `licensing@element.io `_ to purchase an Element commercial license for this software. + .. |support| image:: https://img.shields.io/badge/matrix-community%20support-success :alt: (get community support in #synapse:matrix.org) diff --git a/changelog.d/18973.misc b/changelog.d/18973.misc new file mode 100644 index 0000000000..e88fd74795 --- /dev/null +++ b/changelog.d/18973.misc @@ -0,0 +1 @@ +Note that the code is additionally licensed under the [Element Commercial license](https://github.com/element-hq/synapse/blob/develop/LICENSE-COMMERCIAL) in SPDX expression field configs. \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 41d173ce55..6c476674f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +matrix-synapse-py3 (1.139.0~rc3+nmu1) UNRELEASED; urgency=medium + + * The licensing specifier has been updated to add an optional + `LicenseRef-Element-Commercial` license. The code was already licensed in + this manner - the debian metadata was just not updated to reflect it. + + -- Synapse Packaging team Thu, 25 Sep 2025 12:17:17 +0100 + matrix-synapse-py3 (1.139.0~rc3) stable; urgency=medium * New Synapse release 1.139.0rc3. diff --git a/debian/copyright b/debian/copyright index 9e407ce425..9814133edf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,7 @@ License: Apache-2.0 Files: * Copyright: 2023 New Vector Ltd -License: AGPL-3.0-or-later +License: AGPL-3.0-or-later or LicenseRef-Element-Commercial Files: synapse/config/saml2.py Copyright: 2015, Ericsson diff --git a/docker/Dockerfile b/docker/Dockerfile index 7a8e57c230..727bc8bf5d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -174,7 +174,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.url='https://github.com/element-hq/synapse' LABEL org.opencontainers.image.documentation='https://element-hq.github.io/synapse/latest/' LABEL org.opencontainers.image.source='https://github.com/element-hq/synapse.git' -LABEL org.opencontainers.image.licenses='AGPL-3.0-or-later' +LABEL org.opencontainers.image.licenses='AGPL-3.0-or-later OR LicenseRef-Element-Commercial' # On the runtime image, /lib is a symlink to /usr/lib, so we need to copy the # libraries to the right place, else the `COPY` won't work. diff --git a/pyproject.toml b/pyproject.toml index 7f58386087..c9f81850f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -104,7 +104,7 @@ name = "matrix-synapse" version = "1.139.0rc3" description = "Homeserver for the Matrix decentralised comms protocol" authors = ["Matrix.org Team and Contributors "] -license = "AGPL-3.0-or-later" +license = "AGPL-3.0-or-later OR LicenseRef-Element-Commercial" readme = "README.rst" repository = "https://github.com/element-hq/synapse" packages = [