]>
Commit | Line | Data |
---|---|---|
eb32192b JM |
1 | Contributions to hostap.git |
2 | --------------------------- | |
3 | ||
4 | This software is distributed under a permissive open source license to | |
5 | allow it to be used in any projects, whether open source or proprietary. | |
6 | Contributions to the project are welcome and it is important to maintain | |
7 | clear record of contributions and terms under which they are licensed. | |
8 | To help with this, following procedure is used to allow acceptance and | |
9 | recording of the terms. | |
10 | ||
92484e2d JM |
11 | All contributions are expected to be licensed under the modified BSD |
12 | license (see below). Acknowledgment of the terms is tracked through | |
13 | inclusion of Signed-off-by tag in the contributions at the end of the | |
14 | commit log message. This tag indicates that the contributor agrees with | |
15 | the Developer Certificate of Origin (DCO) version 1.1 terms (see below; | |
16 | also available from http://developercertificate.org/). | |
17 | ||
18 | ||
19 | The current requirements for contributions to hostap.git | |
20 | -------------------------------------------------------- | |
21 | ||
22 | To indicate your acceptance of Developer's Certificate of Origin 1.1 | |
23 | terms, please add the following line to the end of the commit message | |
24 | for each contribution you make to the project: | |
25 | ||
26 | Signed-off-by: Your Name <your@email.example.org> | |
27 | ||
28 | using your real name. Pseudonyms or anonymous contributions cannot | |
29 | unfortunately be accepted. | |
30 | ||
31 | ||
32 | History of license and contributions terms | |
33 | ------------------------------------------ | |
eb32192b | 34 | |
331f89ff JM |
35 | Until February 11, 2012, in case of most files in hostap.git, "under the |
36 | open source license indicated in the file" means that the contribution | |
37 | is licensed both under GPL v2 and modified BSD license (see below) and | |
38 | the choice between these licenses is given to anyone who redistributes | |
39 | or uses the software. As such, the contribution has to be licensed under | |
40 | both options to allow this choice. | |
41 | ||
42 | As of February 11, 2012, the project has chosen to use only the BSD | |
43 | license option for future distribution. As such, the GPL v2 license | |
44 | option is no longer used and the contributions are not required to be | |
45 | licensed until GPL v2. In case of most files in hostap.git, "under the | |
46 | open source license indicated in the file" means that the contribution | |
47 | is licensed under the modified BSD license (see below). | |
48 | ||
92484e2d JM |
49 | Until February 13, 2014, the project used an extended version of the DCO |
50 | that included the identical items (a) through (d) from DCO 1.1 and an | |
51 | additional item (e): | |
52 | ||
53 | (e) The contribution can be licensed under the modified BSD license | |
54 | as shown below even in case of files that are currently licensed | |
55 | under other terms. | |
56 | ||
57 | This was used during the period when some of the files included the old | |
58 | license terms. Acceptance of this extended DCO version was indicated | |
59 | with a Signed-hostap tag in the commit message. This additional item (e) | |
60 | was used to collect explicit approval to license the contribution with | |
61 | only the modified BSD license (see below), i.e., without the GPL v2 | |
62 | option. This was done to allow simpler licensing terms to be used in the | |
63 | future. It should be noted that the modified BSD license is compatible | |
64 | with GNU GPL and as such, this possible move to simpler licensing option | |
65 | does not prevent use of this software in GPL projects. | |
66 | ||
eb32192b | 67 | |
92484e2d | 68 | ===[ start quote from http://developercertificate.org/ ]======================= |
eb32192b | 69 | |
92484e2d JM |
70 | Developer Certificate of Origin |
71 | Version 1.1 | |
72 | ||
73 | Copyright (C) 2004, 2006 The Linux Foundation and its contributors. | |
74 | 660 York Street, Suite 102, | |
75 | San Francisco, CA 94110 USA | |
76 | ||
77 | Everyone is permitted to copy and distribute verbatim copies of this | |
78 | license document, but changing it is not allowed. | |
79 | ||
80 | ||
81 | Developer's Certificate of Origin 1.1 | |
eb32192b JM |
82 | |
83 | By making a contribution to this project, I certify that: | |
84 | ||
85 | (a) The contribution was created in whole or in part by me and I | |
86 | have the right to submit it under the open source license | |
87 | indicated in the file; or | |
88 | ||
89 | (b) The contribution is based upon previous work that, to the best | |
90 | of my knowledge, is covered under an appropriate open source | |
91 | license and I have the right under that license to submit that | |
92 | work with modifications, whether created in whole or in part | |
93 | by me, under the same open source license (unless I am | |
94 | permitted to submit under a different license), as indicated | |
95 | in the file; or | |
96 | ||
97 | (c) The contribution was provided directly to me by some other | |
98 | person who certified (a), (b) or (c) and I have not modified | |
99 | it. | |
100 | ||
101 | (d) I understand and agree that this project and the contribution | |
102 | are public and that a record of the contribution (including all | |
103 | personal information I submit with it, including my sign-off) is | |
104 | maintained indefinitely and may be redistributed consistent with | |
105 | this project or the open source license(s) involved. | |
106 | ||
92484e2d | 107 | ===[ end quote from http://developercertificate.org/ ]========================= |
eb32192b JM |
108 | |
109 | ||
92484e2d JM |
110 | The license terms used for hostap.git files |
111 | ------------------------------------------- | |
eb32192b JM |
112 | |
113 | Modified BSD license (no advertisement clause): | |
114 | ||
937403b5 | 115 | Copyright (c) 2002-2015, Jouni Malinen <j@w1.fi> and contributors |
eb32192b JM |
116 | All Rights Reserved. |
117 | ||
118 | Redistribution and use in source and binary forms, with or without | |
119 | modification, are permitted provided that the following conditions are | |
120 | met: | |
121 | ||
122 | 1. Redistributions of source code must retain the above copyright | |
123 | notice, this list of conditions and the following disclaimer. | |
124 | ||
125 | 2. Redistributions in binary form must reproduce the above copyright | |
126 | notice, this list of conditions and the following disclaimer in the | |
127 | documentation and/or other materials provided with the distribution. | |
128 | ||
129 | 3. Neither the name(s) of the above-listed copyright holder(s) nor the | |
130 | names of its contributors may be used to endorse or promote products | |
131 | derived from this software without specific prior written permission. | |
132 | ||
133 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | |
134 | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | |
135 | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | |
136 | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | |
137 | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |
138 | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | |
139 | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
140 | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
141 | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
142 | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |
143 | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |