Skip to content

Commit e18e239

Browse files
committed
Update License Book
Approved By: Erlend Dahl <erlend.dahl@oracle.com>
1 parent 45ecb43 commit e18e239

File tree

1 file changed

+29
-25
lines changed

1 file changed

+29
-25
lines changed

LICENSE

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Introduction
1010
third-party software which may be included in this distribution of
1111
MySQL 5.7.28 (and later).
1212

13-
Last updated: March 2020
13+
Last updated: May 2020
1414

1515
Licensing Information
1616

@@ -35,8 +35,7 @@ Licensing Information
3535
reproduced below and can also be found along with its FAQ at
3636
http://oss.oracle.com/licenses/universal-foss-exception.
3737

38-
Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights
39-
reserved.
38+
Copyright (c) 1997, 2020, Oracle and/or its affiliates.
4039

4140
Election of GPLv2
4241

@@ -4551,33 +4550,38 @@ zlib
45514550
Oracle gratefully acknowledges the contributions of Jean-loup Gailly
45524551
and Mark Adler in creating the zlib general purpose compression library
45534552
which is used in this product.
4554-
zlib.h -- interface of the 'zlib' general purpose compression library
4555-
Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler
4553+
(C) 1995-2017 Jean-loup Gailly and Mark Adler
45564554

4557-
zlib.h -- interface of the 'zlib' general purpose compression library
4558-
version 1.2.3, July 18th, 2005
4559-
Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
4555+
This software is provided 'as-is', without any express or implied
4556+
warranty. In no event will the authors be held liable for any damages
4557+
arising from the use of this software.
45604558

4561-
zlib.h -- interface of the 'zlib' general purpose compression library
4562-
version 1.2.5, April 19th, 2010
4563-
Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
4559+
Permission is granted to anyone to use this software for any purpose,
4560+
including commercial applications, and to alter it and redistribute it
4561+
freely, subject to the following restrictions:
45644562

4565-
This software is provided 'as-is', without any express or implied warranty.
4566-
In no event will the authors be held liable for any damages arising from the
4567-
use of this software. Permission is granted to anyone to use this software
4568-
for any purpose,including commercial applications, and to alter it and
4569-
redistribute it freely, subject to the following restrictions:
45704563

4571-
1. The origin of this software must not be misrepresented; you must not
4572-
claim that you wrote the original software. If you use this software
4573-
in a product, an acknowledgment in the product documentation would
4574-
be appreciated but is not required.
4575-
2. Altered source versions must be plainly marked as such, and must not
4576-
be misrepresented as being the original software.
4577-
3. This notice may not be removed or altered from any source distribution.
4564+
1. The origin of this software must not be misrepresented; you must not
4565+
claim that you wrote the original software. If you use this software
4566+
in a product, an acknowledgment in the product documentation would be
4567+
appreciated but is not required.
45784568

4579-
Jean-loup Gailly jloup@gzip.org
4580-
Mark Adler madler@alumni.caltech.edu
4569+
2. Altered source versions must be plainly marked as such, and must not be
4570+
misrepresented as being the original software.
4571+
4572+
3. This notice may not be removed or altered from any source distribution.
4573+
4574+
Jean-loup Gailly Mark Adler
4575+
jloup@gzip.org madler@alumni.caltech.edu
4576+
4577+
If you use the zlib library in a product, we would appreciate *not* receiving
4578+
lengthy legal documents to sign. The sources are provided for free but without
4579+
warranty of any kind. The library has been entirely written by Jean-loup
4580+
Gailly and Mark Adler; it does not include third-party code.
4581+
4582+
If you redistribute modified sources, we would appreciate that you include in
4583+
the file ChangeLog history information documenting your changes. Please read
4584+
the FAQ for more information on the distribution of modified source versions.
45814585

45824586
Commonly Used Licenses
45834587

0 commit comments

Comments
 (0)