From ed929d2c81638ef2ae391f0ce368a7e96516c395 Mon Sep 17 00:00:00 2001 From: hc-github-team-es-release-engineering <82989873+hc-github-team-es-release-engineering@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:26:29 -0800 Subject: [PATCH 1/3] Update LICENSE text --- LICENSE | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index f098a4957..2feafe208 100644 --- a/LICENSE +++ b/LICENSE @@ -5,10 +5,40 @@ Parameters Licensor: HashiCorp, Inc. Licensed Work: Vagrant 2.4.1.dev. The Licensed Work is (c) %YEAR% HashiCorp, Inc. -Additional Use Grant: You may make production use of the Licensed Work, - provided such use does not include offering the Licensed Work - to third parties on a hosted or embedded basis which is - competitive with HashiCorp's products. +Additional Use Grant: You may make production use of the Licensed Work, provided + Your use does not include offering the Licensed Work to third + parties on a hosted or embedded basis in order to compete with + HashiCorp’s paid version(s) of the Licensed Work. For purposes + of this license: + + A “competitive offering” is a Product that is offered to third + parties on a paid basis, including through paid support + arrangements, that significantly overlaps with the capabilities + of HashiCorp’s paid version(s) of the Licensed Work. If Your + Product is not a competitive offering when You first make it + generally available, it will not become a competitive offering + later due to HashiCorp releasing a new version of the Licensed + Work with additional capabilities. In addition, Products that + are not provided on a paid basis are not competitive. + + “Product” means software that is offered to end users to manage + in their own environments or offered as a service on a hosted + basis. + + “Embedded” means including the source code or executable code + from the Licensed Work in a competitive offering. “Embedded” + also means packaging the competitive offering in such a way + that the Licensed Work must be accessed or downloaded for the + competitive offering to operate. + + Hosting or using the Licensed Work(s) for internal purposes + within an organization is not considered a competitive + offering. HashiCorp considers your organization to include all + of your affiliates under common control. + + For binding interpretive guidance on using HashiCorp products + under the Business Source License, please visit our FAQ. + (https://www.hashicorp.com/license-faq) Change Date: Four years from the date the Licensed Work is published. Change License: MPL 2.0 From 74e1011418ac9e984aa984ff0eaa3d0579cd46df Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 13 Nov 2023 11:14:36 -0800 Subject: [PATCH 2/3] Remove non-ASCII characters from license content --- LICENSE | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index 2feafe208..50f10f805 100644 --- a/LICENSE +++ b/LICENSE @@ -4,29 +4,29 @@ License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved. Parameters Licensor: HashiCorp, Inc. -Licensed Work: Vagrant 2.4.1.dev. The Licensed Work is (c) %YEAR% HashiCorp, Inc. +Licensed Work: Vagrant 2.4.1.dev. The Licensed Work is (c) 2023 HashiCorp, Inc. Additional Use Grant: You may make production use of the Licensed Work, provided Your use does not include offering the Licensed Work to third parties on a hosted or embedded basis in order to compete with - HashiCorp’s paid version(s) of the Licensed Work. For purposes + HashiCorp's paid version(s) of the Licensed Work. For purposes of this license: - A “competitive offering” is a Product that is offered to third + A "competitive offering" is a Product that is offered to third parties on a paid basis, including through paid support arrangements, that significantly overlaps with the capabilities - of HashiCorp’s paid version(s) of the Licensed Work. If Your + of HashiCorp's paid version(s) of the Licensed Work. If Your Product is not a competitive offering when You first make it generally available, it will not become a competitive offering later due to HashiCorp releasing a new version of the Licensed Work with additional capabilities. In addition, Products that are not provided on a paid basis are not competitive. - “Product” means software that is offered to end users to manage + "Product" means software that is offered to end users to manage in their own environments or offered as a service on a hosted basis. - “Embedded” means including the source code or executable code - from the Licensed Work in a competitive offering. “Embedded” + "Embedded" means including the source code or executable code + from the Licensed Work in a competitive offering. "Embedded" also means packaging the competitive offering in such a way that the Licensed Work must be accessed or downloaded for the competitive offering to operate. From 4359dc22fa0fa8c12fcc461b781149c688047eea Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 13 Nov 2023 11:15:39 -0800 Subject: [PATCH 3/3] Update license content in templates --- templates/license/license.html.tmpl | 45 +++++++++++++++++++++++++--- templates/license/license.rtf.tmpl | Bin 3349 -> 5042 bytes templates/license/license.tmpl | 38 ++++++++++++++++++++--- 3 files changed, 75 insertions(+), 8 deletions(-) diff --git a/templates/license/license.html.tmpl b/templates/license/license.html.tmpl index e0ce8f9be..2bc88e33f 100644 --- a/templates/license/license.html.tmpl +++ b/templates/license/license.html.tmpl @@ -15,10 +15,47 @@ Licensed Work: Vagrant %VERSION%. The Licensed Work is (c) %YEAR% HashiCorp, Inc.
  • - Additional Use Grant: You may make production use of the Licensed Work, - provided such use does not include offering the Licensed Work - to third parties on a hosted or embedded basis which is - competitive with HashiCorp's products. +

    + Additional Use Grant: You may make production use of the Licensed Work, provided + Your use does not include offering the Licensed Work to third + parties on a hosted or embedded basis in order to compete with + HashiCorp's paid version(s) of the Licensed Work. For purposes + of this license: +

    +

    + A "competitive offering" is a Product that is offered to third + parties on a paid basis, including through paid support + arrangements, that significantly overlaps with the capabilities + of HashiCorp's paid version(s) of the Licensed Work. If Your + Product is not a competitive offering when You first make it + generally available, it will not become a competitive offering + later due to HashiCorp releasing a new version of the Licensed + Work with additional capabilities. In addition, Products that + are not provided on a paid basis are not competitive. +

    +

    + "Product" means software that is offered to end users to manage + in their own environments or offered as a service on a hosted + basis. +

    +

    + "Embedded" means including the source code or executable code + from the Licensed Work in a competitive offering. "Embedded" + also means packaging the competitive offering in such a way + that the Licensed Work must be accessed or downloaded for the + competitive offering to operate. +

    +

    + Hosting or using the Licensed Work(s) for internal purposes + within an organization is not considered a competitive + offering. HashiCorp considers your organization to include all + of your affiliates under common control. +

    +

    + For binding interpretive guidance on using HashiCorp products + under the Business Source License, please visit our FAQ. + (https://www.hashicorp.com/license-faq) +

  • Change Date: Four years from the date the Licensed Work is published. diff --git a/templates/license/license.rtf.tmpl b/templates/license/license.rtf.tmpl index daac00da1aa05c98afe237cb662619e9941ca4af..d3e87148d8a0ca421f6c60ee0ce76893018707d6 100755 GIT binary patch delta 1608 zcmah}?TQ>l6vZfN65>Bi@JDhP2uWl!J3F`_$*&L+c1e&Zh%7dmJ6*TC%dM{JR8>#A z8J2m5F!&ZCs1M*9`33<`b??_~R-7L_boH%!&pG$p`|Ia_-nqWWd@Qyywn6ugyeYS) z+tW8!_ip9RI3H(*9%f$DBrCm$on$l9%5;1C;U7QkUix6qwSM*6rI%l7OU^6t6dmQR zZX^nII##s9q0*0?Z|($YSSy-~58Bzg;oj=jho3IT^wfE3THm-Jfm}hc(t(W5#Rhqh zHSDilxppP}tL)X!>+eQyO}?7om>$t+D66BM3(^$gwJk@4Tud*#Q*9oRnqxZYKZ^p` zWh&DS+T7^^y^sX(d;cIA{2I>%d&$g6WY(#LMKj_lxLg#Fw zIUonVhMO>`5i6mb8=h$cps05fg#TZn-GY+RCpNyP3XCbx2WoBFZIH1> zedLPXnKe#niOsa_7e!B`@emxFsBE=jJJ_V{$K(_gT&~(r@_3v-3Hj#j_2mXNX{Lnc zI$%H(;HQti8PnaxA}h2QwaC863WH)HE_U`_Jo)zd?$^(#im?d~HaEMj8&_%V=2*L9 zfZjaXruPeeMTdt-Vw4XiE-t=t``neRHIpnaCWrWC#Uv}jbV~PDKfL$jU*Em|_vL>9 D=*~sX delta 90 zcmdm_K2?glI;N;3%`hf0uQ+p}c;v<@E=(-NrO6qS?=U6km1kroXDDPADI7b_GL<)@S;mlRKCWRl+enR7oUBNqVm&LHOi diff --git a/templates/license/license.tmpl b/templates/license/license.tmpl index b399ab4a2..1a1cce710 100644 --- a/templates/license/license.tmpl +++ b/templates/license/license.tmpl @@ -5,10 +5,40 @@ Parameters Licensor: HashiCorp, Inc. Licensed Work: Vagrant %VERSION%. The Licensed Work is (c) %YEAR% HashiCorp, Inc. -Additional Use Grant: You may make production use of the Licensed Work, - provided such use does not include offering the Licensed Work - to third parties on a hosted or embedded basis which is - competitive with HashiCorp's products. +Additional Use Grant: You may make production use of the Licensed Work, provided + Your use does not include offering the Licensed Work to third + parties on a hosted or embedded basis in order to compete with + HashiCorp’s paid version(s) of the Licensed Work. For purposes + of this license: + + A "competitive offering" is a Product that is offered to third + parties on a paid basis, including through paid support + arrangements, that significantly overlaps with the capabilities + of HashiCorp's paid version(s) of the Licensed Work. If Your + Product is not a competitive offering when You first make it + generally available, it will not become a competitive offering + later due to HashiCorp releasing a new version of the Licensed + Work with additional capabilities. In addition, Products that + are not provided on a paid basis are not competitive. + + "Product" means software that is offered to end users to manage + in their own environments or offered as a service on a hosted + basis. + + "Embedded" means including the source code or executable code + from the Licensed Work in a competitive offering. "Embedded" + also means packaging the competitive offering in such a way + that the Licensed Work must be accessed or downloaded for the + competitive offering to operate. + + Hosting or using the Licensed Work(s) for internal purposes + within an organization is not considered a competitive + offering. HashiCorp considers your organization to include all + of your affiliates under common control. + + For binding interpretive guidance on using HashiCorp products + under the Business Source License, please visit our FAQ. + (https://www.hashicorp.com/license-faq) Change Date: Four years from the date the Licensed Work is published. Change License: MPL 2.0