From 281ccb0dbfa746cf82bfe721c45bb72827ba0abb Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 24 Mar 2011 16:29:48 +0100 Subject: Harmonise with radsecproxy licensing. Dual license the library by adding GPL v2 or later. Change the 2-clause BSD to a 3-clause. --- lib/COPYING | 62 +++++++++++++++++++++++++++++++++++++------------------------ lib/README | 5 +++++ 2 files changed, 43 insertions(+), 24 deletions(-) diff --git a/lib/COPYING b/lib/COPYING index 7256aa4..44b4f76 100644 --- a/lib/COPYING +++ b/lib/COPYING @@ -1,27 +1,41 @@ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +The libradsec source code is subject to two licenses, you may pick the +one that best suits your needs. - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. +The libradsec source code is subject to the terms of the GNU General +Public License Version 2 or later (GPL). - 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. +Alternatively the libradsec source code is subject to the terms of the +below BSD style license. -THIS SOFTWARE IS PROVIDED BY NORDUNET A/S ``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 NORDUNET A/S 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. - -The views and conclusions contained in the software and documentation -are those of the authors and should not be interpreted as representing -official policies, either expressed or implied, of NORDUnet A/S. +* Copyright (c) 2006-2010, UNINETT AS +* Copyright (c) 2010-2011, NORDUnet A/S +* 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 of the UNINETT AS or the NORDUnet A/S, nor the +* names of the contributors may be used to endorse or promote +* products derived from this software without specific prior +* written permission. +* +* THIS SOFTWARE IS PROVIDED BY UNINETT AS AND NORDUNET A/S ``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 NORDUNET A/S 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/lib/README b/lib/README index c76031a..c8ea189 100644 --- a/lib/README +++ b/lib/README @@ -7,6 +7,11 @@ The canonical pickup point is http://git.nordu.net/?p=radsecproxy.git;a=shortlog;h=refs/heads/libradsec +The source code is licensed under two different licenses, a 3-clause +BSD license and the GNU General Public License (version 2 or later). +Users of this library may choose which of these suits them best. + + libradsec depends on - libradius from the FreeRADIUS freeradius-server - libevent2 -- cgit v1.1