diff --git a/CHANGELOG.md b/CHANGELOG.md index ac5519d..ac8bc29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file. - **MeshChat utils**: **`convert_propagation_node_state_to_string`** maps **`LXMRouter.PR_PATH_TIMEOUT`** to **`path_timeout`** so the API can report path timeouts distinctly from other failures. - **Auto-announce / intervals**: Refactor around **`interval_action_due`** in **`meshchat.py`** to simplify when auto-announce and propagation sync checks run; add tests for auto-announce behaviour. - **Android runtime integration**: Added Android app startup hardening for Chaquopy and WebView, including startup retries, in-app startup errors, runtime permission flow (audio/Bluetooth/notifications), selectable error text, launcher icon integration, and release minification rules for APK builds. +- **Licensing**: Relicensed Quad4-owned portions under **0BSD** and kept upstream **Reticulum MeshChat** portions under their original **MIT** notice in **`LICENSE`**. ### Frontend and UX diff --git a/CONTRIBUTING b/CONTRIBUTING index 8db6df9..5da85f6 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -47,10 +47,22 @@ Lastly, be patient. - No need to run linting or formatting. - No need to add a test or run the test suite. +## Licensing of contributions + +By submitting a patch, you agree that your contribution is licensed under the same terms as the file or files it modifies, as recorded by the per-file SPDX headers and the repository `LICENSE`: + +- Contributions to project-owned files (SPDX `0BSD`) are licensed under 0BSD. +- Contributions to upstream-derived files (SPDX `MIT` or `0BSD AND MIT`) are licensed under MIT, so the upstream license obligations are preserved. +- New files you author and add to the project are licensed under 0BSD unless you explicitly mark them otherwise in the patch. + +You also confirm that you have the right to submit the contribution under these terms (for example, it is your own work, or you have permission from the copyright holder), and that you are not knowingly introducing code under an incompatible license. + ## Generative AI policy You may use generative AI tools when contributing, on the condition that your setup actually supplies the model with enough context to produce sound work: relevant files, constraints, failing tests, and project conventions. Vague prompts and thin context lead to wrong or generic patches; that burden is on the contributor, not the reviewers. +You must disclose AI usage in the patch message body (or commit message, if you prefer): state which tools or services you used in a material way for that change (for example, model or product name, and whether it was local or cloud). If a change was written without meaningful AI assistance, say so briefly. This is so reviewers can judge scope and provenance; it is not a substitute for your own review and testing. + We prefer models that run locally or offline when that is practical for you. Contributions must still be yours to justify and maintain. Do not submit bulk-generated changes you have not read, understood, and tested. We are not looking for unreviewed AI output or style-only churn from tools used without engineering/architectural judgment. \ No newline at end of file diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 4528b10..2f28173 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,4 +1,4 @@ Reticulum MeshChatX Contributors -Sudo-Ivan +Ivan torlando-tech diff --git a/LEGAL.md b/LEGAL.md new file mode 100644 index 0000000..e8cc196 --- /dev/null +++ b/LEGAL.md @@ -0,0 +1,25 @@ +# Legal + +## Legal Inquiries + +For legal inquiries related to Reticulum MeshChatX, contact: + +- `legal@quad4.io` + +## Licensing + +Project-owned portions are licensed under 0BSD. +Original upstream portions from Reticulum MeshChat remain under MIT. + +See [`LICENSE`](LICENSE) for full license text and notices. + +## Attribution + +MeshChatX is a derivative of the original Reticulum MeshChat project by Liam Cottle. +Attribution to the original author and project is maintained in this repository and on the official website: [meshchatx.com](https://meshchatx.com/). + +## License Scope Tooling + +This project uses `scripts/license_scope_mapper.go` to assist with per-file SPDX labeling based on automated similarity scoring against upstream sources. + +The tool is a labeling assistant, not a legal determination of derivative-work status. \ No newline at end of file diff --git a/LICENSE b/LICENSE index 10fa9d8..9826091 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,24 @@ -MIT License +BSD Zero Clause License (0BSD) + +Copyright (C) 2026 Quad4 (modifications and additions only; +upstream Reticulum MeshChat portions remain under the MIT notice below) + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +------------------------------------------------------------------------- +This project is a derivative of Reticulum MeshChat by Liam Cottle. +The original portions are subject to the following notice: Copyright (c) 2024 Liam Cottle -Copyright (c) 2026 Quad4 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 2711839..0f04070 100644 --- a/README.md +++ b/README.md @@ -300,6 +300,7 @@ For release consistency, keep version fields aligned where required (`package.js Security and integrity details: - [`SECURITY.md`](SECURITY.md) +- [`LEGAL.md`](LEGAL.md) - Built-in integrity checks and HTTPS/WSS defaults in app runtime - CI scanning workflows in `.gitea/workflows/` @@ -334,3 +335,9 @@ No other code changes are required. The app, language selector, and tests all di - [Liam Cottle](https://github.com/liamcottle) - Original Reticulum MeshChat - [RFnexus](https://github.com/RFnexus) - micron parser JavaScript work - [markqvist](https://github.com/markqvist) - Reticulum, LXMF, LXST + +## License + +Project-owned portions are licensed under 0BSD. +Original upstream portions from Reticulum MeshChat remain under MIT. +See [`LICENSE`](LICENSE) for full text and notices. diff --git a/SECURITY.md b/SECURITY.md index 6545546..0dda078 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,6 +6,8 @@ If you discover a security vulnerability or have concerns about the security of 1. **LXMF**: `7cc8d66b4f6a0e0e49d34af7f6077b5a` +For legal inquiries (non-security), contact `legal@quad4.io` or see [`LEGAL.md`](LEGAL.md). + ## Security Overview Reticulum MeshChatX is designed with a high degree of security and privacy in mind, leveraging multiple layers of protection and modern security practices. diff --git a/android/README.md b/android/README.md index ff24551..2c862e9 100644 --- a/android/README.md +++ b/android/README.md @@ -49,4 +49,12 @@ This project keeps Android-specific Chaquopy recipes in `android/chaquopy-recipe - `bcrypt-5` - Purpose: tracks attempted upgrade path to desktop-equivalent bcrypt. - - Status: currently not enabled in Android app dependencies; `bcrypt==3.1.7` remains pinned for stable APK builds. \ No newline at end of file + - Status: currently not enabled in Android app dependencies; `bcrypt==3.1.7` remains pinned for stable APK builds. + +## License + +This directory is part of the main project licensing split: +- project-owned portions: 0BSD +- original upstream MeshChat portions: MIT + +See [`../LICENSE`](../LICENSE) for full text and notices. \ No newline at end of file diff --git a/forge.config.js b/forge.config.js index 7d599cf..e1435a5 100644 --- a/forge.config.js +++ b/forge.config.js @@ -36,7 +36,7 @@ module.exports = { name: "@electron-forge/maker-deb", config: { options: { - maintainer: "Sudo-Ivan", + maintainer: "Quad4", homepage: "https://git.quad4.io/RNS-Things/MeshChatX", categories: ["Network"], }, diff --git a/lang/README.de.md b/lang/README.de.md index 2898a57..ae7a3f3 100644 --- a/lang/README.de.md +++ b/lang/README.de.md @@ -8,7 +8,7 @@ Dieses Projekt ist unabhaengig vom originalen Reticulum MeshChat und steht in ke - Website: [meshchatx.com](https://meshchatx.com) - Quellcode: [git.quad4.io/RNS-Things/MeshChatX](https://git.quad4.io/RNS-Things/MeshChatX) -- Offizieller Spiegel: [github.com/Sudo-Ivan/MeshChatX](https://github.com/Sudo-Ivan/MeshChatX) – derzeit auch fuer Windows- und macOS-Builds genutzt. +- Offizieller Spiegel: [github.com/Quad4/MeshChatX](https://github.com/Quad4/MeshChatX) – derzeit auch fuer Windows- und macOS-Builds genutzt. - Releases: [git.quad4.io/RNS-Things/MeshChatX/releases](https://git.quad4.io/RNS-Things/MeshChatX/releases) - Aenderungsprotokoll: [`CHANGELOG.md`](../CHANGELOG.md) - TODO: [Boards](https://git.quad4.io/RNS-Things/MeshChatX/projects) @@ -150,11 +150,11 @@ Dieselbe Seite erscheint in der in-app-**Dokumentation** (MeshChatX-Docs), wenn Die Emoji-Auswahl rendert Standard-Unicode-Emoji mit den Systemschriften (Electron/Chromium). Wenn Emoji als leere Kaestchen („Tofu“) erscheinen, installieren Sie ein Farb-Emoji-Paket und starten Sie die App neu. -| Distribution (Beispiele) | Paket | -| ---------------------------- | --------------------------------------------------------------------- | -| Arch Linux, Artix, Manjaro | `noto-fonts-emoji` (`sudo pacman -S noto-fonts-emoji`) | -| Debian, Ubuntu | `fonts-noto-color-emoji` (`sudo apt install fonts-noto-color-emoji`) | -| Fedora | `google-noto-emoji-color-fonts` | +| Distribution (Beispiele) | Paket | +| -------------------------- | -------------------------------------------------------------------- | +| Arch Linux, Artix, Manjaro | `noto-fonts-emoji` (`sudo pacman -S noto-fonts-emoji`) | +| Debian, Ubuntu | `fonts-noto-color-emoji` (`sudo apt install fonts-noto-color-emoji`) | +| Fedora | `google-noto-emoji-color-fonts` | Nach der Installation bei Bedarf `fc-cache -fv` ausfuehren. Optional: `noto-fonts` fuer breitere Symbolabdeckung bei minimalen Installationen. @@ -330,3 +330,9 @@ Keine weiteren Code-Aenderungen noetig. App, Sprachwahl und Tests lesen Locales - [Liam Cottle](https://github.com/liamcottle) - Originales Reticulum MeshChat - [RFnexus](https://github.com/RFnexus) - Micron-Parser (JavaScript) - [markqvist](https://github.com/markqvist) - Reticulum, LXMF, LXST + +## Lizenz + +Die projekt-eigenen Anteile stehen unter 0BSD. +Urspruengliche Upstream-Anteile von MeshChat bleiben unter MIT. +Vollstaendiger Text und Hinweise in [`../LICENSE`](../LICENSE). diff --git a/lang/README.it.md b/lang/README.it.md index 5471039..c53182b 100644 --- a/lang/README.it.md +++ b/lang/README.it.md @@ -8,7 +8,7 @@ Questo progetto e indipendente dal progetto originale Reticulum MeshChat e non e - Sito web: [meshchatx.com](https://meshchatx.com) - Codice sorgente: [git.quad4.io/RNS-Things/MeshChatX](https://git.quad4.io/RNS-Things/MeshChatX) -- Mirror ufficiale: [github.com/Sudo-Ivan/MeshChatX](https://github.com/Sudo-Ivan/MeshChatX) — usato anche per le build Windows e macOS al momento. +- Mirror ufficiale: [github.com/Quad4/MeshChatX](https://github.com/Quad4/MeshChatX) — usato anche per le build Windows e macOS al momento. - Release: [git.quad4.io/RNS-Things/MeshChatX/releases](https://git.quad4.io/RNS-Things/MeshChatX/releases) - Changelog: [`CHANGELOG.md`](../CHANGELOG.md) - TODO: [Boards](https://git.quad4.io/RNS-Things/MeshChatX/projects) @@ -150,11 +150,11 @@ La stessa pagina compare nell'elenco **Documentazione** in-app (documentazione M Il selettore emoji mostra gli emoji Unicode standard usando i font di sistema (Electron/Chromium). Se compaiono quadrati vuoti ("tofu"), installate un pacchetto emoji a colori e riavviate l'app. -| Famiglia (esempi) | Pacchetto | -| -------------------------- | ------------------------------------------------------------------------- | -| Arch Linux, Artix, Manjaro | `noto-fonts-emoji` (`sudo pacman -S noto-fonts-emoji`) | -| Debian, Ubuntu | `fonts-noto-color-emoji` (`sudo apt install fonts-noto-color-emoji`) | -| Fedora | `google-noto-emoji-color-fonts` | +| Famiglia (esempi) | Pacchetto | +| -------------------------- | -------------------------------------------------------------------- | +| Arch Linux, Artix, Manjaro | `noto-fonts-emoji` (`sudo pacman -S noto-fonts-emoji`) | +| Debian, Ubuntu | `fonts-noto-color-emoji` (`sudo apt install fonts-noto-color-emoji`) | +| Fedora | `google-noto-emoji-color-fonts` | Dopo l'installazione, eseguite `fc-cache -fv` se i glifi non compaiono fino al prossimo accesso. Opzionale: `noto-fonts` per una copertura simboli più ampia su installazioni minime. @@ -330,3 +330,9 @@ Nessun altra modifica al codice e necessaria. App, selettore lingua e test scopr - [Liam Cottle](https://github.com/liamcottle) - Reticulum MeshChat originale - [RFnexus](https://github.com/RFnexus) - Parser Micron (JavaScript) - [markqvist](https://github.com/markqvist) - Reticulum, LXMF, LXST + +## Licenza + +Le parti di proprieta del progetto sono rilasciate sotto 0BSD. +Le parti originali upstream derivate da MeshChat restano sotto MIT. +Per testo completo e note, vedi [`../LICENSE`](../LICENSE). diff --git a/lang/README.ja.md b/lang/README.ja.md index 42aa6a9..a50f04a 100644 --- a/lang/README.ja.md +++ b/lang/README.ja.md @@ -8,7 +8,7 @@ Liam Cottle 氏による Reticulum MeshChat を大幅に改修・機能拡張し - ウェブサイト: [meshchatx.com](https://meshchatx.com) - ソースコード: [git.quad4.io/RNS-Things/MeshChatX](https://git.quad4.io/RNS-Things/MeshChatX) -- 公式ミラー: [github.com/Sudo-Ivan/MeshChatX](https://github.com/Sudo-Ivan/MeshChatX) — 現時点では Windows / macOS ビルドにも使用。 +- 公式ミラー: [github.com/Quad4/MeshChatX](https://github.com/Quad4/MeshChatX) — 現時点では Windows / macOS ビルドにも使用。 - リリース: [git.quad4.io/RNS-Things/MeshChatX/releases](https://git.quad4.io/RNS-Things/MeshChatX/releases) - 変更履歴: [`CHANGELOG.md`](../CHANGELOG.md) - TODO: [Boards](https://git.quad4.io/RNS-Things/MeshChatX/projects) @@ -150,11 +150,11 @@ poetry run python -m meshchatx.meshchat --headless --host 127.0.0.1 絵文字ピッカーはシステムフォント（Electron/Chromium）で標準 Unicode 絵文字を描画します。絵文字が空の四角（「豆腐」）になる場合はカラー絵文字パッケージをインストールし、アプリを再起動してください。 -| ディストリビューション（例） | パッケージ | -| ---------------------------- | ---------- | -| Arch Linux, Artix, Manjaro | `noto-fonts-emoji`（`sudo pacman -S noto-fonts-emoji`） | -| Debian, Ubuntu | `fonts-noto-color-emoji`（`sudo apt install fonts-noto-color-emoji`） | -| Fedora | `google-noto-emoji-color-fonts` | +| ディストリビューション（例） | パッケージ | +| ---------------------------- | --------------------------------------------------------------------- | +| Arch Linux, Artix, Manjaro | `noto-fonts-emoji`（`sudo pacman -S noto-fonts-emoji`） | +| Debian, Ubuntu | `fonts-noto-color-emoji`（`sudo apt install fonts-noto-color-emoji`） | +| Fedora | `google-noto-emoji-color-fonts` | インストール後も表示されない場合は `fc-cache -fv` を実行してください。最小インストールでは記号の網羅用に `noto-fonts` も任意で入れてください。 @@ -330,3 +330,9 @@ mv locales.json meshchatx/src/frontend/locales/xx.json - [Liam Cottle](https://github.com/liamcottle) - オリジナル Reticulum MeshChat - [RFnexus](https://github.com/RFnexus) - Micron パーサー（JavaScript） - [markqvist](https://github.com/markqvist) - Reticulum, LXMF, LXST + +## ライセンス + +プロジェクト独自の部分は 0BSD です。 +MeshChat 由来の元の上流部分は MIT のままです。 +全文と通知は [`../LICENSE`](../LICENSE) を参照してください。 diff --git a/lang/README.ru.md b/lang/README.ru.md index a368b3f..839c724 100644 --- a/lang/README.ru.md +++ b/lang/README.ru.md @@ -8,7 +8,7 @@ - Сайт: [meshchatx.com](https://meshchatx.com) - Исходный код: [git.quad4.io/RNS-Things/MeshChatX](https://git.quad4.io/RNS-Things/MeshChatX) -- Официальное зеркало: [github.com/Sudo-Ivan/MeshChatX](https://github.com/Sudo-Ivan/MeshChatX) — пока также используется для сборок Windows и macOS. +- Официальное зеркало: [github.com/Quad4/MeshChatX](https://github.com/Quad4/MeshChatX) — пока также используется для сборок Windows и macOS. - Релизы: [git.quad4.io/RNS-Things/MeshChatX/releases](https://git.quad4.io/RNS-Things/MeshChatX/releases) - Журнал изменений: [`CHANGELOG.md`](../CHANGELOG.md) - TODO: [Boards](https://git.quad4.io/RNS-Things/MeshChatX/projects) @@ -150,11 +150,11 @@ poetry run python -m meshchatx.meshchat --headless --host 127.0.0.1 Выбор эмодзи отображает стандартные Unicode-эмодзи системными шрифтами (Electron/Chromium). Если вместо них пустые квадраты («тофу»), установите пакет цветных эмодзи и перезапустите приложение. -| Семейство (примеры) | Пакет | -| -------------------------- | ----- | -| Arch Linux, Artix, Manjaro | `noto-fonts-emoji` (`sudo pacman -S noto-fonts-emoji`) | +| Семейство (примеры) | Пакет | +| -------------------------- | -------------------------------------------------------------------- | +| Arch Linux, Artix, Manjaro | `noto-fonts-emoji` (`sudo pacman -S noto-fonts-emoji`) | | Debian, Ubuntu | `fonts-noto-color-emoji` (`sudo apt install fonts-noto-color-emoji`) | -| Fedora | `google-noto-emoji-color-fonts` | +| Fedora | `google-noto-emoji-color-fonts` | После установки при необходимости выполните `fc-cache -fv`. Опционально: `noto-fonts` для лучшего покрытия символов на минимальных установках. @@ -330,3 +330,9 @@ mv locales.json meshchatx/src/frontend/locales/xx.json - [Liam Cottle](https://github.com/liamcottle) — оригинальный Reticulum MeshChat - [RFnexus](https://github.com/RFnexus) — парсер Micron (JavaScript) - [markqvist](https://github.com/markqvist) — Reticulum, LXMF, LXST + +## Лицензия + +Собственные части проекта лицензированы по 0BSD. +Оригинальные upstream-части, унаследованные от MeshChat, остаются под MIT. +Полный текст и уведомления см. в [`../LICENSE`](../LICENSE). diff --git a/lang/README.zh.md b/lang/README.zh.md index 4f595bf..3cd7e8e 100644 --- a/lang/README.zh.md +++ b/lang/README.zh.md @@ -8,7 +8,7 @@ Liam Cottle 开发的 Reticulum MeshChat 的一个功能丰富的深度修改分 - 网站: [meshchatx.com](https://meshchatx.com) - 源码: [git.quad4.io/RNS-Things/MeshChatX](https://git.quad4.io/RNS-Things/MeshChatX) -- 官方镜像: [github.com/Sudo-Ivan/MeshChatX](https://github.com/Sudo-Ivan/MeshChatX) — 目前亦用于 Windows 与 macOS 构建。 +- 官方镜像: [github.com/Quad4/MeshChatX](https://github.com/Quad4/MeshChatX) — 目前亦用于 Windows 与 macOS 构建。 - 发行版: [git.quad4.io/RNS-Things/MeshChatX/releases](https://git.quad4.io/RNS-Things/MeshChatX/releases) - 变更日志: [`CHANGELOG.md`](../CHANGELOG.md) - TODO: [Boards](https://git.quad4.io/RNS-Things/MeshChatX/projects) @@ -150,11 +150,11 @@ poetry run python -m meshchatx.meshchat --headless --host 127.0.0.1 绘文字选择器使用系统字体（Electron/Chromium）渲染标准 Unicode 绘文字。若显示为空白方框（“豆腐块”），请安装彩色绘文字字体包并重启应用。 -| 发行版（示例） | 软件包 | -| ------------------------ | ------ | -| Arch Linux、Artix、Manjaro | `noto-fonts-emoji`（`sudo pacman -S noto-fonts-emoji`） | -| Debian、Ubuntu | `fonts-noto-color-emoji`（`sudo apt install fonts-noto-color-emoji`） | -| Fedora | `google-noto-emoji-color-fonts` | +| 发行版（示例） | 软件包 | +| -------------------------- | --------------------------------------------------------------------- | +| Arch Linux、Artix、Manjaro | `noto-fonts-emoji`（`sudo pacman -S noto-fonts-emoji`） | +| Debian、Ubuntu | `fonts-noto-color-emoji`（`sudo apt install fonts-noto-color-emoji`） | +| Fedora | `google-noto-emoji-color-fonts` | 安装后若仍异常，可运行 `fc-cache -fv`。可选：最小安装可再装 `noto-fonts` 以覆盖更多符号。 @@ -330,3 +330,9 @@ mv locales.json meshchatx/src/frontend/locales/xx.json - [Liam Cottle](https://github.com/liamcottle) - 原始 Reticulum MeshChat - [RFnexus](https://github.com/RFnexus) - Micron 解析器（JavaScript） - [markqvist](https://github.com/markqvist) - Reticulum, LXMF, LXST + +## 许可证 + +项目自有部分采用 0BSD 许可。 +源自 MeshChat 的原始上游部分继续采用 MIT 许可。 +完整文本与声明请见 [`../LICENSE`](../LICENSE)。 diff --git a/meshchatx/src/backend/data/THIRD_PARTY_NOTICES.txt b/meshchatx/src/backend/data/THIRD_PARTY_NOTICES.txt index 8f89a7a..b9e22bb 100644 --- a/meshchatx/src/backend/data/THIRD_PARTY_NOTICES.txt +++ b/meshchatx/src/backend/data/THIRD_PARTY_NOTICES.txt @@ -1,5 +1,5 @@ Reticulum MeshChatX - Third-party notices -Generated at: 2026-04-16T03:20:09.086044Z +Generated at: 2026-04-16T09:33:58.837420Z Frontend source: embedded Python dependencies @@ -73,9 +73,9 @@ pycparser 3.0 pyserial 3.5 License: BSD Author: Chris Liechti -reticulum-meshchatx 4.4.0 - License: MIT - Author: Sudo-Ivan +reticulum-meshchatx 4.5.0 + License: 0BSD AND MIT + Author: Quad4 rns 1.1.5 License: Reticulum License Author: Mark Qvist diff --git a/misc/README.md b/misc/README.md deleted file mode 100644 index 5068511..0000000 --- a/misc/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# External Dependencies - -LXMF -LXST -RNS diff --git a/package-legacy.json b/package-legacy.json index 9df87bf..e9172ea 100644 --- a/package-legacy.json +++ b/package-legacy.json @@ -42,7 +42,7 @@ "linux": { "artifactName": "ReticulumMeshChatX-v${version}-legacy-${os}.${ext}", "target": ["AppImage", "deb"], - "maintainer": "Sudo-Ivan", + "maintainer": "Quad4", "category": "Network", "extraResources": [ { diff --git a/package.json b/package.json index a84659d..ffdc577 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "homepage": "https://git.quad4.io/RNS-Things/MeshChatX", "desktopName": "reticulum-meshchatx.desktop", "author": { - "name": "Sudo-Ivan" + "name": "Quad4" }, "main": "electron/main.js", "scripts": { @@ -46,7 +46,7 @@ "package": "pnpm run build && electron-forge package", "make": "pnpm run build && electron-forge make" }, - "license": "MIT", + "license": "0BSD AND MIT", "engines": { "node": ">=24" }, @@ -200,8 +200,8 @@ ] } ], - "maintainer": "Sudo-Ivan", - "vendor": "Sudo-Ivan", + "maintainer": "Quad4", + "vendor": "Quad4", "category": "Network", "synopsis": "Mesh networking chat client", "description": "A simple mesh network communications app powered by the Reticulum Network Stack", @@ -221,15 +221,15 @@ ] }, "deb": { - "maintainer": "Sudo-Ivan", - "vendor": "Sudo-Ivan", + "maintainer": "Quad4", + "vendor": "Quad4", "packageCategory": "network", "synopsis": "Mesh networking chat client", "description": "A simple mesh network communications app powered by the Reticulum Network Stack" }, "rpm": { - "maintainer": "Sudo-Ivan", - "vendor": "Sudo-Ivan", + "maintainer": "Quad4", + "vendor": "Quad4", "packageCategory": "Network", "synopsis": "Mesh networking chat client", "description": "A simple mesh network communications app powered by the Reticulum Network Stack" diff --git a/packaging/arch/.SRCINFO b/packaging/arch/.SRCINFO index eaa08a0..5eb9225 100644 --- a/packaging/arch/.SRCINFO +++ b/packaging/arch/.SRCINFO @@ -5,6 +5,7 @@ pkgbase = reticulum-meshchatx-git url = https://git.quad4.io/RNS-Things/MeshChatX arch = x86_64 arch = aarch64 + license = 0BSD license = MIT makedepends = git makedepends = nodejs diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 710520a..9555bd9 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc="A simple mesh network communications app powered by the Reticulum Network Stack" arch=('x86_64' 'aarch64') url="https://git.quad4.io/RNS-Things/MeshChatX" -license=('MIT') +license=('0BSD' 'MIT') depends=('opus' 'opusfile' 'portaudio' 'espeak-ng') makedepends=('git' 'nodejs' 'pnpm' 'python' 'python-poetry') provides=("$_pkgname") diff --git a/pyproject.toml b/pyproject.toml index 423e09e..77b2ef8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,9 +3,9 @@ name = "reticulum-meshchatx" version = "4.5.0" description = "A simple mesh network communications app powered by the Reticulum Network Stack" authors = [ - {name = "Sudo-Ivan"} + {name = "Quad4"} ] -license = "MIT" +license = "0BSD AND MIT" readme = "README.md" requires-python = ">=3.11" keywords = ["reticulum", "meshchat", "lxmf", "rns"]