From a1d7b4b3517f6440ae109a59736d4947388d3172 Mon Sep 17 00:00:00 2001 From: Neil McKee Date: Fri, 9 Dec 2011 16:56:32 -0800 Subject: [PATCH] sFlow: add Sun Industry Standards Source License 1.1 as licensing option The sFlow License was not on the list for the Fedora Project, but the Sun Industry Standards Source License 1.1 was (and it has the right properties). So this patch includes it as a licensing option in the relevant places (COPYING and the lib/sflow* sources). Let me know if this looks OK or not. Signed-off-by: Neil McKee Signed-off-by: Ben Pfaff Acked-by: Chris Wright --- COPYING | 6 ++++-- lib/sflow.h | 8 ++++++-- lib/sflow_agent.c | 8 ++++++-- lib/sflow_api.h | 8 ++++++-- lib/sflow_poller.c | 8 ++++++-- lib/sflow_receiver.c | 8 ++++++-- lib/sflow_sampler.c | 8 ++++++-- 7 files changed, 40 insertions(+), 14 deletions(-) diff --git a/COPYING b/COPYING index ad17c7c6e..22c9341b8 100644 --- a/COPYING +++ b/COPYING @@ -22,8 +22,10 @@ Public License, version 2. Files under the xenserver directory are licensed on a file-by-file basis. Refer to each file for details. -Files lib/sflow*.[ch] are licensed under the terms of the InMon sFlow -licence that is available at: +Files lib/sflow*.[ch] are licensed under the terms of either the +Sun Industry Standards Source License 1.1, that is available at: + http://host-sflow.sourceforge.net/sissl.html +or the InMon sFlow License, that is available at: http://www.inmon.com/technology/sflowlicense.txt Files under python/compat are licensed under the Python Software diff --git a/lib/sflow.h b/lib/sflow.h index e3c5f4961..8ea96937f 100644 --- a/lib/sflow.h +++ b/lib/sflow.h @@ -1,5 +1,9 @@ -/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of the InMon sFlow licence: */ -/* http://www.inmon.com/technology/sflowlicense.txt */ +/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of either the + * Sun Industry Standards Source License 1.1, that is available at: + * http://host-sflow.sourceforge.net/sissl.html + * or the InMon sFlow License, that is available at: + * http://www.inmon.com/technology/sflowlicense.txt + */ #ifndef SFLOW_H #define SFLOW_H 1 diff --git a/lib/sflow_agent.c b/lib/sflow_agent.c index ba8d2bf99..b02095866 100644 --- a/lib/sflow_agent.c +++ b/lib/sflow_agent.c @@ -1,5 +1,9 @@ -/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of the InMon sFlow licence: */ -/* http://www.inmon.com/technology/sflowlicense.txt */ +/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of either the + * Sun Industry Standards Source License 1.1, that is available at: + * http://host-sflow.sourceforge.net/sissl.html + * or the InMon sFlow License, that is available at: + * http://www.inmon.com/technology/sflowlicense.txt + */ #include "sflow_api.h" diff --git a/lib/sflow_api.h b/lib/sflow_api.h index 119cccff3..3cc060b3b 100644 --- a/lib/sflow_api.h +++ b/lib/sflow_api.h @@ -1,5 +1,9 @@ -/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of the InMon sFlow licence: */ -/* http://www.inmon.com/technology/sflowlicense.txt */ +/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of either the + * Sun Industry Standards Source License 1.1, that is available at: + * http://host-sflow.sourceforge.net/sissl.html + * or the InMon sFlow License, that is available at: + * http://www.inmon.com/technology/sflowlicense.txt + */ #ifndef SFLOW_API_H #define SFLOW_API_H 1 diff --git a/lib/sflow_poller.c b/lib/sflow_poller.c index 092aad10a..d2e415521 100644 --- a/lib/sflow_poller.c +++ b/lib/sflow_poller.c @@ -1,5 +1,9 @@ -/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of the InMon sFlow licence: */ -/* http://www.inmon.com/technology/sflowlicense.txt */ +/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of either the + * Sun Industry Standards Source License 1.1, that is available at: + * http://host-sflow.sourceforge.net/sissl.html + * or the InMon sFlow License, that is available at: + * http://www.inmon.com/technology/sflowlicense.txt + */ #include "sflow_api.h" diff --git a/lib/sflow_receiver.c b/lib/sflow_receiver.c index 019f38f7e..3e5a67a06 100644 --- a/lib/sflow_receiver.c +++ b/lib/sflow_receiver.c @@ -1,5 +1,9 @@ -/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of the InMon sFlow licence: */ -/* http://www.inmon.com/technology/sflowlicense.txt */ +/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of either the + * Sun Industry Standards Source License 1.1, that is available at: + * http://host-sflow.sourceforge.net/sissl.html + * or the InMon sFlow License, that is available at: + * http://www.inmon.com/technology/sflowlicense.txt + */ #ifndef __CHECKER__ /* Don't run sparse on anything in this file. */ diff --git a/lib/sflow_sampler.c b/lib/sflow_sampler.c index 280d54df7..7406cc94a 100644 --- a/lib/sflow_sampler.c +++ b/lib/sflow_sampler.c @@ -1,5 +1,9 @@ -/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of the InMon sFlow licence: */ -/* http://www.inmon.com/technology/sflowlicense.txt */ +/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of either the + * Sun Industry Standards Source License 1.1, that is available at: + * http://host-sflow.sourceforge.net/sissl.html + * or the InMon sFlow License, that is available at: + * http://www.inmon.com/technology/sflowlicense.txt + */ #include "sflow_api.h" -- 2.43.0