aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2012-08-09 18:21:10 (GMT)
committerJouni Malinen <j@w1.fi>2012-08-09 20:18:31 (GMT)
commit500db924a8feedba90f0bd3340c7527656770685 (patch)
tree9c78b470c1877f65bb4c517b590f0955ac947b86
parentf7fbe28fc6b8ea43b0a1a7ef22db70f4c0a7f3bf (diff)
downloadhostap-500db924a8feedba90f0bd3340c7527656770685.zip
hostap-500db924a8feedba90f0bd3340c7527656770685.tar.gz
hostap-500db924a8feedba90f0bd3340c7527656770685.tar.bz2
AOSP: Remove CONTRIBUTIONS file
-rw-r--r--CONTRIBUTIONS111
-rw-r--r--README3
2 files changed, 0 insertions, 114 deletions
diff --git a/CONTRIBUTIONS b/CONTRIBUTIONS
deleted file mode 100644
index 5ac7868..0000000
--- a/CONTRIBUTIONS
+++ /dev/null
@@ -1,111 +0,0 @@
-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.
-
-Until February 11, 2012, 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.
-
-As of February 11, 2012, the project has chosen to use only the BSD
-license option for future distribution. As such, the GPL v2 license
-option is no longer used and the contributions are not required to be
-licensed until GPL v2. In case of most files in hostap.git, "under the
-open source license indicated in the file" means that the contribution
-is licensed under the modified BSD license (see below).
-
-
-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 was 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@email.example.org>
-
-using your real name. Pseudonyms or anonymous contributions cannot
-unfortunately be accepted.
-
-
-
-Modified BSD license (no advertisement clause):
-
-Copyright (c) 2002-2012, Jouni Malinen <j@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.
diff --git a/README b/README
index 1721a3b..805c6cf 100644
--- a/README
+++ b/README
@@ -7,9 +7,6 @@ All Rights Reserved.
These programs are licensed under the BSD license (the one with
advertisement clause removed).
-If you are submitting changes to the project, please see CONTRIBUTIONS
-file for more instructions.
-
This package may include either wpa_supplicant, hostapd, or both. See
README file respective subdirectories (wpa_supplicant/README or