1
0
mirror of https://github.com/bitcoin/bips.git synced 2025-07-21 12:58:14 +00:00

bip3: Fix SPDX id of FSF/GNU All Permissive

This commit is contained in:
Tim Ruffing 2025-07-09 10:06:51 +02:00
parent c3b6691284
commit e5748c9997

View File

@ -395,10 +395,10 @@ Copyright section, possibly providing further details on licensing.
For example, a preamble might include the following License header: For example, a preamble might include the following License header:
License: CC0-1.0 OR GNU-All-Permissive License: CC0-1.0 OR FSFAP
In this case, the BIP text is fully licensed under both the Creative Commons CC0 1.0 Universal license as well as the In this case, the BIP text is fully licensed under both the Creative Commons CC0 1.0 Universal license as well as the
GNU All-Permissive License, and anyone may modify and redistribute the text provided they comply with the terms of FSF All Permissive License, and anyone may modify and redistribute the text provided they comply with the terms of
*either* license. In other words, the license list is an "OR choice", not an "AND also" requirement. See the [SPDX *either* license. In other words, the license list is an "OR choice", not an "AND also" requirement. See the [SPDX
documentation](https://spdx.dev/ids/) and the [SPDX License List](https://spdx.org/licenses/) for further details. documentation](https://spdx.dev/ids/) and the [SPDX License List](https://spdx.org/licenses/) for further details.
@ -407,7 +407,7 @@ after the License header. Again, the licensing terms must be specified using an
Each source code file or source directory should specify the license under which it is made available as is common in Each source code file or source directory should specify the license under which it is made available as is common in
software (e.g., with a license header or a LICENSE/COPYING file). It is recommended to make any test vectors available software (e.g., with a license header or a LICENSE/COPYING file). It is recommended to make any test vectors available
under CC0-1.0 or GNU-All-Permissive in addition to any other licenses to allow anyone to copy test vectors into their under CC0-1.0 or FSFAP in addition to any other licenses to allow anyone to copy test vectors into their
implementations without introducing license hindrances. Licenses listed in the License-Code header apply to all source implementations without introducing license hindrances. Licenses listed in the License-Code header apply to all source
directories, source code files, and test vectors provided with the BIP except those where a LICENSE file in a directory directories, source code files, and test vectors provided with the BIP except those where a LICENSE file in a directory
or the file header states otherwise. or the file header states otherwise.
@ -439,7 +439,7 @@ acceptable license L from the following list and another SPDX License Expression
* BSD-2-Clause: [OSI-approved BSD 2-clause license](https://opensource.org/licenses/BSD-2-Clause) * BSD-2-Clause: [OSI-approved BSD 2-clause license](https://opensource.org/licenses/BSD-2-Clause)
* BSD-3-Clause: [OSI-approved BSD 3-clause license](https://opensource.org/licenses/BSD-3-Clause) * BSD-3-Clause: [OSI-approved BSD 3-clause license](https://opensource.org/licenses/BSD-3-Clause)
* CC0-1.0: [Creative Commons CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/) * CC0-1.0: [Creative Commons CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/)
* GNU-All-Permissive: [GNU All-Permissive License](http://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html) * FSFAP: [FSF All Permissive License](https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html)
* CC-BY-4.0: [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/) * CC-BY-4.0: [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/)
* MIT: [Expat/MIT/X11 license](https://opensource.org/licenses/MIT) * MIT: [Expat/MIT/X11 license](https://opensource.org/licenses/MIT)
* Apache-2.0: [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0) * Apache-2.0: [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
@ -737,7 +737,7 @@ feedback, and helpful comments.
* BSD-3-Clause: 19 * BSD-3-Clause: 19
* OPL: 5 * OPL: 5
* CC-BY-SA-4.0: 4 * CC-BY-SA-4.0: 4
* GNU-All-Permissive: 3 * FSFAP: 3
* MIT: 2 * MIT: 2
* CC-BY-4.0: 1 * CC-BY-4.0: 1