Dmitry Shmidt | 96be622 | 2014-02-13 10:16:51 -0800 | [diff] [blame] | 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 | |
| 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 | |
Dmitry Shmidt | d80a401 | 2015-11-05 16:35:40 -0800 | [diff] [blame] | 32 | The preferred method of submitting the contribution to the project is by |
| 33 | email to the hostap mailing list: |
| 34 | hostap@lists.infradead.org |
| 35 | Note that the list may require subscription before accepting message |
| 36 | without moderation. You can subscribe to the list at this address: |
| 37 | http://lists.infradead.org/mailman/listinfo/hostap |
| 38 | |
| 39 | The message should contain an inlined patch against the current |
Hai Shalom | a20dcd7 | 2022-02-04 13:43:00 -0800 | [diff] [blame] | 40 | development branch (i.e., the main branch of |
Dmitry Shmidt | d80a401 | 2015-11-05 16:35:40 -0800 | [diff] [blame] | 41 | git://w1.fi/hostap.git). Please make sure the software you use for |
| 42 | sending the patch does not corrupt whitespace. If that cannot be fixed |
| 43 | for some reason, it is better to include an attached version of the |
| 44 | patch file than just send a whitespace damaged version in the message |
| 45 | body. |
| 46 | |
| 47 | The patches should be separate logical changes rather than doing |
| 48 | everything in a single patch. In other words, please keep cleanup, new |
| 49 | features, and bug fixes all in their own patches. Each patch needs a |
| 50 | commit log that describes the changes (what the changes fix, what |
| 51 | functionality is added, why the changes are useful, etc.). |
| 52 | |
| 53 | Please try to follow the coding style used in the project. |
| 54 | |
| 55 | In general, the best way of generating a suitable formatted patch file |
| 56 | is by committing the changes to a cloned git repository and using git |
| 57 | format-patch. The patch can then be sent, e.g., with git send-email. |
| 58 | |
| 59 | |
Dmitry Shmidt | 96be622 | 2014-02-13 10:16:51 -0800 | [diff] [blame] | 60 | History of license and contributions terms |
| 61 | ------------------------------------------ |
| 62 | |
| 63 | Until February 11, 2012, in case of most files in hostap.git, "under the |
| 64 | open source license indicated in the file" means that the contribution |
| 65 | is licensed both under GPL v2 and modified BSD license (see below) and |
| 66 | the choice between these licenses is given to anyone who redistributes |
| 67 | or uses the software. As such, the contribution has to be licensed under |
| 68 | both options to allow this choice. |
| 69 | |
| 70 | As of February 11, 2012, the project has chosen to use only the BSD |
| 71 | license option for future distribution. As such, the GPL v2 license |
| 72 | option is no longer used and the contributions are not required to be |
| 73 | licensed until GPL v2. In case of most files in hostap.git, "under the |
| 74 | open source license indicated in the file" means that the contribution |
| 75 | is licensed under the modified BSD license (see below). |
| 76 | |
| 77 | Until February 13, 2014, the project used an extended version of the DCO |
| 78 | that included the identical items (a) through (d) from DCO 1.1 and an |
| 79 | additional item (e): |
| 80 | |
| 81 | (e) The contribution can be licensed under the modified BSD license |
| 82 | as shown below even in case of files that are currently licensed |
| 83 | under other terms. |
| 84 | |
| 85 | This was used during the period when some of the files included the old |
| 86 | license terms. Acceptance of this extended DCO version was indicated |
| 87 | with a Signed-hostap tag in the commit message. This additional item (e) |
| 88 | was used to collect explicit approval to license the contribution with |
| 89 | only the modified BSD license (see below), i.e., without the GPL v2 |
| 90 | option. This was done to allow simpler licensing terms to be used in the |
| 91 | future. It should be noted that the modified BSD license is compatible |
| 92 | with GNU GPL and as such, this possible move to simpler licensing option |
| 93 | does not prevent use of this software in GPL projects. |
| 94 | |
| 95 | |
| 96 | ===[ start quote from http://developercertificate.org/ ]======================= |
| 97 | |
| 98 | Developer Certificate of Origin |
| 99 | Version 1.1 |
| 100 | |
| 101 | Copyright (C) 2004, 2006 The Linux Foundation and its contributors. |
| 102 | 660 York Street, Suite 102, |
| 103 | San Francisco, CA 94110 USA |
| 104 | |
| 105 | Everyone is permitted to copy and distribute verbatim copies of this |
| 106 | license document, but changing it is not allowed. |
| 107 | |
| 108 | |
| 109 | Developer's Certificate of Origin 1.1 |
| 110 | |
| 111 | By making a contribution to this project, I certify that: |
| 112 | |
| 113 | (a) The contribution was created in whole or in part by me and I |
| 114 | have the right to submit it under the open source license |
| 115 | indicated in the file; or |
| 116 | |
| 117 | (b) The contribution is based upon previous work that, to the best |
| 118 | of my knowledge, is covered under an appropriate open source |
| 119 | license and I have the right under that license to submit that |
| 120 | work with modifications, whether created in whole or in part |
| 121 | by me, under the same open source license (unless I am |
| 122 | permitted to submit under a different license), as indicated |
| 123 | in the file; or |
| 124 | |
| 125 | (c) The contribution was provided directly to me by some other |
| 126 | person who certified (a), (b) or (c) and I have not modified |
| 127 | it. |
| 128 | |
| 129 | (d) I understand and agree that this project and the contribution |
| 130 | are public and that a record of the contribution (including all |
| 131 | personal information I submit with it, including my sign-off) is |
| 132 | maintained indefinitely and may be redistributed consistent with |
| 133 | this project or the open source license(s) involved. |
| 134 | |
| 135 | ===[ end quote from http://developercertificate.org/ ]========================= |
| 136 | |
| 137 | |
| 138 | The license terms used for hostap.git files |
| 139 | ------------------------------------------- |
| 140 | |
| 141 | Modified BSD license (no advertisement clause): |
| 142 | |
Hai Shalom | a20dcd7 | 2022-02-04 13:43:00 -0800 | [diff] [blame] | 143 | Copyright (c) 2002-2022, Jouni Malinen <j@w1.fi> and contributors |
Dmitry Shmidt | 96be622 | 2014-02-13 10:16:51 -0800 | [diff] [blame] | 144 | All Rights Reserved. |
| 145 | |
| 146 | Redistribution and use in source and binary forms, with or without |
| 147 | modification, are permitted provided that the following conditions are |
| 148 | met: |
| 149 | |
| 150 | 1. Redistributions of source code must retain the above copyright |
| 151 | notice, this list of conditions and the following disclaimer. |
| 152 | |
| 153 | 2. Redistributions in binary form must reproduce the above copyright |
| 154 | notice, this list of conditions and the following disclaimer in the |
| 155 | documentation and/or other materials provided with the distribution. |
| 156 | |
| 157 | 3. Neither the name(s) of the above-listed copyright holder(s) nor the |
| 158 | names of its contributors may be used to endorse or promote products |
| 159 | derived from this software without specific prior written permission. |
| 160 | |
| 161 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 162 | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 163 | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 164 | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 165 | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 166 | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 167 | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 168 | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 169 | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 170 | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 171 | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |