Skip to content

Commit ea353eb

Browse files
committed
Allow dual-licensing with Apache 2.0
related to #8
1 parent 7e3f67d commit ea353eb

File tree

15 files changed

+217
-14
lines changed

15 files changed

+217
-14
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ jobs:
169169
staging="${{ env.BIN_NAME }}-${{ matrix.feature }}-${{ env.RELEASE_VERSION }}-${{ matrix.target }}"
170170
mkdir -p "$staging"
171171
172-
cp {README.md,LICENSE.md,CHANGELOG.md} "$staging/"
172+
cp {README.md,LICENSE-*,CHANGELOG.md} "$staging/"
173173
174174
cp target/${{ matrix.target }}/release/${{ env.BIN_NAME }}{,p} "$staging/"
175175
tar czf "$staging.tar.gz" "$staging"
@@ -270,7 +270,7 @@ jobs:
270270
staging="${{ env.BIN_NAME }}-${{ matrix.feature }}-${{ env.RELEASE_VERSION }}-${{ matrix.target }}"
271271
mkdir -p "$staging"
272272
273-
cp {README.md,LICENSE.md,CHANGELOG.md} "$staging/"
273+
cp {README.md,LICENSE-*,CHANGELOG.md} "$staging/"
274274
275275
cp target/${{ matrix.target }}/release/${{ env.BIN_NAME }}{,p}.exe "$staging/"
276276
7z a "$staging.zip" "$staging"

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ description = "A command-line application for interacting with git repositories"
44
repository = "https://github.com/Byron/git-oxide"
55
authors = ["Sebastian Thiel <[email protected]>"]
66
edition = "2018"
7-
license = "MIT"
7+
license = "MIT/Apache-2.0"
88
version = "0.3.0"
99
default-run = "gix"
10-
include = ["src/**/*", "LICENSE.md", "README.md", "CHANGELOG.md"]
10+
include = ["src/**/*", "LICENSE-*", "README.md", "CHANGELOG.md"]
1111

1212
[[bin]]
1313
name = "gix"

LICENSE-APACHE

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
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.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
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,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
Copyright 2020 Sebastian Thiel
180+
181+
Licensed under the Apache License, Version 2.0 (the "License");
182+
you may not use this file except in compliance with the License.
183+
You may obtain a copy of the License at
184+
185+
http://www.apache.org/licenses/LICENSE-2.0
186+
187+
Unless required by applicable law or agreed to in writing, software
188+
distributed under the License is distributed on an "AS IS" BASIS,
189+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
190+
See the License for the specific language governing permissions and
191+
limitations under the License.

LICENSE.md renamed to LICENSE-MIT

File renamed without changes.

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,18 @@ From there, we can derive a few rules to try adhere to:
419419
* **deflate2** _(MIT Licensed)_
420420
* We use various abstractions to implement decompression and compression directly on top of the rather low-level `miniz_oxide` crate
421421

422+
## License
423+
424+
This project is licensed under either of
425+
426+
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
427+
http://www.apache.org/licenses/LICENSE-2.0)
428+
* MIT license ([LICENSE-MIT](LICENSE-MIT) or
429+
http://opensource.org/licenses/MIT)
430+
431+
at your option.
432+
433+
422434
## Unused Performance Optimizations
423435
* **miniz-oxide**
424436
* **unnecessary buffer reset**

git-features/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = "A crate to integrate various capabilities using compile-time feat
44
repository = "https://github.com/Byron/git-oxide"
55
version = "0.3.0"
66
authors = ["Sebastian Thiel <[email protected]>"]
7-
license = "MIT"
7+
license = "MIT/Apache-2.0"
88
edition = "2018"
99

1010
[lib]

git-object/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.3.0"
44
description = "Borrowed and owned git objects with deserialization and serialization support"
55
authors = ["Sebastian Thiel <[email protected]>"]
66
repository = "https://github.com/Byron/git-oxide"
7-
license = "MIT"
7+
license = "MIT/Apache-2.0"
88
edition = "2018"
99
include = ["src/**/*"]
1010

git-odb/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "git-odb"
33
version = "0.3.0"
44
repository = "https://github.com/Byron/git-oxide"
55
authors = ["Sebastian Thiel <[email protected]>"]
6-
license = "MIT"
6+
license = "MIT/Apache-2.0"
77
description = "Implements a git object database for loose objects and packs"
88
edition = "2018"
99
include = ["src/**/*"]

git-protocol/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "git-protocol"
33
version = "0.0.0"
44
repository = "https://github.com/Byron/git-oxide"
5-
license = "MIT"
5+
license = "MIT/Apache-2.0"
66
description = "A WIP crate of the gitoxide project for implementing git protocols"
77
authors = ["Sebastian Thiel <[email protected]>"]
88
edition = "2018"

git-ref/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "git-ref"
33
version = "0.3.0"
44
repository = "https://github.com/Byron/git-oxide"
5-
license = "MIT"
5+
license = "MIT/Apache-2.0"
66
description = "A crate to handle git references"
77
authors = ["Sebastian Thiel <[email protected]>"]
88
edition = "2018"

git-repository/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "git-repository"
33
repository = "https://github.com/Byron/git-oxide"
44
description = "Manipulation of git repositories"
5-
license = "MIT"
5+
license = "MIT/Apache-2.0"
66
version = "0.3.0"
77
authors = ["Sebastian Thiel <[email protected]>"]
88
edition = "2018"

git-transport/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "git-transport"
33
version = "0.0.0"
44
repository = "https://github.com/Byron/git-oxide"
5-
license = "MIT"
5+
license = "MIT/Apache-2.0"
66
description = "A WIP crate of the gitoxide project dedicated to implementing the git transport layer"
77
authors = ["Sebastian Thiel <[email protected]>"]
88
edition = "2018"

git-tui/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "git-tui"
33
version = "0.0.0"
44
repository = "https://github.com/Byron/git-oxide"
5-
license = "MIT"
5+
license = "MIT/Apache-2.0"
66
description = "A WIP crate of the gitoxide project dedicated to a terminal user interface to interact with git repositories"
77
authors = ["Sebastian Thiel <[email protected]>"]
88
edition = "2018"

git-url/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "git-url"
33
version = "0.0.0"
44
repository = "https://github.com/Byron/git-oxide"
5-
license = "MIT"
5+
license = "MIT/Apache-2.0"
66
description = "A WIP crate of the gitoxide project implementing parsing and serialization of git-url"
77
authors = ["Sebastian Thiel <[email protected]>"]
88
edition = "2018"

gitoxide-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = "The library implementating all capabilities of the gitoxide CLI"
44
repository = "https://github.com/Byron/git-oxide"
55
version = "0.3.0"
66
authors = ["Sebastian Thiel <[email protected]>"]
7-
license = "MIT"
7+
license = "MIT/Apache-2.0"
88
edition = "2018"
99

1010
[lib]

0 commit comments

Comments
 (0)