From 442a97a46e2cd287e6e2830ded63d087bedef396 Mon Sep 17 00:00:00 2001 From: Elie Gambache Date: Sun, 1 Nov 2026 16:26:43 +0200 Subject: [PATCH] chore(license): move to the Zayit Public License, drop the CLA The Zayit Public License is the AGPL v3 plus a grant back (in the spirit of Qt's former QPL): whoever conveys a modified version, offers it over a network or submits a contribution licenses those modifications to the maintainer under any terms. That covers forks too, so the CLA, its bot and its workflow are removed; the DCO sign-off stays. The attribution term is kept, and a trademark clause is added. Signed-off-by: Elie Gambache --- .github/workflows/cla.yaml | 30 ------- CLA.md | 60 -------------- CONTRIBUTING.md | 41 ++++------ LICENSE | 145 +++++++++++++++++++++++++++------ README.MD | 6 +- core/build.gradle.kts | 4 +- dao/build.gradle.kts | 4 +- delta-updater/build.gradle.kts | 2 +- 8 files changed, 144 insertions(+), 148 deletions(-) delete mode 100644 .github/workflows/cla.yaml delete mode 100644 CLA.md diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml deleted file mode 100644 index 7048181ba..000000000 --- a/.github/workflows/cla.yaml +++ /dev/null @@ -1,30 +0,0 @@ -name: CLA - -# Every contributor signs CLA.md once, by commenting on a pull request; the signatures are kept on the cla-signatures -# branch (CLA Assistant Lite). -on: - issue_comment: - types: [created] - pull_request_target: - types: [opened, closed, synchronize] - -permissions: - actions: write - contents: write - pull-requests: write - statuses: write - -jobs: - cla: - name: Check CLA signature - runs-on: ubuntu-latest - steps: - - if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' - uses: contributor-assistant/github-action@v2.6.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - path-to-document: https://github.com/kdroidFilter/SeforimLibrary/blob/master/CLA.md - path-to-signatures: signatures/version1/cla.json - branch: cla-signatures - allowlist: kdroidFilter,dependabot[bot],github-actions[bot] diff --git a/CLA.md b/CLA.md deleted file mode 100644 index 2173de053..000000000 --- a/CLA.md +++ /dev/null @@ -1,60 +0,0 @@ -# Zayit Individual Contributor License Agreement - -Version 1.0 - -Thank you for contributing to Zayit (the "Project"), maintained by Elie Gambache (the "Maintainer"). The Project -includes this repository, SeforimLibrary, and the other repositories of Zayit. This Contributor -License Agreement ("Agreement") states the terms under which you ("You") contribute to the Project. It does not -transfer your copyright: You keep it, and You may use your Contributions for any other purpose. - -Sign it once by commenting on your first pull request as the CLA bot asks; it then covers all your Contributions. - -## 1. Definitions - -- **"Contribution"**: any original work of authorship, including code, documentation, translations and data, and any - modification of the Project, that You submit to the Project in any form (pull request, patch, issue, email...). -- **"Submit"**: any form of electronic, verbal or written communication sent to the Project or the Maintainer for - inclusion in the Project. - -## 2. Copyright license - -You grant the Maintainer, and any recipient of software distributed by the Maintainer, a perpetual, worldwide, -non-exclusive, no-charge, royalty-free, irrevocable license to reproduce, prepare derivative works of, publicly -display, publicly perform, sublicense and distribute your Contributions and such derivative works, **under any license -terms, including proprietary terms**, in addition to the GNU AGPL v3 (with its §7(b) attribution term) under which the -Project is published. - -This lets the Maintainer distribute the Project's official builds together with proprietary modules (see "Open core" -in [Zayit's README](https://github.com/kdroidFilter/Zayit#open-core)) and change the Project's license in the future. - -## 3. Patent license - -You grant the Maintainer, and any recipient of software distributed by the Maintainer, a perpetual, worldwide, -non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have made, use, offer to sell, sell, -import and otherwise transfer your Contributions, where such license applies only to the patent claims licensable by -You that are necessarily infringed by your Contribution alone or by its combination with the Project. - -## 4. Your representations - -You represent that: - -- each Contribution is your original creation, or You have the right to Submit it under this Agreement (and You - identify in it any third-party work and its license); -- if your employer has rights to intellectual property You create, You have received permission to make the - Contribution on its behalf, or your employer has waived such rights; -- to your knowledge, your Contribution does not infringe any third party's rights. - -## 5. The Project's commitment - -The Maintainer will keep publishing the Project's core under an open source license. Your Contribution may be part of -the official builds, which can include proprietary modules. - -## 6. No warranty - -Unless required by applicable law or agreed in writing, You provide your Contributions "AS IS", without warranties or -conditions of any kind. You are not expected to provide support for your Contributions. - -## 7. Notice - -You agree to notify the Maintainer of any facts or circumstances of which You become aware that would make these -representations inaccurate in any respect. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7537a7ddd..396ac8b6e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,42 +6,31 @@ keep the project clean and legally clear. ## License of your contributions (inbound = outbound) -SeforimLibrary, like Zayit, is licensed under the **GNU AGPL v3** together with the **additional -attribution term** under Section 7(b) of that license (the "Powered by the -technologies that drive Zayit — https://zayitapp.com/" requirement). See +SeforimLibrary, like Zayit, is licensed under the **Zayit Public License**: the GNU AGPL v3, +plus a grant back to the maintainer, the "Powered by the technologies that drive +Zayit — https://zayitapp.com/" attribution and a trademark clause. See [`LICENSE`](LICENSE) for the full text. -By submitting a contribution (pull request, patch, or any other form), you agree -that your contribution is licensed under the same terms as the project, namely -the GNU AGPL v3 **and** the additional attribution term under Section 7(b), and -under the Contributor License Agreement below. +By submitting a contribution (pull request, patch, or any other form), you +license it under the same terms as the project. There is no CLA to sign. -## Contributor License Agreement (CLA) +## Open core and the grant back -Zayit is **open core** (see "Open core" in -[Zayit's README](https://github.com/kdroidFilter/Zayit#open-core)): its core, -SeforimLibrary included, is free under the AGPL v3, and its official builds also -include proprietary modules, such as the smart siddur. So that your contribution can be part of those builds, -you sign the [Zayit Contributor License Agreement](CLA.md) once: +Zayit is **open core** (see "Open core" in [Zayit's README](https://github.com/kdroidFilter/Zayit#open-core)): its core, SeforimLibrary included, is +free under the Zayit Public License, and its official builds also include +proprietary modules, such as the smart siddur. Section 3 of the license lets +your contribution be part of those builds too: - You **keep the copyright** on your contribution — there is no copyright assignment. -- You grant the maintainer a broad license on it, which allows distributing it - under other terms too (including with proprietary modules), and a patent - license. - -On your first pull request, the CLA bot asks you to sign by commenting: - -``` -I have read the CLA Document and I hereby sign the CLA -``` - -Your signature covers all your later pull requests. A CI check blocks a pull -request until all its authors have signed. +- By submitting it (or by distributing a modified version, in a fork for + instance), you grant the maintainer a broad license on it, which allows + distributing it under other terms too (including with proprietary modules), + and a patent license. ## Developer Certificate of Origin (DCO) -Every commit must also be signed off under the +Every commit must be signed off under the [Developer Certificate of Origin 1.1](https://developercertificate.org/). By signing off, you certify that you wrote the code or otherwise have the right to submit it under the project's license. diff --git a/LICENSE b/LICENSE index ae11b3976..6d625e472 100644 --- a/LICENSE +++ b/LICENSE @@ -1,39 +1,136 @@ ================================================================================ -ADDITIONAL TERMS pursuant to Section 7 of the GNU AGPL v3 + ZAYIT PUBLIC LICENSE + Version 1.0 ================================================================================ -Copyright (C) 2025 Elie Gambache. +SPDX identifier: LicenseRef-Zayit-PL-1.0 -This program is licensed under the GNU Affero General Public License, version 3 -(the full text of which follows below). In accordance with Section 7 of that -license, the following ADDITIONAL TERMS apply and must be preserved in all -copies, modified versions, and derivative works of this software: +Copyright (C) 2025-2026 Elie Gambache. - ATTRIBUTION REQUIREMENT (AGPL v3, §7b) +PREAMBLE - Any use, reproduction, modification, or distribution of this software, or of - any work derived from it in whole or in part, must conspicuously display the - following attribution: +Zayit is open core: its core is free software, and its official builds also +include proprietary modules. This license keeps the core under the terms of the +GNU Affero General Public License, version 3, so that anyone can use, study, +modify and share it, and so that every modified version, including one offered +over a network, stays free. - "Powered by the technologies that drive Zayit — https://zayitapp.com/" +In exchange, and in the spirit of the Q Public License under which Qt was once +published, whoever distributes a modified version of the Software gives the +original author the right to reuse those modifications in Zayit's official +builds, without having to sign anything. - This requirement applies to every form of use of the source code or any - portion thereof, INCLUDING BUT NOT LIMITED TO its ingestion, processing, or - reuse by an automated system, a machine-learning model, or a large language - model (LLM). Any output, derivative work, or product generated with the - assistance of such a system that incorporates or is based on this code must - carry the attribution above. +This license is not the GNU AGPL and is not endorsed by the Free Software +Foundation. It uses the unmodified text of the GNU AGPL v3, reproduced at the +end of this file, as its base terms and adds the terms below. - The attribution must appear in a location reasonably visible to end users - (for example, an application "About" screen, the project documentation, or - source-file headers) and must not be removed, hidden, or obscured. +1. DEFINITIONS -These additional terms are authorized by Section 7 of the GNU AGPL v3 and form -an integral part of the license governing this software. The full text of the -GNU Affero General Public License, version 3, follows. + "Licensor": Elie Gambache, and any successor or assignee of the Licensor's + rights in the Software. -================================================================================ + "Software": the work that the Licensor distributes under this License, in + source or object form, and any part of it. Modules that the Licensor + distributes under other terms are not part of the Software. + + "Modification": any change to, addition to or deletion from the Software, + and any work based on the Software within the meaning of the Base Terms. + + "Modified Version": the Software together with one or more Modifications. + + "Convey" and "Propagate": as defined in the GNU AGPL v3. + + "Submit": to send a Modification to the Licensor or to the Software's + official repository, in any form (pull request, patch, issue, email...), + with a view to its inclusion in the Software. + + "You": the person or entity exercising rights under this License. + +2. BASE TERMS + +The Licensor grants You the rights of the GNU Affero General Public License, +version 3 (the "Base Terms"), whose unmodified text is reproduced at the end of +this file, subject to Sections 3 to 5 of this License. For this purpose: + + a) Every reference in the Base Terms to "this License" means this Zayit + Public License, and the Software is "the Program". + + b) You may Convey the Software and any Modified Version, and make them + available under Section 13 of the Base Terms, only under this License. + The option of the Base Terms to use any later version of the GNU AGPL + does not apply. + + c) Sections 3 to 5 of this License are conditions of the license granted to + You, not "further restrictions" or "additional terms" within the meaning + of Sections 7 and 10 of the Base Terms: no recipient may remove them. + + d) In case of conflict between the Base Terms and Sections 3 to 5 of this + License, Sections 3 to 5 prevail. + +3. GRANT BACK TO THE LICENSOR + +When You Convey a Modified Version, make it available to users interacting +with it remotely through a computer network, or Submit a Modification, You +grant the Licensor, for each of Your Modifications it contains: + + a) Copyright. A perpetual, worldwide, non-exclusive, no-charge, + royalty-free, irrevocable license to reproduce, prepare derivative works + of, publicly display, publicly perform, distribute and sublicense Your + Modifications and such derivative works, under any terms, including + proprietary terms, in addition to this License. + b) Patents. A perpetual, worldwide, non-exclusive, no-charge, royalty-free, + irrevocable license, under the patent claims licensable by You that are + necessarily infringed by Your Modifications alone or by their combination + with the Software, to make, have made, use, offer to sell, sell, import + and otherwise transfer Your Modifications as part of any work distributed + by the Licensor. + +You represent that You have the right to grant these licenses. If a +Modification includes a third party's work, You identify it and its license, +and these grants cover only what You have the right to grant. + +These grants do not require You to send Your Modifications to the Licensor. +They cover any copy of them that the Licensor obtains lawfully, for instance as +a recipient of Your Modified Version, through the source code offered under +Section 13 of the Base Terms, or from a public repository. + +The licenses granted under this Section remain in force even after this +License terminates for You. + +4. ATTRIBUTION + +Any use, reproduction, modification or distribution of the Software, or of any +work derived from it in whole or in part, must conspicuously display the +following attribution: + + "Powered by the technologies that drive Zayit — https://zayitapp.com/" + +This requirement applies to every form of use of the source code or any +portion thereof, including its ingestion, processing or reuse by an automated +system, a machine-learning model or a large language model. Any output, +derivative work or product generated with the assistance of such a system that +incorporates or is based on the Software must carry the attribution above. + +The attribution must appear in a location reasonably visible to end users (for +example an application "About" screen, the project documentation or +source-file headers) and must not be removed, hidden or obscured. + +5. TRADEMARKS + +This License grants no right to use the names "Zayit" or "זית", their logos, +or any other trademark of the Licensor, except as required to comply with +Section 4 and to describe the origin of the Software. A Modified Version +Conveyed to the public must not be presented as an official build of Zayit. + +6. DISCLAIMER AND LIMITATION OF LIABILITY + +Sections 15 and 16 of the GNU AGPL v3 (Disclaimer of Warranty, Limitation of +Liability) apply to the Software and to this License. + +================================================================================ +BASE TERMS: the GNU Affero General Public License, version 3, unmodified. +================================================================================ GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 diff --git a/README.MD b/README.MD index 0c648a320..81d976b34 100644 --- a/README.MD +++ b/README.MD @@ -158,14 +158,14 @@ Outputs (by default): `build/seforim.db` + `build/catalog.pb` ## Contributing -Please read [`CONTRIBUTING.md`](CONTRIBUTING.md) first. In short: contributions are licensed under the same terms as the project (AGPL v3 + the §7b attribution term), you keep your copyright, you sign the [CLA](CLA.md) once (the bot asks on your first pull request), and every commit must be signed off (`git commit -s`, DCO). +Please read [`CONTRIBUTING.md`](CONTRIBUTING.md) first. In short: contributions are licensed under the same terms as the project (the Zayit Public License), you keep your copyright, there is no CLA to sign, and every commit must be signed off (`git commit -s`, DCO). ## License -SeforimLibrary is part of [Zayit](https://github.com/kdroidFilter/Zayit) and is published under the **[AGPL v3](LICENSE)**, with an additional attribution term (AGPL v3, §7b): any use, reproduction, modification, or distribution of this software, or of any work derived from it, must conspicuously display: +SeforimLibrary is part of [Zayit](https://github.com/kdroidFilter/Zayit) and is published under the **[Zayit Public License](LICENSE)**: the GNU AGPL v3, plus a grant back to the maintainer, an attribution term and a trademark clause. Its attribution term (Section 4): any use, reproduction, modification, or distribution of this software, or of any work derived from it, must conspicuously display: > Powered by the technologies that drive Zayit — https://zayitapp.com/ See the top of [`LICENSE`](LICENSE) for the full text. -Like Zayit, it is **open core**: the [CLA](CLA.md) also lets the maintainer distribute contributions under other terms, including in Zayit's official builds with their proprietary modules (see "Open core" in [Zayit's README](https://github.com/kdroidFilter/Zayit#open-core)). +Like Zayit, it is **open core**: Section 3 of the license (the grant back) also lets the maintainer distribute contributions, and the modifications of any fork, under other terms, including in Zayit's official builds with their proprietary modules (see "Open core" in [Zayit's README](https://github.com/kdroidFilter/Zayit#open-core)). diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 563767222..44cf74a0e 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -55,8 +55,8 @@ mavenPublishing { licenses { license { - name = "MIT" - url = "https://opensource.org/licenses/MIT" + name = "Zayit Public License 1.0" + url = "https://github.com/kdroidFilter/SeforimLibrary/blob/master/LICENSE" } } diff --git a/dao/build.gradle.kts b/dao/build.gradle.kts index c8e42a0a2..d858cf1b5 100644 --- a/dao/build.gradle.kts +++ b/dao/build.gradle.kts @@ -66,8 +66,8 @@ mavenPublishing { licenses { license { - name = "MIT" - url = "https://opensource.org/licenses/MIT" + name = "Zayit Public License 1.0" + url = "https://github.com/kdroidFilter/SeforimLibrary/blob/master/LICENSE" } } diff --git a/delta-updater/build.gradle.kts b/delta-updater/build.gradle.kts index 225443327..6c6a86f21 100644 --- a/delta-updater/build.gradle.kts +++ b/delta-updater/build.gradle.kts @@ -14,7 +14,7 @@ mavenPublishing { description = "Client-side delta updater for seforim.db" url = "github url" licenses { - license { name = "MIT"; url = "https://opensource.org/licenses/MIT" } + license { name = "Zayit Public License 1.0"; url = "https://github.com/kdroidFilter/SeforimLibrary/blob/master/LICENSE" } } developers { developer { id = ""; name = ""; email = "" } } scm { url = "github url" }