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 <neil.mckee@inmon.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Chris Wright <chrisw@sous-sol.org>

diff --git a/COPYING b/COPYING
index ad17c7c6e524a23d9c8bb333ca6b34acfeb92809..22c9341b8c4758e587675a368bdb1a0e53793c87 100644 (file)
--- 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 e3c5f4961239b4fb859acd7bce4c4e3eac5b7271..8ea96937f9b5aab9b3914e3d2267c2e7eeed5f26 100644 (file)
--- 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 ba8d2bf9964b2f2302a6c3439c5939ab1f876434..b020958669185b06d42325f45f1b19b6b3021c88 100644 (file)
--- 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 119cccff3f179c0623e222ed1cedb3d1794dfaf3..3cc060b3b3f23bad7fa8b49e8711cdad16288f2c 100644 (file)
--- 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 092aad10a8f2fcea24859090f539068394e4033f..d2e4155210d90602d20290ea2213ef24b44052ee 100644 (file)
--- 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 019f38f7e22d5051a1697b4dc1685ec33e00725e..3e5a67a064fa66c0e8baab8c06d45f5d7a6b77d1 100644 (file)
--- 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 280d54df7fdc387ac79be6b8ed74419e7296765f..7406cc94ae762602fd0bde4e2fee60d87b764d18 100644 (file)
--- 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"