Skip to content

Commit e060e83

Browse files
committed
cgmanifest.json, zlib-ng-version.txt, THIRD-PARTY-NOTICES.TXT updates.
1 parent e61a10e commit e060e83

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

THIRD-PARTY-NOTICES.TXT

+14-6
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,27 @@ written authorization of the copyright holder.
6969
License notice for zlib-ng
7070
-----------------------
7171

72-
https://github.com/zlib-ng/zlib-ng/blob/develop/LICENSE.md
72+
https://github.com/zlib-ng/zlib-ng/blob/d54e3769be0c522015b784eca2af258b1c026107/LICENSE.md
7373

7474
(C) 1995-2024 Jean-loup Gailly and Mark Adler
7575

76-
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.
76+
This software is provided 'as-is', without any express or implied
77+
warranty. In no event will the authors be held liable for any damages
78+
arising from the use of this software.
7779

78-
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:
80+
Permission is granted to anyone to use this software for any purpose,
81+
including commercial applications, and to alter it and redistribute it
82+
freely, subject to the following restrictions:
7983

80-
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.
84+
1. The origin of this software must not be misrepresented; you must not
85+
claim that you wrote the original software. If you use this software
86+
in a product, an acknowledgment in the product documentation would be
87+
appreciated but is not required.
8188

82-
Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
89+
2. Altered source versions must be plainly marked as such, and must not be
90+
misrepresented as being the original software.
8391

84-
This notice may not be removed or altered from any source distribution.
92+
3. This notice may not be removed or altered from any source distribution.
8593

8694
License notice for LinuxTracepoints
8795
-----------------------------------

src/native/external/cgmanifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"Type": "git",
4747
"Git": {
4848
"RepositoryUrl": "https://github.com/zlib-ng/zlib-ng",
49-
"CommitHash": "74253725f884e2424a0dd8ae3f69896d5377f325"
49+
"CommitHash": "d54e3769be0c522015b784eca2af258b1c026107"
5050
}
5151
},
5252
"DevelopmentDependency": false
+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
v2.1.6
2-
74253725f884e2424a0dd8ae3f69896d5377f325
1+
v2.2.1
2+
d54e3769be0c522015b784eca2af258b1c026107
33

4-
https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.6
4+
https://github.com/zlib-ng/zlib-ng/releases/tag/2.2.1
55

66
We have removed the following folders from our local copy as these files are not needed for our compilation:
77

8-
- zlib-ng/docs/
8+
- zlib-ng/doc/
99
- zlib-ng/test/
1010
- zlib-ng/arch/s390/self-hosted-builder/
1111

12-
Apply https://github.com/dotnet/runtime/pull/105433.patch
12+
Also, if the next version does not yet contain the fixes included in 12bc7edc73308f017ec40c6b2db694a6e3490ac2, cherry-pick it as a patch.

0 commit comments

Comments
 (0)