Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: licenses/
Date: Thu, 13 Apr 2017 12:33:26
Message-Id: 1492086766.15abaf9459ca5f92b77c048f578c609f1f7d34e6.chewi@gentoo
1 commit: 15abaf9459ca5f92b77c048f578c609f1f7d34e6
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 13 12:32:46 2017 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 13 12:32:46 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15abaf94
7
8 licenses: Update CAOSL using fresh copy from the jxplorer GitHub repo
9
10 licenses/CAOSL | 57 +++++++++++++++++++++++++++++++++------------------------
11 1 file changed, 33 insertions(+), 24 deletions(-)
12
13 diff --git a/licenses/CAOSL b/licenses/CAOSL
14 index f612af79278..031397ee6e3 100644
15 --- a/licenses/CAOSL
16 +++ b/licenses/CAOSL
17 @@ -1,32 +1,41 @@
18 -Version 1.0
19 +CA Open Source Licence Version 1.0
20 +==================================
21
22 -Copyright (c) 2002 Computer Associates. All rights reserved.
23 +Copyright (c) 2003 Computer Associates. All rights reserved.
24
25 -Redistribution and use in source and binary forms, with or without modification, are permitted provided that
26 -the following conditions are met:
27 +Redistribution and use in source and binary forms, with or without
28 +modification, are permitted provided that the following conditions are met:
29
30 -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the
31 -following disclaimer.
32 +1. Redistributions of source code must retain the above copyright notice,
33 +this list of conditions and the following disclaimer.
34
35 -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
36 -following disclaimer in the documentation and/or other materials provided with the distribution.
37 +2. Redistributions in binary form must reproduce the above copyright notice,
38 +this list of conditions and the following disclaimer in the documentation
39 +and/or other materials provided with the distribution.
40
41 -3. The end-user documentation included with the redistribution, if any, must include the following
42 -acknowledgment:
43 -"This product includes software developed by Computer Associates (http://www.ca.com/)."
44 -Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party
45 -acknowledgments normally appear.
46 +3. The end-user documentation included with the redistribution, if any,
47 +must include the following acknowledgment:
48
49 -4. The name "Computer Associates" must not be used to endorse or promote products derived from this software
50 -without prior written permission.
51 + "This product includes software developed by
52 + Computer Associates (http://www.ca.com/)."
53
54 -5. Products may not include "Computer Associates" their name, without prior written permission of the Computer
55 -Associates.
56 +Alternately, this acknowledgment may appear in the software itself, if and
57 +wherever such third-party acknowledgments normally appear.
58
59 -THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
60 -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
61 -COMPUTER ASSOCIATES OR CONTRIBUTORS TO THE JXPLORER OPEN SOURCE PROJECT BE LIABLE FOR ANY DIRECT, INDIRECT,
62 -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
63 -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
64 -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
65 -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
66 +4. The name "Computer Associates" must not be used to endorse or promote
67 +products derived from this software without prior written permission.
68 +
69 +5. Products may not include "Computer Associates" in their name, without prior
70 +written permission of the Computer Associates.
71 +
72 +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES,
73 +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
74 +AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
75 +COMPUTER ASSOCIATES OR CONTRIBUTORS TO THE JXPLORER OPEN SOURCE PROJECT BE
76 +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
77 +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
78 +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
79 +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
80 +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
81 +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
82 +POSSIBILITY OF SUCH DAMAGE.