commit:     15abaf9459ca5f92b77c048f578c609f1f7d34e6
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 12:32:46 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 12:32:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15abaf94

licenses: Update CAOSL using fresh copy from the jxplorer GitHub repo

 licenses/CAOSL | 57 +++++++++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/licenses/CAOSL b/licenses/CAOSL
index f612af79278..031397ee6e3 100644
--- a/licenses/CAOSL
+++ b/licenses/CAOSL
@@ -1,32 +1,41 @@
-Version 1.0
+CA Open Source Licence Version 1.0
+==================================
 
-Copyright (c) 2002 Computer Associates. All rights reserved.
+Copyright (c) 2003 Computer Associates. All rights reserved.
 
-Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that 
-the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice, this 
list of conditions and the 
-following disclaimer.
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
 
-2. 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.
+2. 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.
 
-3. The end-user documentation included with the redistribution, if any, must 
include the following 
-acknowledgment:
-"This product includes software developed by Computer Associates 
(http://www.ca.com/)."
-Alternately, this acknowledgment may appear in the software itself, if and 
wherever such third-party 
-acknowledgments normally appear.
+3. The end-user documentation included with the redistribution, if any,
+must include the following acknowledgment:
 
-4. The name "Computer Associates" must not be used to endorse or promote 
products derived from this software 
-without prior written permission.
+  "This product includes software developed by
+  Computer Associates (http://www.ca.com/)."
 
-5. Products may not include "Computer Associates" their name, without prior 
written permission of the Computer 
-Associates.
+Alternately, this acknowledgment may appear in the software itself, if and
+wherever such third-party acknowledgments normally appear.
 
-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 
-COMPUTER ASSOCIATES OR CONTRIBUTORS TO THE JXPLORER OPEN SOURCE PROJECT 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.
+4. The name "Computer Associates" must not be used to endorse or promote
+products derived from this software without prior written permission.
+
+5. Products may not include "Computer Associates" in their name, without prior
+written permission of the Computer Associates.
+
+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
+COMPUTER ASSOCIATES OR CONTRIBUTORS TO THE JXPLORER OPEN SOURCE PROJECT 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.

Reply via email to