Skip to content

Commit 888cf44

Browse files
eirinikosblp
authored andcommitted
Edit Open vSwitch license info so that GitHub recognizes it.
GitHub uses a library called Licensee to identify a project's license type. It shows this information in the status bar and via the API if it can unambiguously identify the license. This commit creates a LICENSE file that stores the full text of the Apache license. It also removes the COPYING file and transfers its contents to a new "License" section in the README. Collectively, these changes allow Licensee to successfully identify the license type of Open vSwitch's codebase as Apache. Submitted-at: openvswitch/ovs#224 Signed-off-by: Andrea Kao <[email protected]> [[email protected] removed references to COPYING and updated Makefile.am] Signed-off-by: Ben Pfaff <[email protected]> Acked-by: Aaron Conole <[email protected]>
1 parent 1ea1b0d commit 888cf44

7 files changed

+228
-48
lines changed

COPYING

-42
This file was deleted.

LICENSE

+191
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
https://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 The Open vSwitch Authors
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+
https://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.

Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ PYCOV_CLEAN_FILES = build-aux/check-structs,cover
7272
EXTRA_DIST = \
7373
AUTHORS.rst \
7474
CONTRIBUTING.rst \
75+
LICENSE \
7576
MAINTAINERS.rst \
7677
README.rst \
7778
NOTICE \

README.rst

+33
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,39 @@ Each Open vSwitch userspace program is accompanied by a manpage. Many of the
9494
manpages are customized to your configuration as part of the build process, so
9595
we recommend building Open vSwitch before reading the manpages.
9696

97+
License
98+
-------
99+
100+
The following is a summary of the licensing of files in this distribution.
101+
As mentioned, Open vSwitch is licensed under the open source Apache 2 license.
102+
Some files may be marked specifically with a different license, in which case
103+
that license applies to the file in question.
104+
105+
106+
Files under the datapath directory are licensed under the GNU General Public
107+
License, version 2.
108+
109+
File build-aux/cccl is licensed under the GNU General Public License, version 2.
110+
111+
The following files are licensed under the 2-clause BSD license.
112+
include/windows/getopt.h
113+
lib/getopt_long.c
114+
lib/conntrack-tcp.c
115+
116+
The following files are licensed under the 3-clause BSD-license
117+
include/windows/netinet/icmp6.h
118+
include/windows/netinet/ip6.h
119+
lib/strsep.c
120+
121+
Files under the xenserver directory are licensed on a file-by-file basis.
122+
Refer to each file for details.
123+
124+
Files lib/sflow*.[ch] are licensed under the terms of either the
125+
Sun Industry Standards Source License 1.1, that is available at:
126+
http://host-sflow.sourceforge.net/sissl.html
127+
or the InMon sFlow License, that is available at:
128+
http://www.inmon.com/technology/sflowlicense.txt
129+
97130
Contact
98131
-------
99132

debian/rules

+1-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ override_dh_install-indep:
8686
rm -rf debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_VERSION_UPSTREAM)/rhel
8787
# And we should also clean useless license files, which are already
8888
# described in our debian/copyright anyway.
89-
rm -f debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_VERSION_UPSTREAM)/COPYING \
90-
debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_VERSION_UPSTREAM)/xenserver/LICENSE
89+
rm -f debian/$(PACKAGE_DKMS)/usr/src/$(PACKAGE)-$(DEB_VERSION_UPSTREAM)/xenserver/LICENSE
9190

9291
override_dh_installinit:
9392
dh_installinit -R

rhel/openvswitch-fedora.spec.in

+1-3
Original file line numberDiff line numberDiff line change
@@ -485,12 +485,10 @@ fi
485485

486486
%files -n %{_py2}-openvswitch
487487
%{python2_sitelib}/ovs
488-
%doc COPYING
489488

490489
%if 0%{?fedora} > 22 || %{with build_python3}
491490
%files -n python3-openvswitch
492491
%{python3_sitelib}/ovs
493-
%doc COPYING
494492
%endif
495493

496494
%files test
@@ -584,7 +582,7 @@ fi
584582
%if %{with dpdk}
585583
%{_prefix}/lib/udev/rules.d/91-vfio.rules
586584
%endif
587-
%doc COPYING NOTICE README.rst NEWS rhel/README.RHEL.rst
585+
%doc NOTICE README.rst NEWS rhel/README.RHEL.rst
588586
/var/lib/openvswitch
589587
%attr(755,-,-) /var/log/openvswitch
590588
%ghost %attr(755,root,root) %{_rundir}/openvswitch

rhel/openvswitch.spec.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ exit 0
256256
/usr/share/openvswitch/scripts/sysconfig.template
257257
/usr/share/openvswitch/vswitch.ovsschema
258258
/usr/share/openvswitch/vtep.ovsschema
259-
%doc COPYING NOTICE README.rst NEWS rhel/README.RHEL.rst
259+
%doc NOTICE README.rst NEWS rhel/README.RHEL.rst
260260
/var/lib/openvswitch
261261
/var/log/openvswitch
262262

0 commit comments

Comments
 (0)