diff options
| author | Jouni Malinen <j@w1.fi> | 2012-02-11 14:04:12 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2012-02-11 19:39:31 +0200 |
| commit | 331f89ff5bee365e1229fc25878791dea52f8d6e (patch) | |
| tree | d2cb0ce20e1a93391cd91bfad3352c95536ec9d3 /README | |
| parent | 5ea93947ca67ba83529798b806a15b247cdb2e93 (diff) | |
| download | external_wpa_supplicant_8_ti-331f89ff5bee365e1229fc25878791dea52f8d6e.zip external_wpa_supplicant_8_ti-331f89ff5bee365e1229fc25878791dea52f8d6e.tar.gz external_wpa_supplicant_8_ti-331f89ff5bee365e1229fc25878791dea52f8d6e.tar.bz2 | |
Select the BSD license terms as the only license alternative
Simplify licensing terms for hostap.git by selecting the BSD license
alternative for any future distribution. This drops the GPL v2
alternative from distribution terms and from contribution requirements.
The BSD license alternative that has been used in hostap.git (the one
with advertisement clause removed) is compatible with GPL and as such
the software in hostap.git can still be used with GPL projects. In
addition, any new contribution to hostap.git is expected to be licensed
under the BSD terms that allow the changes to be merged into older
hostap repositories that still include the GPL v2 alternative.
Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'README')
| -rw-r--r-- | README | 27 |
1 files changed, 4 insertions, 23 deletions
@@ -4,9 +4,8 @@ wpa_supplicant and hostapd Copyright (c) 2002-2012, Jouni Malinen <j@w1.fi> and contributors All Rights Reserved. -These programs are dual-licensed under both the GPL version 2 and BSD -license (the one with advertisement clause removed). Either license -may be used at your option. +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. @@ -26,26 +25,8 @@ 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: +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 |