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).

diff --git a/lib/COPYING b/lib/COPYING
index 44b4f76..102c12e 100644 (file)
--- 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

diff --git a/lib/rsp_debug.c b/lib/rsp_debug.c
index dd7c053..a9c5e8f 100644 (file)
--- a/lib/rsp_debug.c
+++ b/lib/rsp_debug.c
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2007 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2007-2009, UNINETT AS
+ * Copyright (c) 2010-2011, NORDUnet A/S */
+/* See COPYING for licensing information. */
 
 #ifndef SYS_SOLARIS9
 #include <stdint.h>

diff --git a/lib/rsp_debug.h b/lib/rsp_debug.h
index 382d900..1a4c39c 100644 (file)
--- a/lib/rsp_debug.h
+++ b/lib/rsp_debug.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2007 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2007-2009, UNINETT AS
+ * Copyright (c) 2010-2011, NORDUnet A/S */
+/* See COPYING for licensing information. */
 
 #ifndef SYS_SOLARIS9
 #include <stdint.h>

diff --git a/lib/rsp_hash.c b/lib/rsp_hash.c
index cc37e7f..6d08e83 100644 (file)
--- a/lib/rsp_hash.c
+++ b/lib/rsp_hash.c
@@ -1,10 +1,5 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2008, UNINETT AS */
+/* See COPYING for licensing information. */
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/lib/rsp_hash.h b/lib/rsp_hash.h
index 10968b1..a95b50b 100644 (file)
--- a/lib/rsp_hash.h
+++ b/lib/rsp_hash.h
@@ -1,10 +1,5 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2008, UNINETT AS */
+/* See COPYING for licensing information. */
 
 #ifndef SYS_SOLARIS9
 #include <stdint.h>

diff --git a/lib/rsp_list.c b/lib/rsp_list.c
index b6cfe33..e912ada 100644 (file)
--- a/lib/rsp_list.c
+++ b/lib/rsp_list.c
@@ -1,10 +1,5 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2007-2009, UNINETT AS */
+/* See COPYING for licensing information. */
 
 #if defined HAVE_CONFIG_H
 #include <config.h>

diff --git a/lib/rsp_list.h b/lib/rsp_list.h
index 83e8cb5..ff080fc 100644 (file)
--- a/lib/rsp_list.h
+++ b/lib/rsp_list.h
@@ -1,10 +1,5 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2007-2009, UNINETT AS */
+/* See COPYING for licensing information. */
 
 #ifdef SYS_SOLARIS9
 #include <sys/inttypes.h>

diff --git a/lib/rsp_tlscommon.c b/lib/rsp_tlscommon.c
index abc395e..b66c369 100644 (file)
--- a/lib/rsp_tlscommon.c
+++ b/lib/rsp_tlscommon.c
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2007-2009, UNINETT AS
+ * Copyright (c) 2010-2011, NORDUnet A/S */
+/* See COPYING for licensing information. */
 
 #if defined HAVE_CONFIG_H
 #include <config.h>

diff --git a/lib/rsp_tlscommon.h b/lib/rsp_tlscommon.h
index d96f553..73cd261 100644 (file)
--- a/lib/rsp_tlscommon.h
+++ b/lib/rsp_tlscommon.h
@@ -1,10 +1,5 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2007-2009, UNINETT AS */
+/* See COPYING for licensing information. */
 
 #include <netinet/in.h>
 #include <openssl/ssl.h>

diff --git a/lib/rsp_util.c b/lib/rsp_util.c
index c2966b8..eb6feee 100644 (file)
--- a/lib/rsp_util.c
+++ b/lib/rsp_util.c
@@ -1,10 +1,5 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2007-2009, UNINETT AS */
+/* See COPYING for licensing information. */
 
 /* Code contributions from:
  *

diff --git a/lib/rsp_util.h b/lib/rsp_util.h
index 35ecc9e..576430f 100644 (file)
--- a/lib/rsp_util.h
+++ b/lib/rsp_util.h
@@ -1,3 +1,6 @@
+/* Copyright (c) 2007-2009, UNINETT AS */
+/* See COPYING for licensing information. */
+
 #include <sys/socket.h>
 #include <netdb.h>