Skip to content

Commit

Permalink
Update zlib, zlib-intel dependencies (dotnet#73082)
Browse files Browse the repository at this point in the history
- zlib updated to v1.2.12
- zlib-intel updated to v1.2.12_jtk.1

Also required additional minor tweaks (documented in zlib-version.txt and zlib-intel-version.txt) to get the build to work.
  • Loading branch information
GrabYourPitchforks committed Aug 2, 2022
1 parent 06e4c45 commit 67f0ee5
Show file tree
Hide file tree
Showing 45 changed files with 21,648 additions and 2,040 deletions.
6 changes: 3 additions & 3 deletions THIRD-PARTY-NOTICES.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ License notice for Zlib
-----------------------

https://github.com/madler/zlib
http://zlib.net/zlib_license.html
https://zlib.net/zlib_license.html

/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.2.11, January 15th, 2017
version 1.2.12, March 27th, 2022

Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
6 changes: 3 additions & 3 deletions src/installer/pkg/THIRD-PARTY-NOTICES.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ License notice for Zlib
-----------------------

https://github.com/madler/zlib
http://zlib.net/zlib_license.html
https://zlib.net/zlib_license.html

/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.2.11, January 15th, 2017
version 1.2.12, March 27th, 2022

Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
15 changes: 11 additions & 4 deletions src/native/external/zlib-intel-version.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
bf103c626c6c0d80580748f6b814ec534614ca52
v1.2.12_jtk.1
(bf55d56b068467329f5a6f29bee31bc80d694023)

https://github.com/jtkukunas/zlib/commit/bf103c626c6c0d80580748f6b814ec534614ca52
https://github.com/jtkukunas/zlib/releases/tag/v1.2.12_jtk.1

Note: This library is not using a proper release lifecycle. v1.2.11.1_jtkv6.3 was the last version released in 2019.
Therefore, we are pointing to a random commit from 2021 rather than a version tag.
Note: This library does not use a standard release lifecycle.
We're pointing to the latest available tagged version at the time we forked the code.

We have also cherry-picked into our local copy:
https://github.com/madler/zlib/commit/7ecf7c7458578d05a20fa481436dd5c58db112f7

And applied by hand the deflate_quick.c change from this commit:
https://github.com/dotnet/runtime/commit/60f6129b3eaef088f4b1ddc30d3320a68f396d85
Loading

0 comments on commit 67f0ee5

Please sign in to comment.