curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-5851: Update all references to point to Apache License 2.0

This commit is contained in:
Nuno Diegues 2022-03-08 14:59:53 +00:00
parent aeda35699e
commit c54e8cd8e6
3 changed files with 171 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

347
LICENSE
View File

@ -1,211 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
1. Definitions. TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
"License" shall mean the terms and conditions for use, reproduction, 1. Definitions.
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by "License" shall mean the terms and conditions for use, reproduction,
the copyright owner that is granting the License. and distribution as defined by Sections 1 through 9 of this document.
"Legal Entity" shall mean the union of the acting entity and all "Licensor" shall mean the copyright owner or entity authorized by
other entities that control, are controlled by, or are under common the copyright owner that is granting the License.
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity "Legal Entity" shall mean the union of the acting entity and all
exercising permissions granted by this License. other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"Source" form shall mean the preferred form for making modifications, "You" (or "Your") shall mean an individual or Legal Entity
including but not limited to software source code, documentation exercising permissions granted by this License.
source, and configuration files.
"Object" form shall mean any form resulting from mechanical "Source" form shall mean the preferred form for making modifications,
transformation or translation of a Source form, including but including but not limited to software source code, documentation
not limited to compiled object code, generated documentation, source, and configuration files.
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or "Object" form shall mean any form resulting from mechanical
Object form, made available under the License, as indicated by a transformation or translation of a Source form, including but
copyright notice that is included in or attached to the work not limited to compiled object code, generated documentation,
(an example is provided in the Appendix below). and conversions to other media types.
"Derivative Works" shall mean any work, whether in Source or Object "Work" shall mean the work of authorship, whether in Source or
form, that is based on (or derived from) the Work and for which the Object form, made available under the License, as indicated by a
editorial revisions, annotations, elaborations, or other modifications copyright notice that is included in or attached to the work
represent, as a whole, an original work of authorship. For the purposes (an example is provided in the Appendix below).
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including "Derivative Works" shall mean any work, whether in Source or Object
the original version of the Work and any modifications or additions form, that is based on (or derived from) the Work and for which the
to that Work or Derivative Works thereof, that is intentionally editorial revisions, annotations, elaborations, or other modifications
submitted to Licensor for inclusion in the Work by the copyright owner represent, as a whole, an original work of authorship. For the purposes
or by an individual or Legal Entity authorized to submit on behalf of of this License, Derivative Works shall not include works that remain
the copyright owner. For the purposes of this definition, "submitted" separable from, or merely link (or bind by name) to the interfaces of,
means any form of electronic, verbal, or written communication sent the Work and Derivative Works thereof.
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity "Contribution" shall mean any work of authorship, including
on behalf of whom a Contribution has been received by Licensor and the original version of the Work and any modifications or additions
subsequently incorporated within the Work. to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
2. Grant of Copyright License. Subject to the terms and conditions of "Contributor" shall mean Licensor and any individual or Legal Entity
this License, each Contributor hereby grants to You a perpetual, on behalf of whom a Contribution has been received by Licensor and
worldwide, non-exclusive, no-charge, royalty-free, irrevocable subsequently incorporated within the Work.
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of 2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual, this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made, copyright license to reproduce, prepare Derivative Works of,
use, offer to sell, sell, import, and otherwise transfer the Work, publicly display, publicly perform, sublicense, and distribute the
where such license applies only to those patent claims licensable Work and such Derivative Works in Source or Object form.
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the 3. Grant of Patent License. Subject to the terms and conditions of
Work or Derivative Works thereof in any medium, with or without this License, each Contributor hereby grants to You a perpetual,
modifications, and in Source or Object form, provided that You worldwide, non-exclusive, no-charge, royalty-free, irrevocable
meet the following conditions: (except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
(a) You must give any other recipients of the Work or 4. Redistribution. You may reproduce and distribute copies of the
Derivative Works a copy of this License; and Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(b) You must cause any modified files to carry prominent notices (a) You must give any other recipients of the Work or
stating that You changed the files; and Derivative Works a copy of this License; and
(c) You must retain, in the Source form of any Derivative Works (b) You must cause any modified files to carry prominent notices
that You distribute, all copyright, patent, trademark, and stating that You changed the files; and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its (c) You must retain, in the Source form of any Derivative Works
distribution, then any Derivative Works that You distribute must that You distribute, all copyright, patent, trademark, and
include a readable copy of the attribution notices contained attribution notices from the Source form of the Work,
within such NOTICE file, excluding those notices that do not excluding those notices that do not pertain to any part of
pertain to any part of the Derivative Works, in at least one the Derivative Works; and
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and (d) If the Work includes a "NOTICE" text file as part of its
may provide additional or different license terms and conditions distribution, then any Derivative Works that You distribute must
for use, reproduction, or distribution of Your modifications, or include a readable copy of the attribution notices contained
for any such Derivative Works as a whole, provided Your use, within such NOTICE file, excluding those notices that do not
reproduction, and distribution of the Work otherwise complies with pertain to any part of the Derivative Works, in at least one
the conditions stated in this License. of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
5. Submission of Contributions. Unless You explicitly state otherwise, You may add Your own copyright statement to Your modifications and
any Contribution intentionally submitted for inclusion in the Work may provide additional or different license terms and conditions
by You to the Licensor shall be under the terms and conditions of for use, reproduction, or distribution of Your modifications, or
this License, without any additional terms or conditions. for any such Derivative Works as a whole, provided Your use,
Notwithstanding the above, nothing herein shall supersede or modify reproduction, and distribution of the Work otherwise complies with
the terms of any separate license agreement you may have executed the conditions stated in this License.
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade 5. Submission of Contributions. Unless You explicitly state otherwise,
names, trademarks, service marks, or product names of the Licensor, any Contribution intentionally submitted for inclusion in the Work
except as required for reasonable and customary use in describing the by You to the Licensor shall be under the terms and conditions of
origin of the Work and reproducing the content of the NOTICE file. this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
7. Disclaimer of Warranty. Unless required by applicable law or 6. Trademarks. This License does not grant permission to use the trade
agreed to in writing, Licensor provides the Work (and each names, trademarks, service marks, or product names of the Licensor,
Contributor provides its Contributions) on an "AS IS" BASIS, except as required for reasonable and customary use in describing the
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or origin of the Work and reproducing the content of the NOTICE file.
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory, 7. Disclaimer of Warranty. Unless required by applicable law or
whether in tort (including negligence), contract, or otherwise, agreed to in writing, Licensor provides the Work (and each
unless required by applicable law (such as deliberate and grossly Contributor provides its Contributions) on an "AS IS" BASIS,
negligent acts) or agreed to in writing, shall any Contributor be WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
liable to You for damages, including any direct, indirect, special, implied, including, without limitation, any warranties or conditions
incidental, or consequential damages of any character arising as a of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
result of this License or out of the use or inability to use the PARTICULAR PURPOSE. You are solely responsible for determining the
Work (including but not limited to damages for loss of goodwill, appropriateness of using or redistributing the Work and assume any
work stoppage, computer failure or malfunction, or any and all risks associated with Your exercise of permissions under this License.
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing 8. Limitation of Liability. In no event and under no legal theory,
the Work or Derivative Works thereof, You may choose to offer, whether in tort (including negligence), contract, or otherwise,
and charge a fee for, acceptance of support, warranty, indemnity, unless required by applicable law (such as deliberate and grossly
or other liability obligations and/or rights consistent with this negligent acts) or agreed to in writing, shall any Contributor be
License. However, in accepting such obligations, You may act only liable to You for damages, including any direct, indirect, special,
on Your own behalf and on Your sole responsibility, not on behalf incidental, or consequential damages of any character arising as a
of any other Contributor, and only if You agree to indemnify, result of this License or out of the use or inability to use the
defend, and hold each Contributor harmless for any liability Work (including but not limited to damages for loss of goodwill,
incurred by, or claims asserted against, such Contributor by reason work stoppage, computer failure or malfunction, or any and all
of your accepting any such warranty or additional liability. other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
END OF TERMS AND CONDITIONS 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 additional liability.
APPENDIX: How to apply the Apache License to your work. END OF TERMS AND CONDITIONS
To apply the Apache License to your work, attach the following APPENDIX: How to apply the Apache License to your work.
boilerplate notice, with the fields enclosed by brackets "[]"
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 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 [yyyy] [name of copyright owner] To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
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 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.
Licensed under the Apache License, Version 2.0 (the "License"); Copyright [yyyy] [name of copyright owner]
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Unless required by applicable law or agreed to in writing, software http://www.apache.org/licenses/LICENSE-2.0
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
## Runtime Library Exception to the Apache 2.0 License: ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
As an exception, if you use this Software to compile your source code and
portions of this Software are embedded into the binary product as a result,
you may redistribute such product without providing attribution as would
otherwise be required by Sections 4(a), 4(b) and 4(d) of the License.

2
Makefile
View File

@ -150,7 +150,7 @@ define build_package
fakeroot fpm -C $(PACKAGE_DIR) -s dir -t $(1) \ fakeroot fpm -C $(PACKAGE_DIR) -s dir -t $(1) \
--description 'Cloudflare Tunnel daemon' \ --description 'Cloudflare Tunnel daemon' \
--vendor 'Cloudflare' \ --vendor 'Cloudflare' \
--license 'Cloudflare Service Agreement' \ --license 'Apache License Version 2.0' \
--url 'https://github.com/cloudflare/cloudflared' \ --url 'https://github.com/cloudflare/cloudflared' \
-m 'Cloudflare <support@cloudflare.com>' \ -m 'Cloudflare <support@cloudflare.com>' \
-a $(TARGET_ARCH) -v $(VERSION) -n $(DEB_PACKAGE_NAME) $(NIGHTLY_FLAGS) --after-install postinst.sh --after-remove postrm.sh \ -a $(TARGET_ARCH) -v $(VERSION) -n $(DEB_PACKAGE_NAME) $(NIGHTLY_FLAGS) --after-install postinst.sh --after-remove postrm.sh \

2
cmd/cloudflared/main.go
View File

@ -69,7 +69,7 @@ func main() {
app.Copyright = fmt.Sprintf( app.Copyright = fmt.Sprintf(
`(c) %d Cloudflare Inc. `(c) %d Cloudflare Inc.
Your installation of cloudflared software constitutes a symbol of your signature indicating that you accept Your installation of cloudflared software constitutes a symbol of your signature indicating that you accept
the terms of the Cloudflare License (https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/license), the terms of the Apache License Version 2.0 (https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/license),
Terms (https://www.cloudflare.com/terms/) and Privacy Policy (https://www.cloudflare.com/privacypolicy/).`, Terms (https://www.cloudflare.com/terms/) and Privacy Policy (https://www.cloudflare.com/privacypolicy/).`,
time.Now().Year(), time.Now().Year(),
) )