From e060e830700bb1be7ec3bf7672214d79f0d0377d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?=
 <1175054+carlossanlop@users.noreply.github.com>
Date: Wed, 4 Sep 2024 18:01:24 -0700
Subject: [PATCH] cgmanifest.json, zlib-ng-version.txt, THIRD-PARTY-NOTICES.TXT
 updates.

---
 THIRD-PARTY-NOTICES.TXT                 | 20 ++++++++++++++------
 src/native/external/cgmanifest.json     |  2 +-
 src/native/external/zlib-ng-version.txt | 10 +++++-----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/THIRD-PARTY-NOTICES.TXT b/THIRD-PARTY-NOTICES.TXT
index 18e149ccfd170..3dc0d7aa85979 100644
--- a/THIRD-PARTY-NOTICES.TXT
+++ b/THIRD-PARTY-NOTICES.TXT
@@ -69,19 +69,27 @@ written authorization of the copyright holder.
 License notice for zlib-ng
 -----------------------
 
-https://github.com/zlib-ng/zlib-ng/blob/develop/LICENSE.md
+https://github.com/zlib-ng/zlib-ng/blob/d54e3769be0c522015b784eca2af258b1c026107/LICENSE.md
 
 (C) 1995-2024 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 arising from the use of this software.
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
 
-Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
 
-This notice may not be removed or altered from any source distribution.
+3. This notice may not be removed or altered from any source distribution.
 
 License notice for LinuxTracepoints
 -----------------------------------
diff --git a/src/native/external/cgmanifest.json b/src/native/external/cgmanifest.json
index 175f582760d21..16a39c7d9c475 100644
--- a/src/native/external/cgmanifest.json
+++ b/src/native/external/cgmanifest.json
@@ -46,7 +46,7 @@
         "Type": "git",
         "Git": {
           "RepositoryUrl": "https://github.com/zlib-ng/zlib-ng",
-          "CommitHash": "74253725f884e2424a0dd8ae3f69896d5377f325"
+          "CommitHash": "d54e3769be0c522015b784eca2af258b1c026107"
         }
       },
       "DevelopmentDependency": false
diff --git a/src/native/external/zlib-ng-version.txt b/src/native/external/zlib-ng-version.txt
index 4292d95a0fca5..70d6d1f88b75e 100644
--- a/src/native/external/zlib-ng-version.txt
+++ b/src/native/external/zlib-ng-version.txt
@@ -1,12 +1,12 @@
-v2.1.6
-74253725f884e2424a0dd8ae3f69896d5377f325
+v2.2.1
+d54e3769be0c522015b784eca2af258b1c026107
 
-https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.6
+https://github.com/zlib-ng/zlib-ng/releases/tag/2.2.1
 
 We have removed the following folders from our local copy as these files are not needed for our compilation:
 
-- zlib-ng/docs/
+- zlib-ng/doc/
 - zlib-ng/test/
 - zlib-ng/arch/s390/self-hosted-builder/
 
-Apply https://github.com/dotnet/runtime/pull/105433.patch
\ No newline at end of file
+Also, if the next version does not yet contain the fixes included in 12bc7edc73308f017ec40c6b2db694a6e3490ac2, cherry-pick it as a patch.