Skip to content

docs(license): use the verbatim Apache License 2.0 text - #41

Closed
Bugs5382 wants to merge 1 commit into
mainfrom
docs/4-verbatim-apache-license
Closed

Bugs5382 wants to merge 1 commit into
mainfrom
docs/4-verbatim-apache-license

Conversation

@Bugs5382

Copy link
Copy Markdown
Contributor

What and why

Replaces LICENSE with the Apache License 2.0 text exactly as published at https://www.apache.org/licenses/LICENSE-2.0.txt (sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30). It is byte for byte the same file CryptOS-PKI/.github#6 and CryptOS-PKI/cryptos-lab#3 add.

The old file had sections 6 and 9 and the appendix reworded, and the appendix filled in with a copyright line, so GitHub's licence detection reported NOASSERTION for this repo. CNCF and most licence scanners need an exact match. On this branch GitHub now detects Apache-2.0 (GET /repos/CryptOS-PKI/docs/license?ref=docs/4-verbatim-apache-license); on main it still reports NOASSERTION.

Nothing else changes:

  • NOTICE is untouched and still carries the copyright and attribution.
  • The golic source-file headers are untouched. They are the standard Apache 2.0 notice (golic inject -t apache2 -c "2026 Shane"): "Apache License 2.0", "Copyright 2026 Shane", and "Licensed under the Apache License, Version 2.0 ... http://www.apache.org/licenses/LICENSE-2.0", which is the same licence this file now holds.

What the old file said that the published text does not (- old, + verbatim):

--- LICENSE (before)
+++ LICENSE (after)
@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -137,8 +138,8 @@
 
    6. Trademarks. This License does not grant permission to use the trade
       names, trademarks, service marks, or product names of the Licensor,
-      except as required for describing the origin of the Work and
-      reproducing the content of the NOTICE file.
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
    7. Disclaimer of Warranty. Unless required by applicable law or
       agreed to in writing, Licensor provides the Work (and each
@@ -162,15 +163,16 @@
       other commercial damages or losses), even if such Contributor
       has been advised of the possibility of such damages.
 
-   9. Accepting Warranty or Support. While redistributing the Work or
-      Derivative Works thereof, You may accept support, warranty,
-      indemnity, or other liability obligations and/or rights consistent
-      with this License. However, in accepting such obligations, You may
-      act only on Your own behalf and on Your sole responsibility, not on
-      behalf of any other Contributor, and only if You agree to indemnify,
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or support.
+      of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
 
@@ -181,11 +183,11 @@
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
-      file's name and copyright notice be included on the same "page"
-      as the copyright notice for easier identification within third-party
-      archives.
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
 
-   Copyright 2026 Shane
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

The docs site's licence page is updated to say every repo carries the verbatim text on #28.

Refs CryptOS-PKI/.github#4

Verification

  • LICENSE matches the published text and the .github#6 and lab#3 files byte for byte (cmp, sha256 above)
  • GitHub licence API on this branch reports Apache-2.0
  • Pre-push checks pass

How this was verified

curl -sSL https://www.apache.org/licenses/LICENSE-2.0.txt, then cmp against the new LICENSE and against the LICENSE files on the CryptOS-PKI/.github#6 and CryptOS-PKI/cryptos-lab#3 branches (identical). gh api "repos/CryptOS-PKI/docs/license?ref=docs/4-verbatim-apache-license" returns spdx_id: Apache-2.0. The repo's pre-push hook passed on push.


Before merging: add a closing comment summarizing what was actually done in this PR
(not just the checked boxes).

@Bugs5382 Bugs5382 added this to the v0.1.0 milestone Sep 30, 2026
@Bugs5382 Bugs5382 added the documentation Documentation only (docs). label Sep 30, 2026
@Bugs5382 Bugs5382 self-assigned this Sep 30, 2026
@Bugs5382
Bugs5382 marked this pull request as ready for review September 30, 2026 08:27
The LICENSE file had reworded sections 6 and 9 and a filled-in appendix,
so licence scanners, including GitHub's, could not match it to
Apache-2.0. Replace it with the text published at
https://www.apache.org/licenses/LICENSE-2.0.txt, byte for byte.
Copyright and attribution stay in NOTICE.

Refs CryptOS-PKI/.github#4

Signed-off-by: Bugs5382 <12115015+Bugs5382@users.noreply.github.com>
@Bugs5382

Copy link
Copy Markdown
Contributor Author

Folded into #46 (one licensing PR per repo, owner decision)

@Bugs5382 Bugs5382 closed this Sep 30, 2026
@Bugs5382
Bugs5382 deleted the docs/4-verbatim-apache-license branch September 30, 2026 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Documentation only (docs).

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant