Skip to content

Commit 7dfa2f5

Browse files
authored
chore(license): Apache 2.0 licensing for CNCF: verbatim LICENSE, NOTICE and source headers (#134)
* chore(license): use CNCF-style source headers Add the apache2-cncf licence to .golic.yaml: golic's Apache 2.0 header with the copyright line "Copyright The CryptOS Authors." and no year, following the CNCF copyright-notices guidance. NOTICE and the README licence line use the same notice. Refs CryptOS-PKI/.github#4 Signed-off-by: Bugs5382 <12115015+Bugs5382@users.noreply.github.com> * chore(license): re-stamp source headers with the CNCF copyright line golic remove -t apache2 -c "2026 Shane" drops the old header by exact text, then golic inject -t apache2-cncf adds the new one in the same place, so the copyright line is the only line that changes in each file. The license tasks now use the apache2-cncf template. Headers golic does not manage are edited the same way by hand. Refs CryptOS-PKI/.github#4 Signed-off-by: Bugs5382 <12115015+Bugs5382@users.noreply.github.com> * chore(license): use the verbatim Apache License 2.0 text 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> * revert: re-stamp source headers with the CNCF copyright line This reverts commit 62be158, the interim re-stamp. golic v1.2.0 renders the verbatim Apache 2.0 notice, so the headers go back to the old text and are replaced in one pass in the next commit. Signed-off-by: Bugs5382 <12115015+Bugs5382@users.noreply.github.com> * chore(license): stamp the verbatim Apache 2.0 notice with golic v1.2.0 golic v1.2.0 renders apache2 as the notice from the Apache License appendix, with no title line. golic replace -t apache2 -c "The CryptOS Authors." swaps the old header in place, so the local apache2-cncf licence is no longer needed and is removed from .golic.yaml. The Taskfile pins golic v1.2.0, and license and license:fix pass --license-file, so task license (and CI) also checks that LICENSE is the verbatim Apache 2.0 text. Signed-off-by: Bugs5382 <12115015+Bugs5382@users.noreply.github.com> --------- Signed-off-by: Bugs5382 <12115015+Bugs5382@users.noreply.github.com> Co-authored-by: Bugs5382 <12115015+Bugs5382@users.noreply.github.com>
1 parent c85d4b1 commit 7dfa2f5

181 files changed

Lines changed: 202 additions & 549 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.licignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
# ...even when they live in subdirectories:
1414
!*/
1515

16+
# golic skips *.d.ts by default; this one is hand-written and keeps its header.
17+
!src/vite-env.d.ts
18+
1619
# Never the build output, deps, caches, or generated docs:
1720
/node_modules/**
1821
**/node_modules/**

‎LICENSE‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Apache License
23
Version 2.0, January 2004
34
http://www.apache.org/licenses/
@@ -137,8 +138,8 @@
137138

138139
6. Trademarks. This License does not grant permission to use the trade
139140
names, trademarks, service marks, or product names of the Licensor,
140-
except as required for describing the origin of the Work and
141-
reproducing the content of the NOTICE file.
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
142143

143144
7. Disclaimer of Warranty. Unless required by applicable law or
144145
agreed to in writing, Licensor provides the Work (and each
@@ -162,15 +163,16 @@
162163
other commercial damages or losses), even if such Contributor
163164
has been advised of the possibility of such damages.
164165

165-
9. Accepting Warranty or Support. While redistributing the Work or
166-
Derivative Works thereof, You may accept support, warranty,
167-
indemnity, or other liability obligations and/or rights consistent
168-
with this License. However, in accepting such obligations, You may
169-
act only on Your own behalf and on Your sole responsibility, not on
170-
behalf of any other Contributor, and only if You agree to indemnify,
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
171173
defend, and hold each Contributor harmless for any liability
172174
incurred by, or claims asserted against, such Contributor by reason
173-
of your accepting any such warranty or support.
175+
of your accepting any such warranty or additional liability.
174176

175177
END OF TERMS AND CONDITIONS
176178

@@ -181,11 +183,11 @@
181183
replaced with your own identifying information. (Don't include
182184
the brackets!) The text should be enclosed in the appropriate
183185
comment syntax for the file format. We also recommend that a
184-
file's name and copyright notice be included on the same "page"
185-
as the copyright notice for easier identification within third-party
186-
archives.
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
187189

188-
Copyright 2026 Shane
190+
Copyright [yyyy] [name of copyright owner]
189191

190192
Licensed under the Apache License, Version 2.0 (the "License");
191193
you may not use this file except in compliance with the License.

‎NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CryptOS-PKI / web
2-
Copyright 2026 Shane
2+
Copyright The CryptOS Authors.
33

44
This product includes software developed as part of the CryptOS-PKI project
55
(https://github.com/CryptOS-PKI).

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,4 @@ The pre-push hook runs `npm run lint` and `npm test`. CI runs lint, test and bui
9292

9393
## 📄 License
9494

95-
[Apache License 2.0](LICENSE). Copyright 2026 Shane.
95+
[Apache License 2.0](LICENSE). Copyright The CryptOS Authors.

‎Taskfile.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ version: "3"
22

33
tasks:
44
license:
5-
desc: Verify every source file carries the Apache 2.0 license header (CI; never writes).
5+
desc: Verify every source file carries the Apache 2.0 license header and LICENSE is the verbatim Apache 2.0 text (CI; never writes).
66
cmds:
7-
- go install github.com/Bugs5382/golic/cmd/golic@v0.3.0
8-
- golic inject -t apache2 -c "2026 Shane" --dry -x
7+
- go install github.com/Bugs5382/golic/cmd/golic@v1.2.0
8+
- golic inject -t apache2 -c "The CryptOS Authors." --license-file --dry -x
99
license:fix:
10-
desc: Inject the Apache 2.0 header into any source file missing it.
10+
desc: Inject the Apache 2.0 header into any source file missing it and rewrite LICENSE to the verbatim Apache 2.0 text.
1111
cmds:
12-
- go install github.com/Bugs5382/golic/cmd/golic@v0.3.0
13-
- golic inject -t apache2 -c "2026 Shane"
12+
- go install github.com/Bugs5382/golic/cmd/golic@v1.2.0
13+
- golic inject -t apache2 -c "The CryptOS Authors." --license-file

‎eslint.config.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/*
2-
Apache License 2.0
3-
4-
Copyright 2026 Shane
2+
Copyright The CryptOS Authors.
53
64
Licensed under the Apache License, Version 2.0 (the "License");
75
you may not use this file except in compliance with the License.

‎postcss.config.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/*
2-
Apache License 2.0
3-
4-
Copyright 2026 Shane
2+
Copyright The CryptOS Authors.
53
64
Licensed under the Apache License, Version 2.0 (the "License");
75
you may not use this file except in compliance with the License.

‎src/App.test.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/*
2-
Apache License 2.0
3-
4-
Copyright 2026 Shane
2+
Copyright The CryptOS Authors.
53
64
Licensed under the Apache License, Version 2.0 (the "License");
75
you may not use this file except in compliance with the License.

‎src/App.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/*
2-
Apache License 2.0
3-
4-
Copyright 2026 Shane
2+
Copyright The CryptOS Authors.
53
64
Licensed under the Apache License, Version 2.0 (the "License");
75
you may not use this file except in compliance with the License.

‎src/components/cert-inventory.test.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/*
2-
Apache License 2.0
3-
4-
Copyright 2026 Shane
2+
Copyright The CryptOS Authors.
53
64
Licensed under the Apache License, Version 2.0 (the "License");
75
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)