From 6bec43d415181dd45ca07a0cf3f964cd8ce6e973 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Fri, 14 Sep 2012 10:32:53 +0200 Subject: Move information in COPYING to LICENSE and remove COPYING. Also, rearrange copyright years. Also also, state NORDUnet as being the provider of the software in the BSD license. --- LICENSE | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index 35c2b98..b4f2f7b 100644 --- a/LICENSE +++ b/LICENSE @@ -7,8 +7,9 @@ Public License Version 2 or later (GPL). Alternatively the radsecproxy source code is subject to the terms of the below BSD style license. -* Copyright (c) 2006-2010, UNINETT AS -* Copyright (c) 2010,2011, NORDUnet A/S +* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS. +* Copyright (c) 2010, UNINETT AS, NORDUnet A/S. +* Copyright (c) 2010-2012, NORDUnet A/S. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -18,14 +19,15 @@ below BSD style license. * * 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 distribution. -* * Neither the name of the UNINETT AS nor the names of its -* contributors may be used to endorse or promote products derived -* from this software without specific prior written permission. +* * Neither the name of NORDUnet A/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 UNINETT AS ``AS IS'' AND ANY +* THIS SOFTWARE IS PROVIDED BY NORDUNET AS ``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 UNINETT AS BE LIABLE FOR ANY +* DISCLAIMED. IN NO EVENT SHALL NORDUNET AS 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 -- cgit v1.1 From e728b33733f3c6db5bbe2f040b251d1e9a70c5c7 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Fri, 14 Sep 2012 11:14:56 +0200 Subject: Add copyright information to LICENSE. All source files refer to LICENSE. Without copyright information in the header of that file it might be possible that it changes without all the copyright holders permission. --- LICENSE | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index b4f2f7b..e6ef412 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,7 @@ +Copyright (c) 2006-2009, Stig Venaas, UNINETT AS. +Copyright (c) 2010, UNINETT AS, NORDUnet A/S. +Copyright (c) 2010-2012, NORDUnet A/S. + The radsecproxy source code is subject to two licenses, you may pick the one that best suits your needs. -- cgit v1.1 From e64a1e6a4e162c4218efa62e3f8e515019a390c8 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Fri, 14 Sep 2012 11:17:24 +0200 Subject: Add OpenSSL linking exemption to GPL license. --- LICENSE | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index e6ef412..42c1c81 100644 --- a/LICENSE +++ b/LICENSE @@ -5,8 +5,23 @@ Copyright (c) 2010-2012, NORDUnet A/S. The radsecproxy source code is subject to two licenses, you may pick the one that best suits your needs. + The radsecproxy source code is subject to the terms of the GNU General -Public License Version 2 or later (GPL). +Public License Version 2 or later (GPL) with the following exemption. + + * In addition, as a special exception, the copyright holders give + * permission to link the code of portions of this program with the + * OpenSSL library under certain conditions as described in each + * individual source file, and distribute linked combinations + * including the two. + * You must obey the GNU General Public License in all respects + * for all of the code used other than OpenSSL. If you modify + * file(s) with this exception, you may extend this exception to your + * version of the file(s), but you are not obligated to do so. If you + * do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source + * files in the program, then also delete it here. + Alternatively the radsecproxy source code is subject to the terms of the below BSD style license. -- cgit v1.1 From 8d3d567f3b3e0b7f56cce1d878d34768ee86b3c0 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Mon, 17 Sep 2012 09:49:39 +0200 Subject: Remove Stig from first copyright line. --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index 42c1c81..08f8c5e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2006-2009, Stig Venaas, UNINETT AS. +Copyright (c) 2006-2010, UNINETT AS. Copyright (c) 2010, UNINETT AS, NORDUnet A/S. Copyright (c) 2010-2012, NORDUnet A/S. @@ -26,7 +26,7 @@ Public License Version 2 or later (GPL) with the following exemption. Alternatively the radsecproxy source code is subject to the terms of the below BSD style license. -* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS. +* Copyright (c) 2006-2010, UNINETT AS. * Copyright (c) 2010, UNINETT AS, NORDUnet A/S. * Copyright (c) 2010-2012, NORDUnet A/S. * All rights reserved. -- cgit v1.1 From 1c6043308251a2884892cfc726dde45ab115d326 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Mon, 17 Sep 2012 09:56:38 +0200 Subject: Remove the second copyright line, with both UNINETT and NORDUnet. The overlap is clearly expressed without it. --- LICENSE | 2 -- 1 file changed, 2 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index 08f8c5e..a2fdbad 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,4 @@ Copyright (c) 2006-2010, UNINETT AS. -Copyright (c) 2010, UNINETT AS, NORDUnet A/S. Copyright (c) 2010-2012, NORDUnet A/S. The radsecproxy source code is subject to two licenses, you may pick @@ -27,7 +26,6 @@ Alternatively the radsecproxy source code is subject to the terms of the below BSD style license. * Copyright (c) 2006-2010, UNINETT AS. -* Copyright (c) 2010, UNINETT AS, NORDUnet A/S. * Copyright (c) 2010-2012, NORDUnet A/S. * All rights reserved. * -- cgit v1.1 From 99cd70118fe023e7b2c19132778383a98b05028b Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Mon, 17 Sep 2012 09:59:47 +0200 Subject: Remove the GPL license. Also remove the header with two copyright lines. It seems clear what the copyright of this file is even without these two lines. --- LICENSE | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index a2fdbad..7a1a5a7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,29 +1,4 @@ -Copyright (c) 2006-2010, UNINETT AS. -Copyright (c) 2010-2012, NORDUnet A/S. - -The radsecproxy source code is subject to two licenses, you may pick -the one that best suits your needs. - - -The radsecproxy source code is subject to the terms of the GNU General -Public License Version 2 or later (GPL) with the following exemption. - - * In addition, as a special exception, the copyright holders give - * permission to link the code of portions of this program with the - * OpenSSL library under certain conditions as described in each - * individual source file, and distribute linked combinations - * including the two. - * You must obey the GNU General Public License in all respects - * for all of the code used other than OpenSSL. If you modify - * file(s) with this exception, you may extend this exception to your - * version of the file(s), but you are not obligated to do so. If you - * do not wish to do so, delete this exception statement from your - * version. If you delete this exception statement from all source - * files in the program, then also delete it here. - - -Alternatively the radsecproxy source code is subject to the terms of the -below BSD style license. +Radsecproxy is distributed under this license: * Copyright (c) 2006-2010, UNINETT AS. * Copyright (c) 2010-2012, NORDUnet A/S. -- cgit v1.1 From 9142e68885bb6d19f0f6d44c4d8daf5ae4d12cbe Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 25 Sep 2012 13:41:08 +0200 Subject: Formatting changes. And, actually, a typo in catgconf.c. Cherry-picked b712a6bf from branch 'licensing'. Conflicts: LICENSE --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index 7a1a5a7..1cdfeac 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ Radsecproxy is distributed under this license: -* Copyright (c) 2006-2010, UNINETT AS. -* Copyright (c) 2010-2012, NORDUnet A/S. +* Copyright (c) 2006-2010, UNINETT AS +* Copyright (c) 2010-2012, NORDUnet A/S * All rights reserved. * * Redistribution and use in source and binary forms, with or without -- cgit v1.1