Update copyright notices to 2025, and license to zlib/libpng
Marco Ricci commited on 2025-01-07 15:01:51
Zeige 24 geänderte Dateien mit 52 Einfügungen und 48 Löschungen.
The MIT license was originally suggested by the package manager, for compatibility with the broader ecosystem. This surely makes sense for software libraries, and for projects in general if you don't have a strong stance on free/libre open source software licensing (beyond copyleft vs. non-copyleft). For `derivepassphrase`, I respectfully disagree; my priorities in development and maintenance lie primarily with ensuring quality software, and not having bugs attributed to me that I did not cause. The zlib/libpng license fulfills this need much better than the MIT license, and has similar license compatibility with other FLOSS licenses. Thus the license change.
- LICENSE.txt 6f48d97..9c08cde
- README.md 2df6f83..991af30
- mkdocs.yml ef12244..633036a
- pyproject.toml 0cc07cf..1256b7c
- src/derivepassphrase/__init__.py 8ea69f0..e6950c2
- src/derivepassphrase/__main__.py dedcb3f..638f9c3
- src/derivepassphrase/_cli_msg.py 150a237..1a59ccd
- src/derivepassphrase/_types.py 5f87bca..46e1329
- src/derivepassphrase/cli.py f873006..69d9123
- src/derivepassphrase/exporter/__init__.py 25d7311..4aa816c
- src/derivepassphrase/exporter/storeroom.py 038838d..d9380db
- src/derivepassphrase/exporter/vault_native.py bcf04c4..6533551
- src/derivepassphrase/sequin.py dbf07a9..d9d8c1e
- src/derivepassphrase/ssh_agent.py db8dbc2..816add3
- src/derivepassphrase/vault.py 4e79d18..4df1139
- tests/__init__.py 02066f8..c93562d
- tests/conftest.py 5983f9c..31397d7
- tests/test_derivepassphrase_cli.py 7feb60a..77d470d
- tests/test_derivepassphrase_cli_export_vault.py d918570..ff54429
- tests/test_derivepassphrase_exporter.py c0513d0..3e4b493
- tests/test_derivepassphrase_sequin.py 2997722..1f8308a
- tests/test_derivepassphrase_ssh_agent.py fb11188..2a37820
- tests/test_derivepassphrase_types.py 8f1542c..bc97cf8
- tests/test_derivepassphrase_vault.py cb5d09a..57272d1
| ... | ... |
@@ -1,9 +1,13 @@ |
| 1 |
-MIT License |
|
| 1 |
+zlib License |
|
| 2 | 2 |
|
| 3 |
-Copyright 2024 Marco Ricci <m@the13thletter.info> |
|
| 3 |
+Copyright 2025 Marco Ricci <software@the13thletter.info> |
|
| 4 | 4 |
|
| 5 |
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: |
|
| 5 |
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. |
|
| 6 | 6 |
|
| 7 |
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. |
|
| 7 |
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: |
|
| 8 | 8 |
|
| 9 |
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
|
| 9 |
+ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. |
|
| 10 |
+ |
|
| 11 |
+ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. |
|
| 12 |
+ |
|
| 13 |
+ 3. This notice may not be removed or altered from any source distribution. |
| ... | ... |
@@ -106,4 +106,4 @@ oXDGCvMhLWPQyCzYtaobOq2Wh9olYj |
| 106 | 106 |
|
| 107 | 107 |
## License |
| 108 | 108 |
|
| 109 |
-`derivepassphrase` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license. |
|
| 109 |
+`derivepassphrase` is distributed under the terms of the [zlib/libpng license](https://spdx.org/licenses/Zlib.html). |
| ... | ... |
@@ -4,7 +4,7 @@ repo_url: 'https://github.com/the-13th-letter/derivepassphrase' |
| 4 | 4 |
repo_name: the-13th-letter/derivepassphrase |
| 5 | 5 |
site_description: An almost faithful Python reimplementation of James Coglan's vault. |
| 6 | 6 |
site_author: Marco Ricci |
| 7 |
-copyright: Copyright © 2024 Marco Ricci (the-13th-letter) |
|
| 7 |
+copyright: Copyright © 2025 Marco Ricci (the-13th-letter) |
|
| 8 | 8 |
|
| 9 | 9 |
remote_branch: documentation-tree |
| 10 | 10 |
remote_name: '.' |
| ... | ... |
@@ -7,7 +7,7 @@ name = "derivepassphrase" |
| 7 | 7 |
description = "An almost faithful Python reimplementation of James Coglan's vault." |
| 8 | 8 |
readme = "README.md" |
| 9 | 9 |
requires-python = ">= 3.9" |
| 10 |
-license = "MIT" |
|
| 10 |
+license = { text = "zlib/libpng" }
|
|
| 11 | 11 |
keywords = [] |
| 12 | 12 |
authors = [ |
| 13 | 13 |
{ name = "Marco Ricci", email = "software@the13thletter.info" },
|
| ... | ... |
@@ -15,7 +15,7 @@ authors = [ |
| 15 | 15 |
classifiers = [ |
| 16 | 16 |
"Development Status :: 4 - Beta", |
| 17 | 17 |
"Environment :: Console", |
| 18 |
- "License :: OSI Approved :: MIT License", |
|
| 18 |
+ "License :: OSI Approved :: zlib/libpng License", |
|
| 19 | 19 |
"Programming Language :: Python :: 3", |
| 20 | 20 |
"Programming Language :: Python :: 3.9", |
| 21 | 21 |
"Programming Language :: Python :: 3.10", |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# SPDX-FileCopyrightText: 2024 Marco Ricci <software@the13thletter.info> |
|
| 1 |
+# SPDX-FileCopyrightText: 2025 Marco Ricci <software@the13thletter.info> |
|
| 2 | 2 |
# |
| 3 |
-# SPDX-License-Identifier: MIT |
|
| 3 |
+# SPDX-License-Identifier: Zlib |
|
| 4 | 4 |
|
| 5 | 5 |
"""Work-alike of vault(1) – a deterministic, stateless password manager""" # noqa: D415,RUF002 |
| 6 | 6 |
|
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# SPDX-FileCopyrightText: 2024 Marco Ricci <software@the13thletter.info> |
|
| 1 |
+# SPDX-FileCopyrightText: 2025 Marco Ricci <software@the13thletter.info> |
|
| 2 | 2 |
# |
| 3 |
-# SPDX-License-Identifier: MIT |
|
| 3 |
+# SPDX-License-Identifier: Zlib |
|
| 4 | 4 |
"""Run [`derivepassphrase.cli.derivepassphrase`][] on import.""" |
| 5 | 5 |
|
| 6 | 6 |
import sys |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# SPDX-FileCopyrightText: 2024 Marco Ricci <software@the13thletter.info> |
|
| 1 |
+# SPDX-FileCopyrightText: 2025 Marco Ricci <software@the13thletter.info> |
|
| 2 | 2 |
# |
| 3 |
-# SPDX-License-Identifier: MIT |
|
| 3 |
+# SPDX-License-Identifier: Zlib |
|
| 4 | 4 |
|
| 5 | 5 |
"""Types used by derivepassphrase.""" |
| 6 | 6 |
|
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# SPDX-FileCopyrightText: 2024 Marco Ricci <software@the13thletter.info> |
|
| 1 |
+# SPDX-FileCopyrightText: 2025 Marco Ricci <software@the13thletter.info> |
|
| 2 | 2 |
# |
| 3 |
-# SPDX-License-Identifier: MIT |
|
| 3 |
+# SPDX-License-Identifier: Zlib |
|
| 4 | 4 |
|
| 5 | 5 |
"""Foreign configuration exporter for derivepassphrase.""" |
| 6 | 6 |
|
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# SPDX-FileCopyrightText: 2024 Marco Ricci <software@the13thletter.info> |
|
| 1 |
+# SPDX-FileCopyrightText: 2025 Marco Ricci <software@the13thletter.info> |
|
| 2 | 2 |
# |
| 3 |
-# SPDX-License-Identifier: MIT |
|
| 3 |
+# SPDX-License-Identifier: Zlib |
|
| 4 | 4 |
|
| 5 | 5 |
"""Exporter for the vault "storeroom" configuration format. |
| 6 | 6 |
|
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# SPDX-FileCopyrightText: 2024 Marco Ricci <software@the13thletter.info> |
|
| 1 |
+# SPDX-FileCopyrightText: 2025 Marco Ricci <software@the13thletter.info> |
|
| 2 | 2 |
# |
| 3 |
-# SPDX-License-Identifier: MIT |
|
| 3 |
+# SPDX-License-Identifier: Zlib |
|
| 4 | 4 |
|
| 5 | 5 |
"""Exporter for the vault native configuration format (v0.2 or v0.3). |
| 6 | 6 |
|
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# SPDX-FileCopyrightText: 2024 Marco Ricci <software@the13thletter.info> |
|
| 1 |
+# SPDX-FileCopyrightText: 2025 Marco Ricci <software@the13thletter.info> |
|
| 2 | 2 |
# |
| 3 |
-# SPDX-License-Identifier: MIT |
|
| 3 |
+# SPDX-License-Identifier: Zlib |
|
| 4 | 4 |
|
| 5 | 5 |
"""A Python reimplementation of James Coglan's "sequin" Node.js module. |
| 6 | 6 |
|
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# SPDX-FileCopyrightText: 2024 Marco Ricci <software@the13thletter.info> |
|
| 1 |
+# SPDX-FileCopyrightText: 2025 Marco Ricci <software@the13thletter.info> |
|
| 2 | 2 |
# |
| 3 |
-# SPDX-License-Identifier: MIT |
|
| 3 |
+# SPDX-License-Identifier: Zlib |
|
| 4 | 4 |
|
| 5 | 5 |
"""A bare-bones SSH agent client supporting signing and key listing.""" |
| 6 | 6 |
|
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# SPDX-FileCopyrightText: 2024 Marco Ricci <software@the13thletter.info> |
|
| 1 |
+# SPDX-FileCopyrightText: 2025 Marco Ricci <software@the13thletter.info> |
|
| 2 | 2 |
# |
| 3 |
-# SPDX-License-Identifier: MIT |
|
| 3 |
+# SPDX-License-Identifier: Zlib |
|
| 4 | 4 |
|
| 5 | 5 |
"""Python port of the vault(1) password generation scheme.""" |
| 6 | 6 |
|
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# SPDX-FileCopyrightText: 2024 Marco Ricci <software@the13thletter.info> |
|
| 1 |
+# SPDX-FileCopyrightText: 2025 Marco Ricci <software@the13thletter.info> |
|
| 2 | 2 |
# |
| 3 |
-# SPDX-License-Identifier: MIT |
|
| 3 |
+# SPDX-License-Identifier: Zlib |
|
| 4 | 4 |
|
| 5 | 5 |
"""Test OpenSSH key loading and signing.""" |
| 6 | 6 |
|
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 |
-# SPDX-FileCopyrightText: 2024 Marco Ricci <software@the13thletter.info> |
|
| 1 |
+# SPDX-FileCopyrightText: 2025 Marco Ricci <software@the13thletter.info> |
|
| 2 | 2 |
# |
| 3 |
-# SPDX-License-Identifier: MIT |
|
| 3 |
+# SPDX-License-Identifier: Zlib |
|
| 4 | 4 |
|
| 5 | 5 |
"""Test passphrase generation via derivepassphrase.vault.Vault.""" |
| 6 | 6 |
|
| 7 | 7 |