Update for 0.8.x and include licensing terms in top level README

This brings in the full licensing text from
{hostapd,wpa_supplicant}/README into the top level README file
for clarity.
This commit is contained in:
Jouni Malinen 2010-11-10 22:10:02 +02:00
parent 5bf49c346c
commit dd149bbf44

73
README
View file

@ -1,19 +1,72 @@
wpa_supplicant and hostapd v0.6.x wpa_supplicant and hostapd
--------------------------------- --------------------------
Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi> and contributors Copyright (c) 2002-2010, Jouni Malinen <j@w1.fi> and contributors
All Rights Reserved. All Rights Reserved.
These program is dual-licensed under both the GPL version 2 and BSD These programs are dual-licensed under both the GPL version 2 and BSD
license. Either license may be used at your option. license (the one with advertisement clause removed). Either license
may be used at your option.
This package may include either wpa_supplicant, hostapd, or both. See This package may include either wpa_supplicant, hostapd, or both. See
README file respective subdirectories (wpa_supplicant/README or README file respective subdirectories (wpa_supplicant/README or
hostapd/README) for more details. hostapd/README) for more details.
Source code files have been moved around in v0.6.x releases and Source code files were moved around in v0.6.x releases and compared to
compared to earlier releases, the programs are now build by first earlier releases, the programs are now built by first going to a
going to a subdirectory (wpa_supplicant or hostapd) and creating subdirectory (wpa_supplicant or hostapd) and creating build
build configuration (.config) and running 'make' there (for configuration (.config) and running 'make' there (for Linux/BSD/cygwin
Linux/BSD/cygwin builds). builds).
License
-------
GPL v2:
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
(this copy of the license is in COPYING file)
Alternatively, this software may be distributed, used, and modified
under the terms of BSD license:
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.