From b877d7d52b0c12bc6d1f5cbcebbd054a4fb433b6 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 18 Dec 2012 14:40:35 +0100 Subject: Remove the option to use GPLv2 as the license. This follows the changes to the upstream radsecproxy repository. Also, Stig Venaas is removed from all copyright, replaced by UNINETT. Add JANET as copyright holder (avp.c). --- lib/COPYING | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'lib/COPYING') diff --git a/lib/COPYING b/lib/COPYING index 44b4f76..102c12e 100644 --- a/lib/COPYING +++ b/lib/COPYING @@ -1,13 +1,5 @@ -The libradsec source code is subject to two licenses, you may pick the -one that best suits your needs. - -The libradsec source code is subject to the terms of the GNU General -Public License Version 2 or later (GPL). - -Alternatively the libradsec source code is subject to the terms of the -below BSD style license. - -* Copyright (c) 2006-2010, UNINETT AS +* Copyright (c) 2007-2010, UNINETT AS +* Copyright (c) 2011, JANET(UK) * Copyright (c) 2010-2011, NORDUnet A/S * All rights reserved. * @@ -23,12 +15,12 @@ below BSD style license. * 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. +* 3. Neither the name of 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 +* 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 -- cgit v1.1 From 937144b230752ac640e611cabb57387f613997bc Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 19 Dec 2012 10:41:57 +0100 Subject: Rename COPYING -> LICENSE. And distribute LICENSE and HACKING. --- lib/COPYING | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 lib/COPYING (limited to 'lib/COPYING') diff --git a/lib/COPYING b/lib/COPYING deleted file mode 100644 index 102c12e..0000000 --- a/lib/COPYING +++ /dev/null @@ -1,33 +0,0 @@ -* Copyright (c) 2007-2010, UNINETT AS -* Copyright (c) 2011, JANET(UK) -* 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 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 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. -- cgit v1.1