Skip to content

Commit 11b0e91

Browse files
committed
Update license book
Change-Id: I4c6ae43090a64fd4a43f3ca287f27a4264a084ad
1 parent 2da9977 commit 11b0e91

File tree

1 file changed

+45
-4
lines changed

1 file changed

+45
-4
lines changed

LICENSE.txt

Lines changed: 45 additions & 4 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 Connector/C++ 8.0.
1212

13-
Last updated: November 2022
13+
Last updated: January 2023
1414

1515
Licensing Information
1616

@@ -33,7 +33,7 @@ Licensing Information
3333
a copy of which is reproduced below and can also be found along with
3434
its FAQ at http://oss.oracle.com/licenses/universal-foss-exception.
3535

36-
Copyright (c) 2008, 2022, Oracle and/or its affiliates.
36+
Copyright (c) 2008, 2023, Oracle and/or its affiliates.
3737

3838
Election of GPLv2
3939

@@ -457,7 +457,9 @@ The Universal FOSS Exception, Version 1.0
457457
together with Other FOSS after enabling interoperability using the
458458
Interfaces of one or both, and distributing the resulting
459459
combination under different licenses for the respective portions
460-
thereof. For avoidance of doubt, a license which is OSI-approved or
460+
thereof.
461+
462+
For avoidance of doubt, a license which is OSI-approved or
461463
categorized by the FSF as free, includes, for the purpose of this
462464
permission, such licenses with additional permissions, and any
463465
license that has previously been so approved or categorized as
@@ -2330,6 +2332,45 @@ SOFTWARE.
23302332
======================================================================
23312333
======================================================================
23322334

2335+
zlib
2336+
2337+
Oracle gratefully acknowledges the contributions of Jean-loup Gailly
2338+
and Mark Adler in creating the zlib general purpose compression
2339+
library which is used in this product.
2340+
2341+
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
2342+
2343+
This software is provided 'as-is', without any express or implied
2344+
warranty. In no event will the authors be held liable for any damages
2345+
arising from the use of this software.
2346+
2347+
Permission is granted to anyone to use this software for any purpose,
2348+
including commercial applications, and to alter it and redistribute it
2349+
freely, subject to the following restrictions:
2350+
2351+
1. The origin of this software must not be misrepresented; you must not
2352+
claim that you wrote the original software. If you use this software
2353+
in a product, an acknowledgment in the product documentation would be
2354+
appreciated but is not required.
2355+
2. Altered source versions must be plainly marked as such, and must not be
2356+
misrepresented as being the original software.
2357+
3. This notice may not be removed or altered from any source distribution.
2358+
2359+
Jean-loup Gailly Mark Adler
2360+
2361+
2362+
If you use the zlib library in a product, we would appreciate *not* receiving
2363+
lengthy legal documents to sign. The sources are provided for free but without
2364+
warranty of any kind. The library has been entirely written by Jean-loup
2365+
Gailly and Mark Adler; it does not include third-party code.
2366+
2367+
If you redistribute modified sources, we would appreciate that you include in
2368+
the file ChangeLog history information documenting your changes. Please read
2369+
the FAQ for more information on the distribution of modified source versions.
2370+
2371+
======================================================================
2372+
======================================================================
2373+
23332374
ZSTD (Zstandard)
23342375

23352376
Zstandard is dual-licensed under [BSD](LICENSE) and [GPLv2](COPYING).
@@ -2986,4 +3027,4 @@ Written Offer for Source Code
29863027
that included the binary that is the subject of your request, or
29873028

29883029
b. in the case of code licensed under the GPL v3 for as long as Oracle
2989-
offers spare parts or customer support for that product model.
3030+
offers spare parts or customer support for that product model.

0 commit comments

Comments
 (0)