Contributions to hostap.git

[Jouni Malinen]

I'm planning on introducing a more formal procedure for tracking
contributions to hostap.git (wpa_supplicant, hostapd, and any other
related files in the repository). The goal here is to minimize any
possibility of misunderstanding or confusion on the exact terms under
which the contributions need to be licensed under and to record explicit
acceptance of the terms. Similar expectations on contributions have been
in place in the past, but the process for confirming this for each
contribution has been less formal.

If you are familiar with development process used with the Linux kernel,
you'll find this to be very similar, but there are some additional
clarifications to cover the different licensing model used in
hostap.git.

Please let me know if you have any questions or concerns on this. I'm
requesting all new contributions to follow the described process and I'm
planning on starting to enforce this eventually for anything committed
into hostap.git.

The latest version of the description is in the CONTRIBUTIONS file at
the top level of hostap.git which can also be viewed through the gitweb
interface at
http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=blob_plain;f=CONTRIBUTIONS

I'm included the current version of that file below:


Contributions to hostap.git
---------------------------

This software is distributed under a permissive open source license to
allow it to be used in any projects, whether open source or proprietary.
Contributions to the project are welcome and it is important to maintain
clear record of contributions and terms under which they are licensed.
To help with this, following procedure is used to allow acceptance and
recording of the terms.

These terms are similar to the process used in Linux kernel development.
The items (a) through (d) are identical to the Developer's Certificate
of Origin 1.1. To enable cleaner licensing option to be provided in the
future, an additional item (e) is included.

In case of most files in hostap.git, "under the open source license
indicated in the file" means that the contribution is licensed both
under GPL v2 and modified BSD license (see below) and the choice between
these licenses is given to anyone who redistributes or uses the
software. As such, the contribution has to be licensed under both
options to allow this choice.

The additional item (e) is used to collect explicit approval to license
the contribution with only the modified BSD license (see below), i.e.,
without the GPL v2 option. This is done to allow simpler licensing terms
to be used in the future. It should be noted that the modified BSD
license is compatible with GNU GPL and as such, this possible move to
simpler licensing option does not prevent use of this software in
GPL projects.


By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

Additionally, I certify that:

(e) The contribution can be licensed under the modified BSD license
    as shown below even in case of files that are currently licensed
    under other terms.


To indicate your acceptance of these terms, please add the following
line to each contribution you make to the project:

Signed-hostap: Your Name <your at email.example.org>

using your real name. Pseudonyms or anonymous contributions cannot
unfortunately be accepted.



Modified BSD license (no advertisement clause):

Copyright (c) 2002-2011, Jouni Malinen <j at w1.fi> and contributors
All Rights Reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

1. Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in the
   documentation and/or other materials provided with the distribution.

3. Neither the name(s) of the above-listed copyright holder(s) nor the
   names of its contributors may be used to endorse or promote products
   derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-- 
Jouni Malinen                                            PGP id EFC895FA