1 |
commit: d67f1d45eea107997b81f10d4365d86a83c19f04 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 15 07:57:27 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 15 08:00:49 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d67f1d45 |
7 |
|
8 |
licenses: Update libpng license to latest version |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
licenses/libpng | 83 +++++++++++++++++++++++++++++++++++++++++++-------------- |
13 |
1 file changed, 63 insertions(+), 20 deletions(-) |
14 |
|
15 |
diff --git a/licenses/libpng b/licenses/libpng |
16 |
index fd4de3d5eab..6ee9c8f5548 100644 |
17 |
--- a/licenses/libpng |
18 |
+++ b/licenses/libpng |
19 |
@@ -1,3 +1,8 @@ |
20 |
+ |
21 |
+This copy of the libpng notices is provided for your convenience. In case of |
22 |
+any discrepancy between this copy and the notices in the file png.h that is |
23 |
+included in the libpng distribution, the latter shall prevail. |
24 |
+ |
25 |
COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: |
26 |
|
27 |
If you modify libpng you may insert additional notices immediately following |
28 |
@@ -5,21 +10,21 @@ this sentence. |
29 |
|
30 |
This code is released under the libpng license. |
31 |
|
32 |
-libpng versions 1.2.6, August 15, 2004, through 1.5.12, July 11, 2012, are |
33 |
-Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are |
34 |
-distributed according to the same disclaimer and license as libpng-1.2.5 |
35 |
-with the following individual added to the list of Contributing Authors: |
36 |
- |
37 |
- Cosmin Truta |
38 |
- |
39 |
-libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are |
40 |
-Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are |
41 |
-distributed according to the same disclaimer and license as libpng-1.0.6 |
42 |
-with the following individuals added to the list of Contributing Authors: |
43 |
+libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are |
44 |
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are |
45 |
+derived from libpng-1.0.6, and are distributed according to the same |
46 |
+disclaimer and license as libpng-1.0.6 with the following individuals |
47 |
+added to the list of Contributing Authors: |
48 |
|
49 |
Simon-Pierre Cadieux |
50 |
Eric S. Raymond |
51 |
+ Mans Rullgard |
52 |
+ Cosmin Truta |
53 |
Gilles Vollant |
54 |
+ James Yu |
55 |
+ Mandar Sahastrabuddhe |
56 |
+ Google Inc. |
57 |
+ Vadim Barkov |
58 |
|
59 |
and with the following additions to the disclaimer: |
60 |
|
61 |
@@ -30,19 +35,25 @@ and with the following additions to the disclaimer: |
62 |
risk of satisfactory quality, performance, accuracy, and effort is with |
63 |
the user. |
64 |
|
65 |
+Some files in the "contrib" directory and some configure-generated |
66 |
+files that are distributed with libpng have other copyright owners and |
67 |
+are released under other open source licenses. |
68 |
+ |
69 |
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are |
70 |
-Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are |
71 |
-distributed according to the same disclaimer and license as libpng-0.96, |
72 |
-with the following individuals added to the list of Contributing Authors: |
73 |
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from |
74 |
+libpng-0.96, and are distributed according to the same disclaimer and |
75 |
+license as libpng-0.96, with the following individuals added to the list |
76 |
+of Contributing Authors: |
77 |
|
78 |
Tom Lane |
79 |
Glenn Randers-Pehrson |
80 |
Willem van Schaik |
81 |
|
82 |
libpng versions 0.89, June 1996, through 0.96, May 1997, are |
83 |
-Copyright (c) 1996, 1997 Andreas Dilger |
84 |
-Distributed according to the same disclaimer and license as libpng-0.88, |
85 |
-with the following individuals added to the list of Contributing Authors: |
86 |
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, |
87 |
+and are distributed according to the same disclaimer and license as |
88 |
+libpng-0.88, with the following individuals added to the list of |
89 |
+Contributing Authors: |
90 |
|
91 |
John Bowler |
92 |
Kevin Bracey |
93 |
@@ -51,8 +62,11 @@ with the following individuals added to the list of Contributing Authors: |
94 |
Greg Roelofs |
95 |
Tom Tanner |
96 |
|
97 |
+Some files in the "scripts" directory have other copyright owners |
98 |
+but are released under this license. |
99 |
+ |
100 |
libpng versions 0.5, May 1995, through 0.88, January 1996, are |
101 |
-Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. |
102 |
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. |
103 |
|
104 |
For the purposes of this copyright and license, "Contributing Authors" |
105 |
is defined as the following set of individuals: |
106 |
@@ -80,11 +94,40 @@ to the following restrictions: |
107 |
2. Altered versions must be plainly marked as such and must not |
108 |
be misrepresented as being the original source. |
109 |
|
110 |
- 3. This Copyright notice may not be removed or altered from |
111 |
- any source or altered source distribution. |
112 |
+ 3. This Copyright notice may not be removed or altered from any |
113 |
+ source or altered source distribution. |
114 |
|
115 |
The Contributing Authors and Group 42, Inc. specifically permit, without |
116 |
fee, and encourage the use of this source code as a component to |
117 |
supporting the PNG file format in commercial products. If you use this |
118 |
source code in a product, acknowledgment is not required but would be |
119 |
appreciated. |
120 |
+ |
121 |
+END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. |
122 |
+ |
123 |
+TRADEMARK: |
124 |
+ |
125 |
+The name "libpng" has not been registered by the Copyright owner |
126 |
+as a trademark in any jurisdiction. However, because libpng has |
127 |
+been distributed and maintained world-wide, continually since 1995, |
128 |
+the Copyright owner claims "common-law trademark protection" in any |
129 |
+jurisdiction where common-law trademark is recognized. |
130 |
+ |
131 |
+OSI CERTIFICATION: |
132 |
+ |
133 |
+Libpng is OSI Certified Open Source Software. OSI Certified Open Source is |
134 |
+a certification mark of the Open Source Initiative. OSI has not addressed |
135 |
+the additional disclaimers inserted at version 1.0.7. |
136 |
+ |
137 |
+EXPORT CONTROL: |
138 |
+ |
139 |
+The Copyright owner believes that the Export Control Classification |
140 |
+Number (ECCN) for libpng is EAR99, which means not subject to export |
141 |
+controls or International Traffic in Arms Regulations (ITAR) because |
142 |
+it is open source, publicly available software, that does not contain |
143 |
+any encryption software. See the EAR, paragraphs 734.3(b)(3) and |
144 |
+734.7(b). |
145 |
+ |
146 |
+Glenn Randers-Pehrson |
147 |
+glennrp at users.sourceforge.net |
148 |
+July 15, 2018 |