1 files changed, 10 insertions, 38 deletions
diff --git a/meta/files/common-licenses/Entessa b/meta/files/common-licenses/Entessa
index ceecc99768..d4dadd226a 100644
--- a/meta/files/common-licenses/Entessa
+++ b/meta/files/common-licenses/Entessa
@@ -2,47 +2,19 @@
 Entessa Public License Version. 1.0
 Copyright (c) 2003 Entessa, LLC. All rights reserved.
-Redistribution and use in source and binary forms, with or without
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-modification, are permitted provided that the following conditions are met:
-Redistributions of source code must retain the above copyright notice, this
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-list of conditions and the following disclaimer.
+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.
-Redistributions in binary form must reproduce the above copyright notice, this
+The end-user documentation included with the redistribution, if any, must include the following acknowledgment: 
-list of conditions and the following disclaimer in the documentation and/or
+"This product includes open source software developed by openSEAL (http://www.openseal.org/)."
-other materials provided with the distribution.
-The end-user documentation included with the redistribution, if any, must
-include the following acknowledgment:
-"This product includes open source software developed by openSEAL (http://
-www.openseal.org/)."
-Alternately, this acknowledgment may appear in the software itself, if and
+Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear.
-wherever such third-party acknowledgments normally appear.
-The names "openSEAL" and "Entessa" must not be used to
+The names "openSEAL" and "Entessa" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact epl@entessa.com.
-endorse or promote products derived from this software without prior written
+Products derived from this software may not be called "openSEAL", nor may "openSEAL" appear in their name, without prior written permission of Entessa.
-permission. For written permission, please contact epl@entessa.com.
+THIS SOFTWARE IS PROVIDED ``AS IS`` AND ANY EXPRESSED 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 ENTESSA, LLC, OPENSEAL OR ITS 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.
-Products derived from this software may not be called "openSEAL", nor
-may "openSEAL" appear in their name, without prior written permission
-of Entessa.
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 ENTESSA,
-LLC, OPENSEAL OR ITS 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.
 ============================================================
-This software consists of voluntary contributions made by many individuals on
+This software consists of voluntary contributions made by many individuals on behalf of openSEAL and was originally based on software contributed by Entessa, LLC, http://www.entessa.com. For more information on the openSEAL, please see <http://www.openseal.org/>.
-behalf of openSEAL and was originally based on software contributed by Entessa,
-LLC, http://www.entessa.com. For more information on the openSEAL, please see
-<http://www.openseal.org/>.

diff --git a/meta/files/common-licenses/Entessa b/meta/files/common-licenses/Entessa index ceecc99768..d4dadd226a 100644 --- a/meta/files/common-licenses/Entessa +++ b/meta/files/common-licenses/Entessa
@@ -2,47 +2,19 @@
2	Entessa Public License Version. 1.0	2	Entessa Public License Version. 1.0
3	Copyright (c) 2003 Entessa, LLC. All rights reserved.	3	Copyright (c) 2003 Entessa, LLC. All rights reserved.
4		4
5	Redistribution and use in source and binary forms, with or without	5	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
6	modification, are permitted provided that the following conditions are met:
7		6
8	Redistributions of source code must retain the above copyright notice, this	7	Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
9	list of conditions and the following disclaimer.	8	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.
10	Redistributions in binary form must reproduce the above copyright notice, this	9	The end-user documentation included with the redistribution, if any, must include the following acknowledgment:
11	list of conditions and the following disclaimer in the documentation and/or	10	"This product includes open source software developed by openSEAL (http://www.openseal.org/)."
12	other materials provided with the distribution.
13	The end-user documentation included with the redistribution, if any, must
14	include the following acknowledgment:
15	"This product includes open source software developed by openSEAL (http://
16	www.openseal.org/)."
17		11
18	Alternately, this acknowledgment may appear in the software itself, if and	12	Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear.
19	wherever such third-party acknowledgments normally appear.
20		13
21	The names "openSEAL" and "Entessa" must not be used to	14	The names "openSEAL" and "Entessa" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact epl@entessa.com.
22	endorse or promote products derived from this software without prior written	15	Products derived from this software may not be called "openSEAL", nor may "openSEAL" appear in their name, without prior written permission of Entessa.
23	permission. For written permission, please contact epl@entessa.com.	16	THIS SOFTWARE IS PROVIDED ``AS IS`` AND ANY EXPRESSED 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 ENTESSA, LLC, OPENSEAL OR ITS 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.
24	Products derived from this software may not be called "openSEAL", nor
25	may "openSEAL" appear in their name, without prior written permission
26	of Entessa.
27	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
28	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
29	FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ENTESSA,
30	LLC, OPENSEAL OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
31	INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
32	LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
33	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
34	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
35	OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
36	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37	============================================================	17	============================================================
38		18
39	This software consists of voluntary contributions made by many individuals on	19	This software consists of voluntary contributions made by many individuals on behalf of openSEAL and was originally based on software contributed by Entessa, LLC, http://www.entessa.com. For more information on the openSEAL, please see <http://www.openseal.org/>.
40	behalf of openSEAL and was originally based on software contributed by Entessa,
41	LLC, http://www.entessa.com. For more information on the openSEAL, please see
42	<http://www.openseal.org/>.
43
44
45
46
47
48		20